reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long...

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 7a4f9e300917bb366ccd89d5e8bf495456d54c8e..c70813d55755b7da1ccdee9223032d091a3111a8 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -69,13 +69,23 @@ bool wxDialog::Show( bool show )
     if (show && CanDoLayoutAdaptation())
         DoLayoutAdaptation();
 
     if (show && CanDoLayoutAdaptation())
         DoLayoutAdaptation();
 

-    bool ret = wxWindow::Show( show );
+    bool ret = wxDialogBase::Show(show);

 
 

-    if (show) InitDialog();
+    if (show)
+        InitDialog();

 
     return ret;
 }
 
 
     return ret;
 }
 

+wxDialog::~wxDialog()
+{
+    m_isBeingDeleted = true;
+
+    // if the dialog is modal, this will end its event loop
+    if ( IsModal() )
+        EndModal(wxID_CANCEL);
+}
+

 bool wxDialog::IsModal() const
 {
     return m_modalShowing;
 bool wxDialog::IsModal() const
 {
     return m_modalShowing;


@@ -139,7 +149,7 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
 
     if (!IsModal())
     {

-        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
+        wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" );

         return;
     }
 
         return;
     }