diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-10-21 16:54:35 -0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-21 20:48:03 +0100 |
| commit | b0224f8050373cbdde58c3dee1bbda71976b50b6 (patch) | |
| tree | d04b160b0c28c9be5446130234b995e6fe150bd8 /vcl | |
| parent | 7bf06ba95d6ba0e673f2aff5b4412dbf08702590 (diff) | |
Fix for bug fdo#41997, cleanup vcl enumeration
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/apptypes.hxx | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 489b1dd8a6b2..63d657ce4f39 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -875,7 +875,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) } unsigned/*NSUInteger*/ nEventMask = 0; - if( nType & INPUT_MOUSE) + if( nType & VCL_INPUT_MOUSE) nEventMask |= NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask | NSLeftMouseUpMask | NSRightMouseUpMask | NSOtherMouseUpMask | @@ -883,7 +883,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) NSScrollWheelMask | // NSMouseMovedMask | NSMouseEnteredMask | NSMouseExitedMask; - if( nType & INPUT_KEYBOARD) + if( nType & VCL_INPUT_KEYBOARD) nEventMask |= NSKeyDownMask | NSKeyUpMask | NSFlagsChangedMask; if( nType & INPUT_OTHER) nEventMask |= NSTabletPoint; diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx index 42273f6a292c..a52b2e99597b 100644 --- a/vcl/inc/vcl/apptypes.hxx +++ b/vcl/inc/vcl/apptypes.hxx @@ -55,13 +55,13 @@ public: TYPEINFO(); }; -#define INPUT_MOUSE 0x0001 -#define INPUT_KEYBOARD 0x0002 +#define VCL_INPUT_MOUSE 0x0001 +#define VCL_INPUT_KEYBOARD 0x0002 #define INPUT_PAINT 0x0004 #define INPUT_TIMER 0x0008 #define INPUT_OTHER 0x0010 #define INPUT_APPEVENT 0x0020 -#define INPUT_MOUSEANDKEYBOARD (INPUT_MOUSE | INPUT_KEYBOARD) +#define INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD) #define INPUT_ANY (INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER | INPUT_APPEVENT) #define DISPATCH_OPEN 0x0001 diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 83a9e07a92d4..dfddcd990a41 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -170,12 +170,12 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData ) case MotionNotify: case EnterNotify: case LeaveNotify: - nType = INPUT_MOUSE; + nType = VCL_INPUT_MOUSE; break; case XLIB_KeyPress: //case KeyRelease: - nType = INPUT_KEYBOARD; + nType = VCL_INPUT_KEYBOARD; break; case Expose: case GraphicsExpose: diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index a0d41a6165a8..10655ef77f77 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -921,7 +921,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType ) return true; } - if ( nType & INPUT_KEYBOARD ) + if ( nType & VCL_INPUT_KEYBOARD ) { // Test for key input if ( ImplPeekMessage( &aMsg, 0, WM_KEYDOWN, WM_KEYDOWN, |