From 14596452e781f6a66bcc63b0c447c852df1f2896 Mon Sep 17 00:00:00 2001 From: Tobias Madl Date: Wed, 26 Nov 2014 14:53:25 +0000 Subject: fdo#84938: replace EVENT_ constants with enum Change-Id: I8275832d8dae43b374bddd48520d11592e9a6a1f Reviewed-on: https://gerrit.libreoffice.org/13134 Tested-by: LibreOffice gerrit bot Reviewed-by: Noel Grandin --- framework/source/uielement/comboboxtoolbarcontroller.cxx | 6 +++--- framework/source/uielement/edittoolbarcontroller.cxx | 2 +- framework/source/uielement/spinfieldtoolbarcontroller.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 6a685cfb71a7..2f3cefb4f4d0 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -222,7 +222,7 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) { switch ( rNEvt.GetType() ) { - case EVENT_KEYINPUT : + case MouseNotifyEvent::KEYINPUT : { const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); @@ -235,10 +235,10 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) } } break; - case EVENT_GETFOCUS : + case MouseNotifyEvent::GETFOCUS : notifyFocusGet(); break; - case EVENT_LOSEFOCUS : + case MouseNotifyEvent::LOSEFOCUS : notifyFocusLost(); break; default : diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index c38a2a5526b6..67cdcb1e2e3d 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -186,7 +186,7 @@ void EditToolbarController::LoseFocus() bool EditToolbarController::PreNotify( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 83557df32f01..efe6a711877f 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -308,7 +308,7 @@ void SpinfieldToolbarController::DataChanged( const DataChangedEvent& /*rDCEvt*/ bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); -- cgit