Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 476237c9cf18376f3d37dde4f653ded78ed54f32..21c522f5d9aecfc258993ca80682d62bd55cb5ea 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -8,7 +8,6 @@
 //    Guillermo Rodriguez <guille@iies.es> rewrote from scratch (Dic/99)
 // Modified by:
 // Created:     20.06.2003 (extracted from common/timercmn.cpp)
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998-2003 wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,10 +32,11 @@
 #if wxUSE_STOPWATCH
 
 #ifndef WX_PRECOMP
-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__
         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/log.h"
+    #include "wx/thread.h"
 #endif //WX_PRECOMP
 
 // ============================================================================
@@ -50,7 +50,7 @@
 namespace
 {
 
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
 
 struct PerfCounter
 {
@@ -64,12 +64,12 @@ struct PerfCounter
         return freq.QuadPart != 0;
     }
 
-    wxCriticalSection cs;
+    wxCRIT_SECT_DECLARE_MEMBER(cs);
     LARGE_INTEGER freq;
     bool init;
 } gs_perfCounter;
 
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
 const int MILLISECONDS_PER_SECOND = 1000;
 const int MICROSECONDS_PER_MILLISECOND = 1000;
@@ -79,10 +79,10 @@ const int MICROSECONDS_PER_SECOND = 1000*1000;
 
 void wxStopWatch::DoStart()
 {
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     if ( !gs_perfCounter.init )
     {
-        wxCriticalSectionLocker lock(gs_perfCounter.cs);
+        wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
         ::QueryPerformanceFrequency(&gs_perfCounter.freq);
 
         // Just a sanity check: it's not supposed to happen but verify that
@@ -98,26 +98,37 @@ void wxStopWatch::DoStart()
 
         gs_perfCounter.init = true;
     }
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
     m_t0 = GetCurrentClockValue();
 }
 
 wxLongLong wxStopWatch::GetClockFreq() const
 {
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     // Under MSW we use the high resolution performance counter timer which has
     // its own frequency (usually related to the CPU clock speed).
     if ( gs_perfCounter.CanBeUsed() )
         return gs_perfCounter.freq.QuadPart;
-#endif // __WXMSW__
-
+#endif // __WINDOWS__
+
+#ifdef HAVE_GETTIMEOFDAY
+    // With gettimeofday() we can have nominally microsecond precision and
+    // while this is not the case in practice, it's still better than
+    // millisecond.
+    return MICROSECONDS_PER_SECOND;
+#else // !HAVE_GETTIMEOFDAY
     // Currently milliseconds are used everywhere else.
     return MILLISECONDS_PER_SECOND;
+#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
 }
 
 void wxStopWatch::Start(long t0)
 {
+    // Calling Start() makes the stop watch run however many times it was
+    // paused before.
+    m_pauseCount = 0;
+
     DoStart();
 
     m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND;
@@ -125,16 +136,20 @@ void wxStopWatch::Start(long t0)
 
 wxLongLong wxStopWatch::GetCurrentClockValue() const
 {
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
     if ( gs_perfCounter.CanBeUsed() )
     {
         LARGE_INTEGER counter;
         ::QueryPerformanceCounter(&counter);
         return counter.QuadPart;
     }
-#endif // __WXMSW__
+#endif // __WINDOWS__
 
-    return wxGetLocalTimeMillis();
+#ifdef HAVE_GETTIMEOFDAY
+    return wxGetUTCTimeUSec();
+#else // !HAVE_GETTIMEOFDAY
+    return wxGetUTCTimeMillis();
+#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
 }
 
 wxLongLong wxStopWatch::TimeInMicro() const
@@ -158,14 +173,14 @@ static wxLongLong wxStartTime = 0l;
 // starts the global timer
 void wxStartTimer()
 {
-    wxStartTime = wxGetLocalTimeMillis();
+    wxStartTime = wxGetUTCTimeMillis();
 }
 
 // Returns elapsed time in milliseconds
 long wxGetElapsedTime(bool resetTimer)
 {
     wxLongLong oldTime = wxStartTime;
-    wxLongLong newTime = wxGetLocalTimeMillis();
+    wxLongLong newTime = wxGetUTCTimeMillis();
 
     if ( resetTimer )
         wxStartTime = newTime;