Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 67a06eda99de267746ac1938f517fe57322e44a7..e0a3db75c6c8d8a488474f868ad628b209305146 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2089,7 +2089,34 @@ void wxComboCtrlBase::DestroyPopup()
 
     wxDELETE(m_popupEvtHandler);
 
-    wxDELETE(m_popupInterface);
+    if ( m_popupInterface )
+    {
+        // Here we make sure that the popup control's Destroy() gets called.
+        // This is necessary for the wxPersistentWindow to work properly.
+        wxWindow* popupCtrl = m_popupInterface->GetControl();
+        if ( popupCtrl )
+        {
+            // While all wxComboCtrl examples have m_popupInterface and
+            // popupCtrl as the same class (that will be deleted via the
+            // Destroy() call below), it is technically still possible to
+            // have implementations where they are in fact not same
+            // multiple-inherited class. Here we use C++ RTTI to check for
+            // this rare case.
+          #ifndef wxNO_RTTI
+            // It is probably better to delete m_popupInterface first, so
+            // that it retains access to its popup control window.
+            if ( dynamic_cast<void*>(m_popupInterface) !=
+                 dynamic_cast<void*>(popupCtrl) )
+                delete m_popupInterface;
+          #endif
+            popupCtrl->Destroy();
+        }
+        else
+        {
+            delete m_popupInterface;
+        }
+        m_popupInterface = NULL;
+    }
 
     if ( m_winPopup )
     {