From 78de54999035dc80f490be2a2ead9b99a9470417 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Mar 2008 02:24:12 +0000 Subject: [PATCH] use wxTE_PROCESS_{ENTER,TAB} with the wxGridCellChoiceEditor combobox (slightly modified patch 1906581) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/grid.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index da44fbb47f..44f8b90f23 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1502,10 +1502,17 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { + 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, - m_allowOthers ? 0 : wxCB_READONLY); + style); wxGridCellEditor::Create(parent, id, evtHandler); }