Added wxInfoBar::AddButton().

[wxWidgets.git] / src / motif / dialog.cpp

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index ceb4ca922e20df771fd869b6ed7faee5a0cb6854..347e11354cfeb7aacdfadb6d45fd2e24f0b86ae8 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -181,7 +181,10 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);
 
     delete m_eventLoop;
 
@@ -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)