X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a631300cb83b23107f5b61bd96a97a6ef05cc122..8300f815fa5f0e9486d14b057ce8fdda5785549b:/src/cocoa/utils.cpp?ds=sidebyside

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 3156561f31..ef9413bec6 100644
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -13,6 +13,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
+#include "wx/display.h"
 
 #include <ctype.h>
 
@@ -22,9 +23,18 @@
 #include <stdarg.h>
 
 // Get size of display
+size_t wxDisplayBase::GetCount()
+{
+    return 1;
+}
+
 void wxDisplaySize(int *width, int *height)
 {
     // TODO
+    if(width)
+        *width = 1024;
+    if(height)
+        *height = 768;
 }
 
 void wxDisplaySizeMM(int*,int*)
@@ -45,13 +55,13 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height)
         *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
@@ -80,7 +90,7 @@ void wxBell()
 }
 
 #if 0
-// DFE: These aren't even implemented by wxGTK, and no wxWindows code calls
+// DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls
 // them.  If someone needs them, then they'll get a link error
 
 // Consume all events until no more left