[ 1492040 ] Prevent wxComboCtrl::GetPopupControl from failing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/combo.h b/include/wx/combo.h
index db19acef5b161143fd3bd4ef35601d5093f69ead..213409a74b321ac3624857daadeabea2fd2ab2e1 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -159,7 +159,11 @@ public:
     virtual void SetPopupControl( wxComboPopup* popup );
 
     // get interface class instance derived from wxComboPopup
-    wxComboPopup* GetPopupControl() const { return m_popupInterface; }
+    wxComboPopup* GetPopupControl()
+    {
+        EnsurePopupControl();
+        return m_popupInterface;
+    }
 
     // get the popup window containing the popup control
     wxWindow *GetPopupWindow() const { return m_winPopup; }