GTK2: gtk_idle_add_priority -> g_idle_add_full; gtk_idle_remove -> g_source_remove

[wxWidgets.git] / src / common / stopwatch.cpp

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 901693c3e029ce61d1dd6b8a22d436f171e10c6c..cd13eb058882e55cee011b27bd59f164cbde7523 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -79,8 +79,18 @@
 #endif
 
 #ifdef __WXMAC__
+#ifndef __DARWIN__
     #include <Timer.h>
     #include <DriverServices.h>
+#else
+    #include <Carbon/Carbon.h>
+#endif
+#endif
+
+#ifdef __WXPALMOS__
+    #include <DateTime.h>
+    #include <TimeMgr.h>
+    #include <SystemMgr.h>
 #endif
 
 // ----------------------------------------------------------------------------
@@ -110,8 +120,8 @@
 
 void wxStopWatch::Start(long t)
 {
-#ifdef 0
-__WXMSW__
+#if 0
+// __WXMSW__
     LARGE_INTEGER frequency_li;
     ::QueryPerformanceFrequency( &frequency_li );
     m_frequency = frequency_li.QuadPart;
@@ -135,8 +145,8 @@ __WXMSW__
 
 long wxStopWatch::GetElapsedTime() const
 {
-#ifdef 0
-__WXMSW__
+#if 0
+//__WXMSW__
     if (m_frequency == 0)
     {
         return (wxGetLocalTimeMillis() - m_t0).GetLo();
@@ -240,7 +250,19 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
-#if defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
+#if defined(__WXPALMOS__)
+    DateTimeType thenst;
+    thenst.second  = 0;
+    thenst.minute  = 0;
+    thenst.hour    = 0;
+    thenst.day     = 1;
+    thenst.month   = 1;
+    thenst.year    = 1970;
+    thenst.weekDay = 5;
+    uint32_t now = TimGetSeconds();
+    uint32_t then = TimDateTimeToSeconds (&thenst);
+    return SysTimeToMilliSecs(SysTimeInSecs(now - then));
+#elif defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
     // This should probably be the way all WXMSW compilers should do it
     // Go direct to the OS for time
 
@@ -274,7 +296,7 @@ wxLongLong wxGetLocalTimeMillis()
 
     // ftime() is void and not int in some mingw32 headers, so don't
     // test the return code (well, it shouldn't fail anyhow...)
-    (void)ftime(&tp);
+    (void)::ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)