preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

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

diff --git a/src/cocoa/utils.cpp b/src/cocoa/utils.cpp
index 6f0cbfae94c614118dfe048a3e76aa8b9384b2bd..a2ae48aa1a9e89da70cc08286dc3bb1874fdcbe7 100644 (file)
--- a/src/cocoa/utils.cpp
+++ b/src/cocoa/utils.cpp
@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utils.cpp
+// Name:        src/cocoa/utils.cpp
 // Purpose:     Various utilities
-// Author:      AUTHOR
-// Modified by:
+// Author:      David Elliott
 // Created:     2003/??/??
-// RCS-ID:      $Id:
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets dev team
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
 #include "wx/apptrait.h"
+#include "wx/display.h"
+#include "wx/cocoa/private/timer.h"
 
 #include <ctype.h>
 
@@ -21,7 +27,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-// Get size of display
 void wxDisplaySize(int *width, int *height)
 {
     // TODO
@@ -49,20 +54,29 @@ void wxClientDisplayRect(int *x,int *y,int *width,int *height)
         *height=768;
 }
 
-int wxGUIAppTraits::GetOSVersion(int *verMaj, int *verMin)
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {
-    if(verMaj)
-        *verMaj=0;
-    if(verMin)
-        *verMin=0;
-    return 0;
+    // We suppose that toolkit version is the same as OS version under Mac
+    wxGetOsVersion(verMaj, verMin);
+
+    return wxPORT_COCOA;
+}
+
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer* timer)
+{
+    return new wxCocoaTimerImpl(timer);
+}
+
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
 }
 
-// Return TRUE if we have a colour display
+// Return true if we have a colour display
 bool wxColourDisplay()
 {
     // TODO
-    return TRUE;
+    return true;
 }
 
 void wxGetMousePosition( int* x, int* y )
@@ -84,7 +98,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
@@ -97,82 +111,8 @@ void wxFlushEvents()
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
     // TODO
-    return FALSE;
+    return false;
 }
 
 #endif
 
-// Reading and writing resources (eg WIN.INI, .Xdefaults)
-#if wxUSE_RESOURCES
-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
-{
-    // TODO
-    return FALSE;
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
-{
-  char buf[50];
-  sprintf(buf, "%.4f", value);
-  return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
-{
-  char buf[50];
-  sprintf(buf, "%ld", value);
-  return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
-{
-  char buf[50];
-  sprintf(buf, "%d", value);
-  return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
-{
-    // TODO
-    return FALSE;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
-{
-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = (float)strtod(s, NULL);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
-{
-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = strtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
-{
-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = (int)strtol(s, NULL, 10);
-    delete[] s; 
-    return TRUE;
-  }
-  else return FALSE;
-}
-#endif // wxUSE_RESOURCES