X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b704229ee25ef8e5765ec09e9c164f59063564e8..846e1424e2f563b699e7fcb81d10cf6f2246487f:/src/common/timercmn.cpp diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index 5334324680..64dbb0aac2 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -1,13 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: common/timercmn.cpp // Purpose: Common timer implementation -// Author: Julian Smart (original version) -// Modified by: Vadim Zeitlin on 12.11.99 to get rid of all ifdefs -// Sylvain Bougnoux to add wxStopWatch class -// -// Completely rewritten from scratch on Dic/99 by -// Guillermo Rodriguez -// +// Author: +// Original version by Julian Smart +// Vadim Zeitlin got rid of all ifdefs (11.12.99) +// Sylvain Bougnoux added wxStopWatch class +// Guillermo Rodriguez rewrote from scratch (Dic/99) +// Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem @@ -104,7 +103,7 @@ long wxStopWatch::GetElapsedTime() const // old timer functions superceded by wxStopWatch // ---------------------------------------------------------------------------- -static wxLongLong wxStartTime = 0; +static wxLongLong wxStartTime = 0l; // starts the global timer void wxStartTimer() @@ -212,7 +211,8 @@ wxLongLong wxGetLocalTimeMillis() // 00:00:00 Jan 1st 1970 and then whatever is available // to get millisecond resolution. // - wxLongLong val = 1000 * wxGetLocalTime(); + wxLongLong val = 1000l; + val *= wxGetLocalTime(); // If we got here, do not fail even if we can't get // millisecond resolution.