diff options
| author | David Tardon <dtardon@redhat.com> | 2010-10-11 10:12:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-10-11 10:12:21 +0200 |
| commit | d7f2e03cad8caa27da8f048ea2d588cdf9c2cd56 (patch) | |
| tree | 79b1b2b1c4e48772ba0215fbe3107f9ce6b940a2 | |
| parent | 2e75f8d75c1e214eb22b1ccf6cf6f3d01b05007f (diff) | |
#i112582# fire focus events from ComboboxToolbarController
| -rw-r--r-- | framework/source/uielement/comboboxtoolbarcontroller.cxx | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index a4cc3f6be095..cfa477749445 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -255,19 +255,30 @@ void ComboboxToolbarController::LoseFocus() long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_KEYINPUT ) + switch ( rNEvt.GetType() ) { - const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); - const KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); - if(( rKeyCode.GetModifier() | rKeyCode.GetCode()) == KEY_RETURN ) - { - // Call execute only with non-empty text - if ( m_pComboBox->GetText().Len() > 0 ) - execute( rKeyCode.GetModifier() ); - return 1; - } + case EVENT_KEYINPUT : + { + const ::KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); + if(( rKeyCode.GetModifier() | rKeyCode.GetCode()) == KEY_RETURN ) + { + // Call execute only with non-empty text + if ( m_pComboBox->GetText().Len() > 0 ) + execute( rKeyCode.GetModifier() ); + return 1; + } + } + break; + case EVENT_GETFOCUS : + notifyFocusGet(); + break; + case EVENT_LOSEFOCUS : + notifyFocusLost(); + break; + default : + break; } - return 0; } |