Move getting the unit test event count from wxTestableFrame to the EventCounter class...

[wxWidgets.git] / tests / controls / frametest.cpp

diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp
index dcdb22acc1ff959785b2c69a5bce6e6f23cbf5b2..4bee2246f2bff585381c2eec57044d7b322cc9f9 100644 (file)
--- a/tests/controls/frametest.cpp
+++ b/tests/controls/frametest.cpp
@@ -62,26 +62,20 @@ void FrameTestCase::tearDown()
 void FrameTestCase::Iconize()
 {
 #ifdef __WXMSW__
-    wxTestableFrame* testframe = wxStaticCast(wxTheApp->GetTopWindow(),
-                                              wxTestableFrame);
-
-    EventCounter count(m_frame, wxEVT_ICONIZE);
+    EventCounter iconize(m_frame, wxEVT_ICONIZE);
 
     m_frame->Iconize();
     m_frame->Iconize(false);
 
-    CPPUNIT_ASSERT_EQUAL(2, testframe->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(2, iconize.GetCount());
 #endif
 }
 
 void FrameTestCase::Close()
 {
-    wxTestableFrame* testframe = wxStaticCast(wxTheApp->GetTopWindow(),
-                                              wxTestableFrame);
-
-    EventCounter count(m_frame, wxEVT_CLOSE_WINDOW);
+    EventCounter close(m_frame, wxEVT_CLOSE_WINDOW);
 
     m_frame->Close();
 
-    CPPUNIT_ASSERT_EQUAL(1, testframe->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(1, close.GetCount());
 }