diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-09 16:40:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 08:42:17 +0200 |
| commit | c748debd8f1c6a8c0cd202013edebd74d608ada1 (patch) | |
| tree | c23fa49f1d1041407711f64667a3f6eb9e9c289c /vcl/source/window/wrkwin.cxx | |
| parent | 9c7222c11c331ecd1562e963e78ab85be75b8e49 (diff) | |
convert WINDOWSTATE_STATE to scoped enum
Change-Id: I5448c7e46042850f18970c7613ec5a37df57bce7
Diffstat (limited to 'vcl/source/window/wrkwin.cxx')
| -rw-r--r-- | vcl/source/window/wrkwin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 1783d918c666..2ebe8d808b62 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -209,7 +209,7 @@ bool WorkWindow::IsMinimized() const //return mpWindowImpl->mpFrameData->mbMinimized; SalFrameState aState; mpWindowImpl->mpFrame->GetWindowState(&aState); - return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0); + return bool(aState.mnState & WindowStateState::Minimized); } bool WorkWindow::SetPluginParent( SystemParentData* pParent ) @@ -229,7 +229,7 @@ bool WorkWindow::SetPluginParent( SystemParentData* pParent ) return bRet; } -void WorkWindow::ImplSetFrameState( sal_uLong aFrameState ) +void WorkWindow::ImplSetFrameState( WindowStateState aFrameState ) { SalFrameState aState; aState.mnMask = WindowStateMask::State; @@ -239,12 +239,12 @@ void WorkWindow::ImplSetFrameState( sal_uLong aFrameState ) void WorkWindow::Minimize() { - ImplSetFrameState( WINDOWSTATE_STATE_MINIMIZED ); + ImplSetFrameState( WindowStateState::Minimized ); } void WorkWindow::Restore() { - ImplSetFrameState( WINDOWSTATE_STATE_NORMAL ); + ImplSetFrameState( WindowStateState::Normal ); } bool WorkWindow::Close() @@ -260,7 +260,7 @@ bool WorkWindow::Close() void WorkWindow::Maximize( bool bMaximize ) { - ImplSetFrameState( bMaximize ? WINDOWSTATE_STATE_MAXIMIZED : WINDOWSTATE_STATE_NORMAL ); + ImplSetFrameState( bMaximize ? WindowStateState::Maximized : WindowStateState::Normal ); } bool WorkWindow::IsMaximized() const @@ -270,9 +270,9 @@ bool WorkWindow::IsMaximized() const SalFrameState aState; if( mpWindowImpl->mpFrame->GetWindowState( &aState ) ) { - if( aState.mnState & (WINDOWSTATE_STATE_MAXIMIZED | - WINDOWSTATE_STATE_MAXIMIZED_HORZ | - WINDOWSTATE_STATE_MAXIMIZED_VERT ) ) + if( aState.mnState & (WindowStateState::Maximized | + WindowStateState::MaximizedHorz | + WindowStateState::MaximizedVert ) ) bRet = true; } return bRet; |