Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / dialog_osx.cpp

diff --git a/src/osx/dialog_osx.cpp b/src/osx/dialog_osx.cpp
index e605e95f3fa511ead9e4b5e98bfefe4a4191b3af..b1b50b980a5bb5c2b3effcbb42d484bf160b6f32 100644 (file)
--- a/src/osx/dialog_osx.cpp
+++ b/src/osx/dialog_osx.cpp
@@ -23,10 +23,23 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-// Lists to keep track of windows, so we can disable/enable them
-// for modal dialogs
+static int s_openDialogs = 0;
+bool wxDialog::OSXHasModalDialogsOpen()
+{
+    return s_openDialogs > 0;
+}
+
+void wxDialog::OSXBeginModalDialog()
+{
+    s_openDialogs++;
+}
+
+void wxDialog::OSXEndModalDialog()
+{
+    wxASSERT_MSG( s_openDialogs > 0, "incorrect internal modal dialog count");
+    s_openDialogs--;
+}

 
 

-wxList wxModalDialogs;

 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 


@@ -130,7 +143,9 @@ int wxDialog::ShowModal()
     wxModalEventLoop modalLoop(this);
     m_eventLoop = &modalLoop;
     
     wxModalEventLoop modalLoop(this);
     m_eventLoop = &modalLoop;
     

+    wxDialog::OSXBeginModalDialog();

     modalLoop.Run();
     modalLoop.Run();

+    wxDialog::OSXEndModalDialog();

     
     m_eventLoop = NULL;
     
     
     m_eventLoop = NULL;