call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consistently in all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -183,6 +183,9 @@ wxDialog::~wxDialog()
|
||||
{
|
||||
m_isBeingDeleted = true;
|
||||
|
||||
// if the dialog is modal, this will end its event loop
|
||||
Show(false);
|
||||
|
||||
delete m_eventLoop;
|
||||
|
||||
if (m_mainWidget)
|
||||
@@ -241,6 +244,9 @@ bool wxDialog::Show( bool show )
|
||||
if( !wxWindowBase::Show( show ) )
|
||||
return false;
|
||||
|
||||
if ( !show && IsModal() )
|
||||
EndModal(wxID_CANCEL);
|
||||
|
||||
m_isShown = show;
|
||||
|
||||
if (show)
|
||||
|
Reference in New Issue
Block a user