compilation fix for PCH-less build after last commit

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index fe9a0036c2ccfc19736164db2c7bdc283f220439..dcdaec3cbe58352b707c382b4bd238959852d4c3 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -66,13 +66,26 @@ bool wxDialog::Show( bool show )
         EndModal( wxID_CANCEL );
     }
 
-    bool ret = wxWindow::Show( show );
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
 
-    if (show) InitDialog();
+    bool ret = wxDialogBase::Show(show);
+
+    if (show)
+        InitDialog();
 
     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;
@@ -85,11 +98,7 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
 
 int wxDialog::ShowModal()
 {
-    if (IsModal())
-    {
-       wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );
-       return GetReturnCode();
-    }
+    wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );
 
     // release the mouse if it's currently captured as the window having it
     // will be disabled when this dialog is shown -- but will still keep the
@@ -136,7 +145,7 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
-        wxFAIL_MSG( wxT("wxDialog:EndModal called twice") );
+        wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" );
         return;
     }