From: Vadim Zeitlin Date: Sat, 15 Mar 2008 02:24:12 +0000 (+0000) Subject: use wxTE_PROCESS_{ENTER,TAB} with the wxGridCellChoiceEditor combobox (slightly modif... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7999b8301108933e84f7f553b9ea41d156c2df65 use wxTE_PROCESS_{ENTER,TAB} with the wxGridCellChoiceEditor combobox (slightly modified patch 1906581) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 00785219da..4416eded16 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1515,12 +1515,16 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { - int style = wxBORDER_NONE; - if (!m_allowOthers) + int style = wxTE_PROCESS_ENTER | + wxTE_PROCESS_TAB | + wxBORDER_NONE; + + if ( !m_allowOthers ) style |= wxCB_READONLY; m_control = new wxComboBox(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, - m_choices, style ); + m_choices, + style); wxGridCellEditor::Create(parent, id, evtHandler); }