From b0b5189e03e41460e0b94abb406c5b1b172cfdcc Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 6 Apr 2003 14:41:57 +0000 Subject: [PATCH] wxStopWatch::Start() didn't resume it contrary to the docs Backport from head git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/common/timercmn.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 3f10d677e5..6fa74fff4b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -180,6 +180,7 @@ All: - improved wxScrolledWindow/sizer interaction - fixed assert (and crash in debug) in wxFileConfigGroup::DeleteSubgroupByName - fix for deleting entries at root level in wxFileConfig +- wxStopWatch::Start() didn't resume it contrary to the docs Unix (GUI): diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index 75864185a2..b40122a1fe 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -169,6 +169,7 @@ void wxStopWatch::Start(long t) { m_t0 = wxGetLocalTimeMillis() - t; m_pause = 0; + m_pauseCount = 0; } long wxStopWatch::GetElapsedTime() const