summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2011-10-24 16:04:07 +0100
committerMichael Meeks <michael.meeks@suse.com>2011-10-25 13:42:00 +0100
commita5d6dca3e98ea1664be267c089a47766ce7e0a48 (patch)
tree0984a56c40af67e2614fad142f174c84136378b9 /vcl/inc
parent0862556f1e79f6055435499d86f4c2b3464d2adc (diff)
Fix for fdo41997 continuation of VCL cleanup
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/vcl/apptypes.hxx12
-rw-r--r--vcl/inc/vcl/svapp.hxx2
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx
index a52b2e99597b..e9f3dd711edf 100644
--- a/vcl/inc/vcl/apptypes.hxx
+++ b/vcl/inc/vcl/apptypes.hxx
@@ -57,12 +57,12 @@ public:
#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 (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD)
-#define INPUT_ANY (INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER | INPUT_APPEVENT)
+#define VCL_INPUT_PAINT 0x0004
+#define VCL_INPUT_TIMER 0x0008
+#define VCL_INPUT_OTHER 0x0010
+#define VCL_INPUT_APPEVENT 0x0020
+#define VCL_INPUT_MOUSEANDKEYBOARD (VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD)
+#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VCL_INPUT_PAINT | VCL_INPUT_TIMER | VCL_INPUT_OTHER | VCL_INPUT_APPEVENT)
#define DISPATCH_OPEN 0x0001
#define DISPATCH_PRINT 0x0002
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 07f75f549dda..1cc0a404b19c 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -258,7 +258,7 @@ public:
static sal_uInt16 GetModalModeCount();
static sal_uInt16 GetDispatchLevel();
- static sal_Bool AnyInput( sal_uInt16 nType = INPUT_ANY );
+ static sal_Bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY );
static sal_uLong GetLastInputInterval();
static sal_Bool IsUICaptured();