X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31fdb8d993d3d4373199b1a676b271c4fd4c12e8..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/dialog.cpp?ds=sidebyside

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 7688d3329b..2a2e83a0e0 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -13,24 +13,20 @@
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/frame.h"
     #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
 #include "wx/evtloop.h"
 
-#include <gdk/gdk.h>
+#include "wx/scopedptr.h"
+
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
-#include "wx/gtk/win_gtk.h"
+// this is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
 
-extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -40,8 +36,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 void wxDialog::Init()
 {
+    m_modalLoop = NULL;
     m_returnCode = 0;
-    m_sizeSet = false;
     m_modalShowing = false;
     m_themeEnabled = true;
 }
@@ -76,23 +72,24 @@ bool wxDialog::Show( bool show )
         EndModal( wxID_CANCEL );
     }
 
-    if (show && !m_sizeSet)
-    {
-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker nor from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
 
-        GtkOnSize();
-    }
-
-    bool ret = wxWindow::Show( show );
+    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;
@@ -105,11 +102,14 @@ 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
+    // capture making it impossible to do anything in the modal dialog itself
+    wxWindow * const win = wxWindow::GetCapture();
+    if ( win )
+        win->GTKReleaseMouseAndNotify();
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
@@ -129,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);
 
-    wxEventLoop().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();
 }
@@ -149,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 );
 }