do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 3156561f31dac826c146148ae167c6b75f0494c0..320091fbb0daed46595a37b69e9effc59d8674c9 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -25,6 +25,10 @@
 void wxDisplaySize(int *width, int *height)
 {
     // TODO
 void wxDisplaySize(int *width, int *height)
 {
     // TODO

+    if(width)
+        *width = 1024;
+    if(height)
+        *height = 768;

 }
 
 void wxDisplaySizeMM(int*,int*)
 }
 
 void wxDisplaySizeMM(int*,int*)


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

-int wxGUIAppTraits::GetOSVersion(int *verMaj, int *verMin)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    if(verMaj)
-        *verMaj=0;
-    if(verMin)
-        *verMin=0;
-    return 0;
+    static wxToolkitInfo info;
+    info.shortName = _T("cocoa");
+    info.name = _T("wxCocoa");
+    // TODO: Finish this
+    return info;

 }
 
 // Return TRUE if we have a colour display
 }
 
 // Return TRUE if we have a colour display