diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-09 16:31:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 08:40:10 +0200 |
| commit | 9c7222c11c331ecd1562e963e78ab85be75b8e49 (patch) | |
| tree | 24ec24a42a54cafdc4e4eb1da7f47fb2f0d71d8c /vcl/win/window | |
| parent | 00bfc137d3a62a252f158c4a9100dd1379f410fd (diff) | |
convert WINDOWSTATE_MASK to scoped enum
Change-Id: Ic8259d81d8080c518aa07697e253a59cd6efaa4b
Diffstat (limited to 'vcl/win/window')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 851c2a131406..3fd2be1e5704 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -1655,23 +1655,23 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) long nRightDeco = abs( aWinRect.right - aRect2.right ); // adjust window position/size to fit the screen - if ( !(pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y)) ) + if ( !(pState->mnMask & (WindowStateMask::X | WindowStateMask::Y)) ) nPosSize |= SWP_NOMOVE; - if ( !(pState->mnMask & (WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT)) ) + if ( !(pState->mnMask & (WindowStateMask::Width | WindowStateMask::Height)) ) nPosSize |= SWP_NOSIZE; - if ( pState->mnMask & WINDOWSTATE_MASK_X ) + if ( pState->mnMask & WindowStateMask::X ) nX = (int)pState->mnX - nLeftDeco; else nX = aWinRect.left; - if ( pState->mnMask & WINDOWSTATE_MASK_Y ) + if ( pState->mnMask & WindowStateMask::Y ) nY = (int)pState->mnY - nTopDeco; else nY = aWinRect.top; - if ( pState->mnMask & WINDOWSTATE_MASK_WIDTH ) + if ( pState->mnMask & WindowStateMask::Width ) nWidth = (int)pState->mnWidth + nLeftDeco + nRightDeco; else nWidth = aWinRect.right-aWinRect.left; - if ( pState->mnMask & WINDOWSTATE_MASK_HEIGHT ) + if ( pState->mnMask & WindowStateMask::Height ) nHeight = (int)pState->mnHeight + nTopDeco + nBottomDeco; else nHeight = aWinRect.bottom-aWinRect.top; @@ -1706,7 +1706,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) if ( mbOverwriteState ) { - if ( pState->mnMask & WINDOWSTATE_MASK_STATE ) + if ( pState->mnMask & WindowStateMask::State ) { if ( pState->mnState & WINDOWSTATE_STATE_MINIMIZED ) mnShowState = SW_SHOWMINIMIZED; @@ -1722,7 +1722,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) } else { - if ( pState->mnMask & WINDOWSTATE_MASK_STATE ) + if ( pState->mnMask & WindowStateMask::State ) { if ( pState->mnState & WINDOWSTATE_STATE_MINIMIZED ) { |