LIB instead of Static, better aligned

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

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 14c47ad65c8284a08a0ce0adef91f0587348d9be..6f0cbfae94c614118dfe048a3e76aa8b9384b2bd 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -12,6 +12,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"

+#include "wx/apptrait.h"

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 


@@ -24,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*)


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

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+int wxGUIAppTraits::GetOSVersion(int *verMaj, int *verMin)

 {
 {

-    // TODO
+    if(verMaj)
+        *verMaj=0;
+    if(verMin)
+        *verMin=0;

     return 0;
 }
 
     return 0;
 }