From 9044b125fd8542dab159d4a1585aae62e5547ae6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 8 Oct 2008 14:35:32 +0000 Subject: [PATCH] focus propagation, fixes #10047 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/combobox.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp index 5bae247235..54c70ebca5 100644 --- a/src/osx/carbon/combobox.cpp +++ b/src/osx/carbon/combobox.cpp @@ -137,6 +137,16 @@ protected: event.Skip(); } + void OnFocus( wxFocusEvent& event ) + { + // in case the textcontrol gets the focus we propagate + // it to the parent's handlers. + wxFocusEvent evt2(event.GetEventType(),m_cb->GetId()); + evt2.SetEventObject(m_cb); + m_cb->GetEventHandler()->ProcessEvent(evt2); + + event.Skip(); + } private: wxComboBox *m_cb; @@ -147,6 +157,8 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) EVT_KEY_DOWN(wxComboBoxText::OnKeyDown) EVT_CHAR(wxComboBoxText::OnChar) EVT_KEY_UP(wxComboBoxText::OnKeyUp) + EVT_SET_FOCUS(wxComboBoxText::OnFocus) + EVT_KILL_FOCUS(wxComboBoxText::OnFocus) EVT_TEXT(wxID_ANY, wxComboBoxText::OnText) END_EVENT_TABLE() -- 2.47.2