fixed a bug in wxStopWatch::Pause() (wouldn't pause if called immediately after Start()) and changed Pause()/Resume() calls to nest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -161,12 +161,12 @@ void wxStopWatch::Start(long t)
|
||||
|
||||
long wxStopWatch::GetElapsedTime() const
|
||||
{
|
||||
return (wxGetLocalTimeMillis() - m_t0).GetLo();
|
||||
return (wxGetLocalTimeMillis() - m_t0).GetLo();
|
||||
}
|
||||
|
||||
long wxStopWatch::Time() const
|
||||
{
|
||||
return (m_pause ? m_pause : GetElapsedTime());
|
||||
return m_pauseCount ? m_pause : GetElapsedTime();
|
||||
}
|
||||
|
||||
#endif // wxUSE_LONGLONG
|
||||
|
||||
Reference in New Issue
Block a user