Start() should resume the stopwatch if it is suspended

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index ee27a4fe09dfb8ab4809ebf56c99ba9d6003d70e..d91188d16121cbe30e49aad56e2832b5a4f3b946 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -13,13 +13,17 @@ OTHER CHANGES
 
 All:
 
+- added wxDateSpan::operator==() and !=() (Lukasz Michalski)
+- use true/false throughout the library instead of TRUE/FALSE
+- wxStopWatch::Start() resumes the stop watch if paused, as per the docs
+
+All GUI ports:
+
 - implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber)
 - improved contrib/utils/convertrc parsing (David J. Cooke)
 - fixed handling of URLs and filenames in wxFileSystem
 - implemented alignment for wxGrid bool editor and renderer
 - support wxListCtrl columns alignment for all platforms and not just MSW
-- added wxDateSpan::operator==() and !=() (Lukasz Michalski)
-- use true/false throughout the library instead of TRUE/FALSE
 - Changed to type-safe wxSizerItemList for wxSizer child items.
 
     Deprecated:

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 28f69dae3b5bb3fb21358e2feb2745e507c97b93..42acd79d4ef49ddd6d91fff9090d3fa0acec0890 100644 (file)
--- 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