X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..db4444f0cebf4e63e666a7d6d18141c127535efd:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index 288f51fb1d..57dd27b15a 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -7,7 +7,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) wxWindows team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TIMER_H_BASE_ @@ -123,8 +123,6 @@ protected: #include "wx/mac/timer.h" #elif defined(__WXPM__) #include "wx/os2/timer.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/timer.h" #endif // ---------------------------------------------------------------------------- @@ -207,10 +205,21 @@ public: void Start(long t0 = 0); // pause the stop watch - void Pause() { if ( !m_pauseCount++) m_pause = GetElapsedTime(); } + void Pause() + { + if ( !m_pauseCount++ ) + m_pause = GetElapsedTime(); + } // resume it - void Resume() { if ( !--m_pauseCount ) Start(m_pause); } + void Resume() + { + wxASSERT_MSG( m_pauseCount > 0, + _T("Resuming stop watch which is not paused") ); + + if ( !--m_pauseCount ) + Start(m_pause); + } // get elapsed time since the last Start() in milliseconds long Time() const;