From 4ceca854975482e71b634f3fca325e3df6c12116 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Thu, 23 Sep 2010 16:55:29 +0000 Subject: [PATCH] Add ClearEventCount to wxTestableFrame. This means we can clear an event count when an event counter goes out of scope so the are no spurious results in later tests. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/testableframe.cpp | 10 +++++++++- tests/testableframe.h | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/testableframe.cpp b/tests/testableframe.cpp index efa7396f26..d69be423eb 100644 --- a/tests/testableframe.cpp +++ b/tests/testableframe.cpp @@ -2,7 +2,7 @@ // Name: testableframe.cpp // Purpose: An improved wxFrame for unit-testing // Author: Steven Lamerton -// RCS-ID: $Id:$ +// RCS-ID: $Id$ // Copyright: (c) 2010 Steven Lamerton // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// @@ -54,6 +54,11 @@ int wxTestableFrame::GetEventCount(wxEventType type) } } +void wxTestableFrame::ClearEventCount(wxEventType type) +{ + m_count[type] = 0; +} + EventCounter::EventCounter(wxWindow* win, wxEventType type) : m_type(type), m_win(win) @@ -74,6 +79,9 @@ EventCounter::~EventCounter() NULL, m_frame); + //This stops spurious counts from previous tests + m_frame->ClearEventCount(m_type); + m_frame = NULL; m_win = NULL; } diff --git a/tests/testableframe.h b/tests/testableframe.h index ad676a12fc..1e0fa21318 100644 --- a/tests/testableframe.h +++ b/tests/testableframe.h @@ -2,7 +2,7 @@ // Name: testableframe.h // Purpose: An improved wxFrame for unit-testing // Author: Steven Lamerton -// RCS-ID: $Id:$ +// RCS-ID: $Id$ // Copyright: (c) 2010 Steven Lamerton // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// @@ -21,6 +21,9 @@ public: //wxEVT_ANY get the count for all events or a type can be specified int GetEventCount(wxEventType type = wxEVT_ANY); + //Used to clear an event count, after disconnecting a counter for example + void ClearEventCount(wxEventType type); + private: wxLongToLongHashMap m_count; }; -- 2.50.0