ensure that IsDialogMessage() is not called in the situations when it may hang not...

[wxWidgets.git] / src / cocoa / utils.cpp

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index ba082d0a3284049e6ef1a58bf5bf5671ef4ab490..c2112fc5528af7db7714a8704f665421d3e4320e 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/cocoa/utils.cpp

 // Purpose:     Various utilities
 // Author:      AUTHOR
 // Modified by:
 // Purpose:     Various utilities
 // Author:      AUTHOR
 // Modified by:


@@ -9,9 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"
+

 #include "wx/utils.h"
 #include "wx/utils.h"

-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+

 #include "wx/apptrait.h"
 #include "wx/display.h"
 
 #include "wx/apptrait.h"
 #include "wx/display.h"
 


@@ -49,13 +54,12 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height)
         *height=768;
 }
 
         *height=768;
 }
 

-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const

 {
 {

-    static wxToolkitInfo info;
-    info.shortName = _T("cocoa");
-    info.name = _T("wxCocoa");
-    // TODO: Finish this
-    return info;
+    // We suppose that toolkit version is the same as OS version under Mac
+    wxGetOsVersion(verMaj, verMin);
+
+    return wxPORT_COCOA;

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)