call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consist...

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 7b73b3b52d7ffeb5e4325a9750ca28ad06b12532..b14cd1100717035ae10cc876ec67386caf1be868 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -31,7 +31,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
-    virtual ~wxDialog() {}
+    virtual ~wxDialog();
 
     virtual bool Show( bool show = TRUE );
     virtual int ShowModal();

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index bb0f74e2efcee2dc2bc8e7c500681757380915d7..8a087ecae6e04c4b8c60db40f664b778e9afa794 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -71,11 +71,20 @@ bool wxDialog::Show( bool show )
 
     bool ret = wxWindow::Show( show );
 
-    if (show) InitDialog();
+    if (show)
+        InitDialog();
 
     return ret;
 }
 
+wxDialog::~wxDialog()
+{
+    m_isBeingDeleted = true;
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);
+}
+
 bool wxDialog::IsModal() const
 {
     return m_modalShowing;

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 858736fd33b960265b67d24b4fbca90d59dc3a6c..bb90e3812be7a6cb83f3cdfd81eca38da74de30b 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -77,6 +77,8 @@ void wxDialog::SetModal( bool flag )
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
+
+    // if the dialog is modal, this will end its event loop
     Show(false);
 }
 

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index ceb4ca922e20df771fd869b6ed7faee5a0cb6854..3955a68d4536e6385f011764ffde4e670c3f7e42 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -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)

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index ad510bd277abc02c0f456bace842cfffeb194d5a..c98a5e91ac581b5ac7ca314192e3992417e6d9de 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -53,6 +53,11 @@ void wxDialog::Init()
 
 wxDialog::~wxDialog()
 {
+    m_isBeingDeleted = true;
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);
+
     delete m_eventLoop;
 }