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 6f0cbfae94c614118dfe048a3e76aa8b9384b2bd..0f59261522b276b79144b6243d0bac39d655aa50 100644 (file)
--- 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>
 
@@ -21,7 +22,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-// Get size of display
 void wxDisplaySize(int *width, int *height)
 {
     // TODO
@@ -49,13 +49,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
@@ -84,7 +84,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