From 687f679705053eff973082751032b95b3a89515e Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 9 Feb 2020 20:34:09 +0100 Subject: [PATCH] Fix creating wxPGChoiceAndButtonEditor controls Since wxPGChoiceAndButtonEditor derives from wxPGChoiceEditor so making a call to the base class virtual function CreateControls() from the child CreateControls() is legitimate and more clean than calling to this function in the another instance of the base class wxPGChoiceEditor (which may not exists). --- src/propgrid/editors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 4bf316f028..b2fec5f475 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -1318,7 +1318,7 @@ wxPGWindowList wxPGChoiceAndButtonEditor::CreateControls( wxPropertyGrid* propGr ch_sz.x -= wxPG_TEXTCTRL_AND_BUTTON_SPACING; #endif - wxWindow* ch = wxPGEditor_Choice->CreateControls(propGrid,property, + wxWindow* ch = wxPGChoiceEditor::CreateControls(propGrid,property, pos,ch_sz).m_primary; #ifdef __WXMSW__