haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure our grid helper comboctrls generate returns as events instead of internally processing 

Fix #1874
This commit is contained in:
Marek Roszko 2021-04-14 21:37:21 -04:00
parent e5dd54e05a
commit cb215a0abe
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/widgets/grid_text_button_helpers.cpp
View File

@ -219,7 +219,8 @@ class TEXT_BUTTON_FP_CHOOSER : public wxComboCtrl
public: public:
TEXT_BUTTON_FP_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg, TEXT_BUTTON_FP_CHOOSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg,
const wxString& aPreselect ) : const wxString& aPreselect ) :
wxComboCtrl( aParent ), wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER ),
m_dlg( aParentDlg ), m_dlg( aParentDlg ),
m_preselect( aPreselect ) m_preselect( aPreselect )
{ {
@ -274,7 +275,8 @@ class TEXT_BUTTON_URL : public wxComboCtrl
{ {
public: public:
TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg ) : TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg ) :
wxComboCtrl( aParent ), wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER ),
m_dlg( aParentDlg ) m_dlg( aParentDlg )
{ {
SetButtonBitmaps( KiBitmap( BITMAPS::www ) ); SetButtonBitmaps( KiBitmap( BITMAPS::www ) );
@ -322,7 +324,8 @@ public:
wxString* aCurrentDir, wxString* aExt = nullptr, wxString* aCurrentDir, wxString* aExt = nullptr,
bool aNormalize = false, bool aNormalize = false,
wxString aNormalizeBasePath = wxEmptyString ) : wxString aNormalizeBasePath = wxEmptyString ) :
wxComboCtrl( aParent ), wxComboCtrl( aParent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER ),
m_dlg( aParentDlg ), m_dlg( aParentDlg ),
m_grid( aGrid ), m_grid( aGrid ),
m_currentDir( aCurrentDir ), m_currentDir( aCurrentDir ),