Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup control obtained via GetControl() member function. Also still delete m_popupInterface if there was no popup control, or if it was implemented as a separate class (versus being multiple-inherited along side wxComboPopup, as has been the common practice).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 )
|
||||
{
|
||||
|
Reference in New Issue
Block a user