reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 8a087ecae6e04c4b8c60db40f664b778e9afa794..c70813d55755b7da1ccdee9223032d091a3111a8 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -69,7 +69,7 @@ bool wxDialog::Show( bool show )
     if (show && CanDoLayoutAdaptation())
         DoLayoutAdaptation();
 
-    bool ret = wxWindow::Show( show );
+    bool ret = wxDialogBase::Show(show);
 
     if (show)
         InitDialog();
@@ -82,7 +82,8 @@ wxDialog::~wxDialog()
     m_isBeingDeleted = true;
 
     // if the dialog is modal, this will end its event loop
-    Show(false);
+    if ( IsModal() )
+        EndModal(wxID_CANCEL);
 }
 
 bool wxDialog::IsModal() const