X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/608f8a111b6149267dc58ba87ea8de2edb550685..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/stopwatch.h?ds=sidebyside diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index 75f789592b..583c75a495 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -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 @@ -90,8 +90,10 @@ extern long WXDLLIMPEXP_BASE wxGetUTCTime(); #if wxUSE_LONGLONG 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 @@ -99,5 +101,14 @@ 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_