X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cca410b336cd5628a944ede9e9944fdbb04552d4..f51723055aa4334a355a19e87bb2b478b4204d15:/src/gtk/dialog.cpp

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index dc66c23778..2a2e83a0e0 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -18,14 +18,15 @@
 
 #include "wx/evtloop.h"
 
+#include "wx/scopedptr.h"
+
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+// this is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;
+
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 
-// Don't allow window closing if there are open dialogs
-int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -35,6 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 void wxDialog::Init()
 {
+    m_modalLoop = NULL;
     m_returnCode = 0;
     m_modalShowing = false;
     m_themeEnabled = true;
@@ -70,13 +72,24 @@ bool wxDialog::Show( bool show )
         EndModal( wxID_CANCEL );
     }
 
-    bool ret = wxWindow::Show( show );
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+
+    bool ret = wxDialogBase::Show(show);
 
-    if (show) InitDialog();
+    if (show)
+        InitDialog();
 
     return ret;
 }
 
+wxDialog::~wxDialog()
+{
+    // if the dialog is modal, this will end its event loop
+    if ( IsModal() )
+        EndModal(wxID_CANCEL);
+}
+
 bool wxDialog::IsModal() const
 {
     return m_modalShowing;
@@ -89,11 +102,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
@@ -120,16 +129,20 @@ int wxDialog::ShowModal()
 
     m_modalShowing = true;
 
-    g_openDialogs++;
+    wxOpenModalDialogsCount++;
 
     // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
     gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);
 
-    wxGUIEventLoop().Run();
+    // Run modal dialog event loop.
+    {
+        wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop());
+        m_modalLoop->Run();
+    }
 
     gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 
-    g_openDialogs--;
+    wxOpenModalDialogsCount--;
 
     return GetReturnCode();
 }
@@ -140,13 +153,16 @@ 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;
     }
 
     m_modalShowing = false;
 
-    gtk_main_quit();
+    // Ensure Exit() is only called once. The dialog's event loop may be terminated
+    // externally due to an uncaught exception.
+    if (m_modalLoop && m_modalLoop->IsRunning())
+        m_modalLoop->Exit();
 
     Show( false );
 }