moved wxDash typedef to gdicmn.h

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

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index a26d420e68825c2bdcca6adf71a7c8b9f5e60c79..f6148e0aa91db1a73a85bfd1ce21ce968a8598e8 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -19,7 +19,7 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// headers
+// wxWin headers
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
@@ -41,10 +41,18 @@
 #include "wx/timer.h"
 #include "wx/longlong.h"
 
+// ----------------------------------------------------------------------------
+// System headers
+// ----------------------------------------------------------------------------
+
 #if defined(__WIN32__)
     #include <windows.h>
 #endif
 
+#if defined(__WIN32__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#endif
+
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t
@@ -61,7 +69,9 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+#if wxUSE_GUI
+    IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // macros
@@ -92,6 +102,8 @@ wxLongLong wxGetLocalTimeMillis();
 // wxTimerBase
 // ----------------------------------------------------------------------------
 
+#if wxUSE_GUI
+
 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it
@@ -102,6 +114,8 @@ void wxTimerBase::Notify()
     (void)m_owner->ProcessEvent(event);
 }
 
+#endif // wxUSE_GUI
+
 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------
@@ -109,13 +123,12 @@ void wxTimerBase::Notify()
 void wxStopWatch::Start(long t)
 {
     m_t0 = wxGetLocalTimeMillis() - t;
-
     m_pause = 0;
 }
 
-inline long wxStopWatch::GetElapsedTime() const
+long wxStopWatch::GetElapsedTime() const
 {
-    return (wxGetLocalTimeMillis() - m_t0).GetLo();
+  return (wxGetLocalTimeMillis() - m_t0).GetLo();
 }
 
 long wxStopWatch::Time() const
@@ -219,11 +232,16 @@ long wxGetUTCTime()
 
             if (t0 != (time_t)-1 )
                 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
-            wxLogSysError(_("Failed 2nd mktime"));
+            wxLogSysError(_("mktime() failed"));
+        }
+        else
+        {
+            wxLogSysError(_("gmtime() failed"));
         }
-        wxLogSysError(_("Failed gmtime"));
     }
-    wxLogSysError(_("Failed to get the UTC system time"));
+
+    wxLogError(_("Failed to get the UTC system time."));
+
     return -1;
 }
 
@@ -231,37 +249,58 @@ long wxGetUTCTime()
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetLocalTimeMillis()
 {
-    // We use wxGetLocalTime() to get the seconds since
-    // 00:00:00 Jan 1st 1970 and then whatever is available
-    // to get millisecond resolution.
-    //
     wxLongLong val = 1000l;
-    val *= wxGetLocalTime();
 
-    // If we got here, do not fail even if we can't get
-    // millisecond resolution.
-    //
-#if defined(__WIN32__)
-    SYSTEMTIME st;
-    ::GetLocalTime(&st);
-    return (val + st.wMilliseconds);
-#elif defined(HAVE_GETTIMEOFDAY)
+    // If possible, use a functin which avoids conversions from
+    // broken-up time structures to milliseconds,
+
+#if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
     {
+        val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }
-#elif defined(HAVE_FTIME)
-    struct timeb tp;
-    if ( ftime(&tp) == 0 )
+    else
     {
-        return (val + tp.millitm);
+        wxLogError(_("wxGetTimeOfDay failed."));
+        return 0;
     }
+#elif defined(HAVE_FTIME)
+    struct timeb tp;
+
+    // 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);
+    val *= tp.time;
+    return (val + tp.millitm);
+#else
+    // We use wxGetLocalTime() to get the seconds since
+    // 00:00:00 Jan 1st 1970 and then whatever is available
+    // to get millisecond resolution.
+    //
+    // NOTE that this might lead to a problem if the clocks
+    // use different sources, so this approach should be
+    // avoided where possible.
+
+    val *= wxGetLocalTime();
+
+#if defined(__VISAGECPP__)
+    DATETIME dt;
+    ::DosGetDateTime(&dt);
+    val += (dt.hundredths*10);
+#elif defined (__WIN32__)
+#warning "Possible clock skew bug in wxStopWatch!"
+    SYSTEMTIME st;
+    ::GetLocalTime(&st);
+    val += st.wMilliseconds;
 #else
-#ifndef __BORLANDC__
-    #warning "wxStopWatch will be up to second resolution!"
+#ifndef __VISUALC__
+#warning "wxStopWatch will be up to second resolution!"
 #endif
 #endif
 
     return val;
+
+#endif
 }