[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

[wxWidgets.git] / include / wx / combo.h

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 20ef7cb5b9d2a582c9a9b7d30dd4db4868c01603..fdece4b675f4c09f88cd9d5962ce08bbedead3fc 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -156,7 +156,10 @@ public:
 
     // set interface class instance derived from wxComboPopup
     // NULL popup can be used to indicate default in a derived class
-    virtual void SetPopupControl( wxComboPopup* popup );
+    void SetPopupControl( wxComboPopup* popup )
+    {
+        DoSetPopupControl(popup);
+    }
 
     // get interface class instance derived from wxComboPopup
     wxComboPopup* GetPopupControl()
@@ -381,6 +384,9 @@ protected:
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
 
+    // NULL popup can be used to indicate default in a derived class
+    virtual void DoSetPopupControl(wxComboPopup* popup);
+
     // ensures there is atleast the default popup
     void EnsurePopupControl();