rename g_openDialogs to wxOpenModalDialogsCount and define it in toplevel.cpp to...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index dc66c237787529d7274c1901a0d048f7acacb01d..fe9a0036c2ccfc19736164db2c7bdc283f220439 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -20,12 +20,8 @@
 
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-// Don't allow window closing if there are open dialogs
-int g_openDialogs;
+// this is defined in src/gtk/toplevel.cpp
+extern int wxOpenModalDialogsCount;
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -120,7 +116,7 @@ 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);
@@ -129,7 +125,7 @@ int wxDialog::ShowModal()
 
     gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);
 
-    g_openDialogs--;
+    wxOpenModalDialogsCount--;
 
     return GetReturnCode();
 }

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index caca06176dced148fc4132634456fc1e23408b20..89a57919786cbf241a16d0aaea8e008ca3c272b8 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -54,7 +54,9 @@
 // data
 // ----------------------------------------------------------------------------
 
-extern int              g_openDialogs;
+// this is incremented while a modal dialog is shown
+int wxOpenModalDialogsCount = 0;
+
 extern wxWindowGTK     *g_delayedFocus;
 
 // the frame that is currently active (i.e. its child has focus). It is
@@ -275,7 +277,7 @@ gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
                            wxTopLevelWindowGTK *win )
 {
     if (win->IsEnabled() &&
-        (g_openDialogs == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||
+        (wxOpenModalDialogsCount == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||
          win->IsGrabbed()))
         win->Close();