Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug in wxStopWatch::Pause() (wouldn't pause if called immediately after Start()) and changed Pause()/Resume() calls to nest

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-09 10:35:35 +00:00
parent 7b12790064
commit 677eff077e
5 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/timer.h
View File

@@ -191,12 +191,18 @@ class WXDLLEXPORT wxStopWatch
{
public:
// ctor starts the stop watch
wxStopWatch() { Start(); }
void Start(long t = 0);
void Pause() { m_pause = GetElapsedTime(); }
void Resume() { Start(m_pause); }
wxStopWatch() { m_pauseCount = 0; Start(); }
// get elapsed time since the last Start() or Pause() in milliseconds
// start the stop watch at the moment t0
void Start(long t0 = 0);
// pause the stop watch
void Pause() { if ( !m_pauseCount++) m_pause = GetElapsedTime(); }
// resume it
void Resume() { if ( !--m_pauseCount ) Start(m_pause); }
// get elapsed time since the last Start() in milliseconds
long Time() const;
protected:
@@ -204,8 +210,14 @@ protected:
long GetElapsedTime() const;
private:
wxLongLong m_t0; // the time of the last Start()
long m_pause; // the time of the last Pause() or 0
// the time of the last Start()
wxLongLong m_t0;
// the time of the last Pause() (only valid if m_pauseCount > 0)
long m_pause;
// if > 0, the stop watch is paused, otherwise it is running
int m_pauseCount;
};
#endif // wxUSE_STOPWATCH