diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-01 16:49:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 11:20:43 +0200 |
| commit | 8aa3cb98adb8675ff3f09d2c1da35d2423e57493 (patch) | |
| tree | 3e7f2df75f1176a64034be8c7de592dc92996054 /vcl/osx/salinst.cxx | |
| parent | fa52e2090651fc2b2f3ba77b8f0af196d705730f (diff) | |
fdo#84938: convert VCL_INPUT_ #defines to 'enum class'
Change-Id: I155e45f58974a2b946c4a7703b350bcbfbad342e
Diffstat (limited to 'vcl/osx/salinst.cxx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 411cfba81586..ed420914638e 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -699,17 +699,17 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) } } -bool AquaSalInstance::AnyInput( sal_uInt16 nType ) +bool AquaSalInstance::AnyInput( VclInputFlags nType ) { - if( nType & VCL_INPUT_APPEVENT ) + if( nType & VclInputFlags::APPEVENT ) { if( ! aAppEventList.empty() ) return true; - if( nType == VCL_INPUT_APPEVENT ) + if( nType == VclInputFlags::APPEVENT ) return false; } - if( nType & VCL_INPUT_TIMER ) + if( nType & VclInputFlags::TIMER ) { if( AquaSalTimer::pRunningTimer ) { @@ -722,7 +722,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) } unsigned/*NSUInteger*/ nEventMask = 0; - if( nType & VCL_INPUT_MOUSE) + if( nType & VclInputFlags::MOUSE) nEventMask |= NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask | NSLeftMouseUpMask | NSRightMouseUpMask | NSOtherMouseUpMask | @@ -730,12 +730,12 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) NSScrollWheelMask | // NSMouseMovedMask | NSMouseEnteredMask | NSMouseExitedMask; - if( nType & VCL_INPUT_KEYBOARD) + if( nType & VclInputFlags::KEYBOARD) nEventMask |= NSKeyDownMask | NSKeyUpMask | NSFlagsChangedMask; - if( nType & VCL_INPUT_OTHER) + if( nType & VclInputFlags::OTHER) nEventMask |= NSTabletPoint; - // TODO: VCL_INPUT_PAINT / more VCL_INPUT_OTHER - if( !nType) + // TODO: VclInputFlags::PAINT / more VclInputFlags::OTHER + if( !bool(nType) ) return false; NSEvent* pEvent = [NSApp nextEventMatchingMask: nEventMask untilDate: nil |