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/osx | |
| parent | 00bfc137d3a62a252f158c4a9100dd1379f410fd (diff) | |
convert WINDOWSTATE_MASK to scoped enum
Change-Id: Ic8259d81d8080c518aa07697e253a59cd6efaa4b
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 832d1328fcf9..0d535dc636c9 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -539,13 +539,13 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) NSRect aStateRect = [mpNSWindow frame]; aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask]; CocoaToVCL( aStateRect ); - if( pState->mnMask & WINDOWSTATE_MASK_X ) + if( pState->mnMask & WindowStateMask::X ) aStateRect.origin.x = float(pState->mnX); - if( pState->mnMask & WINDOWSTATE_MASK_Y ) + if( pState->mnMask & WindowStateMask::Y ) aStateRect.origin.y = float(pState->mnY); - if( pState->mnMask & WINDOWSTATE_MASK_WIDTH ) + if( pState->mnMask & WindowStateMask::Width ) aStateRect.size.width = float(pState->mnWidth); - if( pState->mnMask & WINDOWSTATE_MASK_HEIGHT ) + if( pState->mnMask & WindowStateMask::Height ) aStateRect.size.height = float(pState->mnHeight); VCLToCocoa( aStateRect ); aStateRect = [NSWindow frameRectForContentRect: aStateRect styleMask: mnStyleMask]; @@ -576,13 +576,13 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) UpdateFrameGeometry(); sal_uInt16 nEvent = 0; - if( pState->mnMask & (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y) ) + if( pState->mnMask & (WindowStateMask::X | WindowStateMask::Y) ) { mbPositioned = true; nEvent = SALEVENT_MOVE; } - if( pState->mnMask & (WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT) ) + if( pState->mnMask & (WindowStateMask::Width | WindowStateMask::Height) ) { mbSized = true; nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE; @@ -609,11 +609,11 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState ) // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); - pState->mnMask = WINDOWSTATE_MASK_X | - WINDOWSTATE_MASK_Y | - WINDOWSTATE_MASK_WIDTH | - WINDOWSTATE_MASK_HEIGHT | - WINDOWSTATE_MASK_STATE; + pState->mnMask = WindowStateMask::X | + WindowStateMask::Y | + WindowStateMask::Width | + WindowStateMask::Height | + WindowStateMask::State; NSRect aStateRect = [mpNSWindow frame]; aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask]; |