X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/stopwatch.h diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index 9a014c5cd8..325722a892 100644 --- a/include/wx/stopwatch.h +++ b/include/wx/stopwatch.h @@ -4,20 +4,23 @@ // Author: Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch) // Created: 26.06.03 (extracted from wx/timer.h) // RCS-ID: $Id$ -// Copyright: (c) 1998-2003 wxWindows team +// Copyright: (c) 1998-2003 Julian Smart, Sylvain Bougnoux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STOPWATCH_H_ #define _WX_STOPWATCH_H_ -// + +#include "wx/defs.h" +#include "wx/longlong.h" + // ---------------------------------------------------------------------------- // wxStopWatch: measure time intervals with up to 1ms resolution // ---------------------------------------------------------------------------- #if wxUSE_STOPWATCH -class WXDLLEXPORT_BASE wxStopWatch +class WXDLLIMPEXP_BASE wxStopWatch { public: // ctor starts the stop watch @@ -29,7 +32,7 @@ public: // pause the stop watch void Pause() { - if ( !m_pauseCount++ ) + if ( m_pauseCount++ == 0 ) m_pause = GetElapsedTime(); } @@ -37,9 +40,9 @@ public: void Resume() { wxASSERT_MSG( m_pauseCount > 0, - _T("Resuming stop watch which is not paused") ); + wxT("Resuming stop watch which is not paused") ); - if ( !--m_pauseCount ) + if ( --m_pauseCount == 0 ) Start(m_pause); } @@ -63,34 +66,49 @@ private: #endif // wxUSE_STOPWATCH -#if wxUSE_LONGLONG +#if wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6 -// Starts a global timer -// -- DEPRECATED: use wxStopWatch instead -void WXDLLEXPORT_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 WXDLLEXPORT_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 // ---------------------------------------------------------------------------- // Get number of seconds since local time 00:00:00 Jan 1st 1970. -extern long WXDLLEXPORT_BASE wxGetLocalTime(); +extern long WXDLLIMPEXP_BASE wxGetLocalTime(); // Get number of seconds since GMT 00:00:00, Jan 1st 1970. -extern long WXDLLEXPORT_BASE wxGetUTCTime(); +extern long WXDLLIMPEXP_BASE wxGetUTCTime(); #if wxUSE_LONGLONG -// Get number of milliseconds since local time 00:00:00 Jan 1st 1970 -extern wxLongLong WXDLLEXPORT_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_