added xpmdecod.cpp

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index ecf4d66387d8c610f3d3acaf97d52d26eb4fe54d..e90b5fd4ade7c1fd0cdaa082f304d24588ba9c24 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -53,6 +53,13 @@
     #define HAVE_FTIME
 #endif
 
     #define HAVE_FTIME
 #endif
 

+#if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#  if __IBMCPP__ >= 400
+    #  define ftime(x) _ftime(x)
+#  endif
+#endif
+

 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t


@@ -108,6 +115,26 @@ void wxTimerBase::Notify()
     (void)m_owner->ProcessEvent(event);
 }
 
     (void)m_owner->ProcessEvent(event);
 }
 

+bool wxTimerBase::Start(int milliseconds, bool oneShot)
+{
+    if ( IsRunning() )
+    {
+        // not stopping the already running timer might work for some
+        // platforms (no problems under MSW) but leads to mysterious crashes
+        // on the others (GTK), so to be on the safe side do it here
+        Stop();
+    }
+
+    if ( milliseconds != -1 )
+    {
+        m_milli = milliseconds;
+    }
+
+    m_oneShot = oneShot;
+
+    return TRUE;
+}
+

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -279,16 +306,8 @@ wxLongLong wxGetLocalTimeMillis()
 
     val *= wxGetLocalTime();
 
 
     val *= wxGetLocalTime();
 

-#if defined(__VISAGECPP__)
-    // If your platform/compiler needs to use two different functions
-    // to get ms resolution, please do NOT just shut off these warnings,
-    // drop me a line instead at <guille@iies.es>
-    #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
-
-    DATETIME dt;
-    ::DosGetDateTime(&dt);
-    val += (dt.hundredths*10);
-#elif defined (__WIN32__)
+// GRG: This will go soon as all WIN32 seem to have ftime
+#if defined (__WIN32__)

     // If your platform/compiler needs to use two different functions
     // to get ms resolution, please do NOT just shut off these warnings,
     // drop me a line instead at <guille@iies.es>
     // If your platform/compiler needs to use two different functions
     // to get ms resolution, please do NOT just shut off these warnings,
     // drop me a line instead at <guille@iies.es>