X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ff126ac4ff57ab4aa22a5c7c7ce621479e8739..7da37f2c5d7addc655e3c6bcd29a8877c360b35b:/include/wx/stopwatch.h diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h index dcb5542f20..cc12e772a0 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); } @@ -99,4 +99,14 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis(); #define wxGetCurrentTime() wxGetLocalTime() +// 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_