X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa38073670aed659204460bb7484bc16c30f5b1b..29bdcf09cee2aac2a105134782a893a7cbb4c2b4:/tests/controls/windowtest.cpp

diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp
index 2794da3f37..34223ee635 100644
--- a/tests/controls/windowtest.cpp
+++ b/tests/controls/windowtest.cpp
@@ -81,7 +81,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( WindowTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( WindowTestCase, "WindowTestCase" );
 
 void WindowTestCase::setUp()
@@ -97,10 +97,7 @@ void WindowTestCase::tearDown()
 void WindowTestCase::ShowHideEvent()
 {
 #if defined(__WXMSW__) || defined (__WXPM__)
-   wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_window, wxEVT_SHOW);
+    EventCounter show(m_window, wxEVT_SHOW);
 
     CPPUNIT_ASSERT(m_window->IsShown());
 
@@ -112,19 +109,16 @@ void WindowTestCase::ShowHideEvent()
 
     CPPUNIT_ASSERT(m_window->IsShown());
 
-    CPPUNIT_ASSERT_EQUAL(2, frame->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(2, show.GetCount());
 #endif
 }
 
 void WindowTestCase::KeyEvent()
 {
 #if wxUSE_UIACTIONSIMULATOR
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_window, wxEVT_KEY_DOWN);
-    EventCounter count1(m_window, wxEVT_KEY_UP);
-    EventCounter count2(m_window, wxEVT_CHAR);
+    EventCounter keydown(m_window, wxEVT_KEY_DOWN);
+    EventCounter keyup(m_window, wxEVT_KEY_UP);
+    EventCounter keychar(m_window, wxEVT_CHAR);
 
     wxUIActionSimulator sim;
 
@@ -134,31 +128,28 @@ void WindowTestCase::KeyEvent()
     sim.Char(WXK_SHIFT);
     wxYield();
 
-    CPPUNIT_ASSERT_EQUAL(5, frame->GetEventCount(wxEVT_KEY_DOWN));
-    CPPUNIT_ASSERT_EQUAL(5, frame->GetEventCount(wxEVT_KEY_UP));
-    CPPUNIT_ASSERT_EQUAL(4, frame->GetEventCount(wxEVT_CHAR));
+    CPPUNIT_ASSERT_EQUAL(5, keydown.GetCount());
+    CPPUNIT_ASSERT_EQUAL(5, keyup.GetCount());
+    CPPUNIT_ASSERT_EQUAL(4, keychar.GetCount());
 #endif
 }
 
 void WindowTestCase::FocusEvent()
 {
 #ifndef __WXOSX__
-   wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_window, wxEVT_SET_FOCUS);
-    EventCounter count1(m_window, wxEVT_KILL_FOCUS);
+    EventCounter setfocus(m_window, wxEVT_SET_FOCUS);
+    EventCounter killfocus(m_window, wxEVT_KILL_FOCUS);
 
     m_window->SetFocus();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SET_FOCUS));
+    CPPUNIT_ASSERT_EQUAL(1, setfocus.GetCount());
     CPPUNIT_ASSERT(m_window->HasFocus());
 
     wxButton* button = new wxButton(wxTheApp->GetTopWindow(), wxID_ANY);
 
     button->SetFocus();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_KILL_FOCUS));
+    CPPUNIT_ASSERT_EQUAL(1, killfocus.GetCount());
     CPPUNIT_ASSERT(!m_window->HasFocus());
 #endif
 }