diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-05 13:26:16 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-05 13:26:16 +1100 |
| commit | 836320f64f8704dd150f72734192fcebebce89dd (patch) | |
| tree | a25f8df8dbde48e28ee8c267d762f7546340d3e2 | |
| parent | 5e31c9d9e42da8d8776621b2f80dfe9e04ca0871 (diff) | |
vcl: remove VCL_INPUT_MOUSEANDKEYBOARD, not necessary
Change-Id: Ia5b9581d06f6884d6a06abde9cb4039b64c29a05
| -rw-r--r-- | include/vcl/apptypes.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx index 9fd7a1a586ad..ba028e309e83 100644 --- a/include/vcl/apptypes.hxx +++ b/include/vcl/apptypes.hxx @@ -45,8 +45,7 @@ namespace o3tl template<> struct typed_flags<VclInputFlags> : is_typed_flags<VclInputFlags, 0x003f> {}; } -#define VCL_INPUT_MOUSEANDKEYBOARD (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD) -#define VCL_INPUT_ANY (VCL_INPUT_MOUSEANDKEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT) +#define VCL_INPUT_ANY (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT) #endif // INCLUDED_VCL_APPTYPES_HXX diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b5ca139671f2..0ac43159c041 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1828,7 +1828,7 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) { - if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) ) + if ( Application::AnyInput( VclInputFlags::MOUSE | VclInputFlags::KEYBOARD ) ) { aIdleTimer.Start(); // Timeout unchanged return; |