From cb215a0abe09d166c51aee063666b33c313de2b3 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 14 Apr 2021 21:37:21 -0400 Subject: [PATCH] Ensure our grid helper comboctrls generate returns as events instead of internally processing Fix #1874 --- common/widgets/grid_text_button_helpers.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp index de7f010415..f4896b18b7 100644 --- a/common/widgets/grid_text_button_helpers.cpp +++ b/common/widgets/grid_text_button_helpers.cpp @@ -219,7 +219,8 @@ class TEXT_BUTTON_FP_CHOOSER : public wxComboCtrl public: TEXT_BUTTON_FP_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg, const wxString& aPreselect ) : - wxComboCtrl( aParent ), + wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER ), m_dlg( aParentDlg ), m_preselect( aPreselect ) { @@ -274,7 +275,8 @@ class TEXT_BUTTON_URL : public wxComboCtrl { public: TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg ) : - wxComboCtrl( aParent ), + wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER ), m_dlg( aParentDlg ) { SetButtonBitmaps( KiBitmap( BITMAPS::www ) ); @@ -322,7 +324,8 @@ public: wxString* aCurrentDir, wxString* aExt = nullptr, bool aNormalize = false, wxString aNormalizeBasePath = wxEmptyString ) : - wxComboCtrl( aParent ), + wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER ), m_dlg( aParentDlg ), m_grid( aGrid ), m_currentDir( aCurrentDir ),