wxMessageBox off the main thread lost result code.

[wxWidgets.git] / tests / testableframe.h

diff --git a/tests/testableframe.h b/tests/testableframe.h
index 1e0fa2131826c06237dba15a117389d951b98b8b..a0465d8296f8ab12c67acb8d9d6aa405e35bd7de 100644 (file)
--- a/tests/testableframe.h
+++ b/tests/testableframe.h
@@ -2,9 +2,8 @@
 // Name:        testableframe.h
 // Purpose:     An improved wxFrame for unit-testing
 // Author:      Steven Lamerton
-// RCS-ID:      $Id$
 // Copyright:   (c) 2010 Steven Lamerton
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/frame.h"
@@ -18,13 +17,12 @@ public:
 
     void OnEvent(wxEvent& evt);
 
-    //wxEVT_ANY get the count for all events or a type can be specified
-    int GetEventCount(wxEventType type = wxEVT_ANY);
+private:
+    friend class EventCounter;
 
-    //Used to clear an event count, after disconnecting a counter for example
+    int GetEventCount(wxEventType type);
     void ClearEventCount(wxEventType type);
 
-private:
     wxLongToLongHashMap m_count;
 };
 
@@ -34,6 +32,9 @@ public:
     EventCounter(wxWindow* win, wxEventType type);
     ~EventCounter();
 
+    int GetCount() { return m_frame->GetEventCount(m_type); }
+    void Clear() { m_frame->ClearEventCount(m_type); }
+
 private:
     wxEventType m_type;
     wxTestableFrame* m_frame;