applying editor part of patch, see #15003

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

diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp
index 4585ee6125796dfcfc055bc07510e14fa7256b87..c36ea4325b9ffc840fabc35fc2ff4c8b16e89274 100644 (file)
--- a/tests/controls/checkboxtest.cpp
+++ b/tests/controls/checkboxtest.cpp
@@ -68,7 +68,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( CheckBoxTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( CheckBoxTestCase );
 

-// 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( CheckBoxTestCase, "CheckBoxTestCase" );
 
 void CheckBoxTestCase::setUp()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CheckBoxTestCase, "CheckBoxTestCase" );
 
 void CheckBoxTestCase::setUp()


@@ -83,10 +83,7 @@ void CheckBoxTestCase::tearDown()
 
 void CheckBoxTestCase::Check()
 {
 
 void CheckBoxTestCase::Check()
 {

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_check, wxEVT_COMMAND_CHECKBOX_CLICKED);
+    EventCounter clicked(m_check, wxEVT_CHECKBOX);

 
     //We should be unchecked by default
     CPPUNIT_ASSERT(!m_check->IsChecked());
 
     //We should be unchecked by default
     CPPUNIT_ASSERT(!m_check->IsChecked());


@@ -108,7 +105,7 @@ void CheckBoxTestCase::Check()
     CPPUNIT_ASSERT(!m_check->IsChecked());
 
     //None of these should send events
     CPPUNIT_ASSERT(!m_check->IsChecked());
 
     //None of these should send events

-    CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(0, clicked.GetCount());

 }
 
 #ifdef wxHAS_3STATE_CHECKBOX
 }
 
 #ifdef wxHAS_3STATE_CHECKBOX