X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ecf902bc836f2808444b34eff48cdb12f289460..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/stopwatch.h diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index d7abae28be..583c75a495 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -4,7 +4,7 @@ // Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch) // Created: 26.06.03 (extracted from wx/timer.h) // RCS-ID: $Id$ -// Copyright: (c) 1998-2003 wxWidgets team +// Copyright: (c) 1998-2003 Julian Smart, Sylvain Bougnoux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public: // pause the stop watch void Pause() { - if ( !m_pauseCount++ ) + if ( m_pauseCount++ == 0 ) m_pause = GetElapsedTime(); } @@ -42,7 +42,7 @@ public: wxASSERT_MSG( m_pauseCount > 0, _T("Resuming stop watch which is not paused") ); - if ( !--m_pauseCount ) + if ( --m_pauseCount == 0 ) Start(m_pause); } @@ -66,17 +66,17 @@ private: #endif // wxUSE_STOPWATCH -#if wxUSE_LONGLONG +#if wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6 -// Starts a global timer -// -- DEPRECATED: use wxStopWatch instead -void WXDLLIMPEXP_BASE wxStartTimer(); + // Starts a global timer + // -- DEPRECATED: use wxStopWatch instead + wxDEPRECATED( void WXDLLIMPEXP_BASE wxStartTimer() ); -// Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime -// -- DEPRECATED: use wxStopWatch instead -long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true); + // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime + // -- DEPRECATED: use wxStopWatch instead + wxDEPRECATED( long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true) ); -#endif // wxUSE_LONGLONG +#endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6 // ---------------------------------------------------------------------------- // global time functions @@ -89,11 +89,26 @@ extern long WXDLLIMPEXP_BASE wxGetLocalTime(); extern long WXDLLIMPEXP_BASE wxGetUTCTime(); #if wxUSE_LONGLONG -// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 -extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); + typedef wxLongLong wxMilliClock_t; + inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); } +#else + typedef double wxMilliClock_t; + inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); } #endif // wxUSE_LONGLONG +// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 +extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); + #define wxGetCurrentTime() wxGetLocalTime() -#endif // _WX_STOPWATCH_H_ +// on some really old systems gettimeofday() doesn't have the second argument, +// define wxGetTimeOfDay() to hide this difference +#ifdef HAVE_GETTIMEOFDAY + #ifdef WX_GETTIMEOFDAY_NO_TZ + #define wxGetTimeOfDay(tv) gettimeofday(tv) + #else + #define wxGetTimeOfDay(tv) gettimeofday((tv), NULL) + #endif +#endif // HAVE_GETTIMEOFDAY +#endif // _WX_STOPWATCH_H_