Don't call StartingKey if the key was F2

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

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 14c47ad65c8284a08a0ce0adef91f0587348d9be..0f59261522b276b79144b6243d0bac39d655aa50 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -12,6 +12,8 @@
 #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 "wx/display.h"

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


@@ -20,10 +22,13 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-// Get size of display

 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,10 +49,13 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height)
         *height=768;
 }
 
         *height=768;
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    // TODO
-    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


@@ -76,7 +84,7 @@ void wxBell()
 }
 
 #if 0
 }
 
 #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
 // them.  If someone needs them, then they'll get a link error
 
 // Consume all events until no more left