diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-02 11:37:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-05 06:52:22 +0000 |
| commit | 0e30af6fdc496ee1b935d68e979aa63729cef878 (patch) | |
| tree | 455c406d192639a69fb0615476eb1d6a6b8c4172 /vcl/osx/salframeview.mm | |
| parent | 5ffa83a2b39cc77b36ef6f2ecc46ae5482e3e68c (diff) | |
convert SAL_FRAME_STYLE to scoped enum
Change-Id: Ic3f7fddcea36c18ffe43c4c633d415f596a58cbc
Reviewed-on: https://gerrit.libreoffice.org/19094
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/osx/salframeview.mm')
| -rw-r--r-- | vcl/osx/salframeview.mm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 5be7cc30bc51..4016090daf4c 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -183,8 +183,8 @@ static AquaSalFrame* getMouseContainerFrame() #endif // enable OSX>=10.7 fullscreen options if available and useful - bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG | SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO))); - bAllowFullScreen &= (0 == (~mpFrame->mnStyle & (SAL_FRAME_STYLE_SIZEABLE))); + bool bAllowFullScreen = (SalFrameStyleFlags::NONE == (mpFrame->mnStyle & (SalFrameStyleFlags::DIALOG | SalFrameStyleFlags::TOOLTIP | SalFrameStyleFlags::SYSTEMCHILD | SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::TOOLWINDOW | SalFrameStyleFlags::INTRO))); + bAllowFullScreen &= (SalFrameStyleFlags::NONE == (~mpFrame->mnStyle & (SalFrameStyleFlags::SIZEABLE))); bAllowFullScreen &= (mpFrame->mpParent == NULL); const SEL setCollectionBehavior = @selector(setCollectionBehavior:); if( bAllowFullScreen && [pNSWindow respondsToSelector: setCollectionBehavior]) @@ -233,16 +233,16 @@ static AquaSalFrame* getMouseContainerFrame() -(BOOL)canBecomeKeyWindow { if( (mpFrame->mnStyle & - ( SAL_FRAME_STYLE_FLOAT | - SAL_FRAME_STYLE_TOOLTIP | - SAL_FRAME_STYLE_INTRO - )) == 0 ) + ( SalFrameStyleFlags::FLOAT | + SalFrameStyleFlags::TOOLTIP | + SalFrameStyleFlags::INTRO + )) == SalFrameStyleFlags::NONE ) return YES; - if( (mpFrame->mnStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) != 0 ) + if( mpFrame->mnStyle & SalFrameStyleFlags::OWNERDRAWDECORATION ) return YES; if( mpFrame->mbFullScreen ) return YES; - if( (mpFrame->mnStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) + if( (mpFrame->mnStyle & SalFrameStyleFlags::FLOAT_FOCUSABLE) ) return YES; return [super canBecomeKeyWindow]; } @@ -254,9 +254,9 @@ static AquaSalFrame* getMouseContainerFrame() if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) { - static const sal_uLong nGuessDocument = SAL_FRAME_STYLE_MOVEABLE| - SAL_FRAME_STYLE_SIZEABLE| - SAL_FRAME_STYLE_CLOSEABLE; + static const SalFrameStyleFlags nGuessDocument = SalFrameStyleFlags::MOVEABLE| + SalFrameStyleFlags::SIZEABLE| + SalFrameStyleFlags::CLOSEABLE; if( mpFrame->mpMenu ) mpFrame->mpMenu->setMainMenu(); |