compilation fix for old SDKs (VC6...) which don't define HDM_SETBITMAPMARGIN/Header_S...

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index c61fbca5155360091dd7f6f8a0cb07f85969307b..8c40909e05a48934dd86db91a7499a08c3de598d 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -18,11 +18,16 @@
 
 #include "wx/evtloop.h"
 
+#include "wx/ptr_scpd.h"
+
 #include <gtk/gtk.h>
 
 // this is defined in src/gtk/toplevel.cpp
 extern int wxOpenModalDialogsCount;
 
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
+
+
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
@@ -31,6 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 
 void wxDialog::Init()
 {
+    m_modalLoop = NULL;
     m_returnCode = 0;
     m_modalShowing = false;
     m_themeEnabled = true;
@@ -99,7 +105,6 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
 int wxDialog::ShowModal()
 {
     wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );
-    wxASSERT_MSG( !IsShown(), "ShowModal() can't be called after Show()" );
 
     // 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
@@ -131,7 +136,11 @@ int wxDialog::ShowModal()
     // 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);
 
@@ -152,7 +161,10 @@ void wxDialog::EndModal( int retCode )
 
     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 );
 }