let the popup listbox process the kbd messages in wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -151,9 +151,13 @@ protected:
|
|||||||
// notify the combo here
|
// notify the combo here
|
||||||
virtual void OnDismiss();
|
virtual void OnDismiss();
|
||||||
|
|
||||||
|
// forward the key presses to the combobox
|
||||||
|
void OnKeyDown(wxKeyEvent& event);
|
||||||
|
|
||||||
// the parent combobox
|
// the parent combobox
|
||||||
wxComboControl *m_combo;
|
wxComboControl *m_combo;
|
||||||
|
|
||||||
|
DECLARE_EVENT_TABLE()
|
||||||
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
|
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -304,6 +304,10 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
|
|||||||
// wxPopupComboWindow
|
// wxPopupComboWindow
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
|
||||||
|
EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
|
||||||
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
|
wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent)
|
||||||
: wxPopupTransientWindow(parent)
|
: wxPopupTransientWindow(parent)
|
||||||
{
|
{
|
||||||
@@ -341,6 +345,11 @@ void wxPopupComboWindow::OnDismiss()
|
|||||||
m_combo->OnDismiss();
|
m_combo->OnDismiss();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
|
||||||
|
{
|
||||||
|
m_combo->ProcessEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
|
#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user