use popen() instead of wxExecute(), it works inside wxYield() unlike the latter

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 901693c3e029ce61d1dd6b8a22d436f171e10c6c..236dc5aa67b766cc46426e54cf4a06c23d4194d3 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -110,8 +110,8 @@
 
 void wxStopWatch::Start(long t)
 {
 
 void wxStopWatch::Start(long t)
 {

-#ifdef 0
-__WXMSW__
+#if 0
+// __WXMSW__

     LARGE_INTEGER frequency_li;
     ::QueryPerformanceFrequency( &frequency_li );
     m_frequency = frequency_li.QuadPart;
     LARGE_INTEGER frequency_li;
     ::QueryPerformanceFrequency( &frequency_li );
     m_frequency = frequency_li.QuadPart;


@@ -135,8 +135,8 @@ __WXMSW__
 
 long wxStopWatch::GetElapsedTime() const
 {
 
 long wxStopWatch::GetElapsedTime() const
 {

-#ifdef 0
-__WXMSW__
+#if 0
+//__WXMSW__

     if (m_frequency == 0)
     {
         return (wxGetLocalTimeMillis() - m_t0).GetLo();
     if (m_frequency == 0)
     {
         return (wxGetLocalTimeMillis() - m_t0).GetLo();


@@ -240,7 +240,19 @@ wxLongLong wxGetLocalTimeMillis()
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
     // 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
 
     // This should probably be the way all WXMSW compilers should do it
     // Go direct to the OS for time