From: Vadim Zeitlin Date: Sun, 27 Nov 2011 19:50:35 +0000 (+0000) Subject: Use wxGetUTCTimeMillis() instead of wxGetLocalTimeMillis() in wxStopWatch. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e16458826d99c9c76c93ee46933a22d89a38a388?hp=cec1b1ab0b03e504470c0689d5098bbcd0e0b2f7 Use wxGetUTCTimeMillis() instead of wxGetLocalTimeMillis() in wxStopWatch. Using local time meant that wxStopWatch didn't work reliably around DST changes. It also was completely unnecessary, just use the UTC clock instead. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 476237c9cf..b0e6ddde40 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -134,7 +134,7 @@ wxLongLong wxStopWatch::GetCurrentClockValue() const } #endif // __WXMSW__ - return wxGetLocalTimeMillis(); + return wxGetUTCTimeMillis(); } wxLongLong wxStopWatch::TimeInMicro() const @@ -158,14 +158,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;