From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Sat, 20 May 2006 23:35:23 +0000 (+0000)
Subject: [ 1492040 ] Prevent wxComboCtrl::GetPopupControl from failing.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e4e11217be476f2719cf45f012e5abcbd883c963

[ 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 db19acef5b..213409a74b 100644
--- 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; }