X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f254e2424a5220e559e48205ace1114ea3e87f3f..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/tests/controls/checkboxtest.cpp

diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp
index 359d544d18..8c1b3a607d 100644
--- a/tests/controls/checkboxtest.cpp
+++ b/tests/controls/checkboxtest.cpp
@@ -33,15 +33,19 @@ public:
 private:
     CPPUNIT_TEST_SUITE( CheckBoxTestCase );
         CPPUNIT_TEST( Check );
+#ifdef wxHAS_3STATE_CHECKBOX
         CPPUNIT_TEST( ThirdState );
         CPPUNIT_TEST( ThirdStateUser );
         CPPUNIT_TEST( InvalidStyles );
+#endif // wxHAS_3STATE_CHECKBOX
     CPPUNIT_TEST_SUITE_END();
 
     void Check();
+#ifdef wxHAS_3STATE_CHECKBOX
     void ThirdState();
     void ThirdStateUser();
     void InvalidStyles();
+#endif // wxHAS_3STATE_CHECKBOX
 
     // Initialize m_check with a new checkbox with the specified style
     //
@@ -64,7 +68,7 @@ private:
 // 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()
@@ -79,10 +83,7 @@ void CheckBoxTestCase::tearDown()
 
 void CheckBoxTestCase::Check()
 {
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_check, wxEVT_COMMAND_CHECKBOX_CLICKED);
+    EventCounter clicked(m_check, wxEVT_COMMAND_CHECKBOX_CLICKED);
 
     //We should be unchecked by default
     CPPUNIT_ASSERT(!m_check->IsChecked());
@@ -104,12 +105,12 @@ void CheckBoxTestCase::Check()
     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
 void CheckBoxTestCase::ThirdState()
 {
-#if !defined(__WXMGL__) && !defined(__WXPM__) && !defined(__WXGTK12__)
     wxDELETE(m_check);
     CreateCheckBox(wxCHK_3STATE);
 
@@ -124,12 +125,10 @@ void CheckBoxTestCase::ThirdState()
     m_check->Set3StateValue(wxCHK_UNDETERMINED);
 
     CPPUNIT_ASSERT_EQUAL(wxCHK_UNDETERMINED, m_check->Get3StateValue());
-#endif
 }
 
 void CheckBoxTestCase::ThirdStateUser()
 {
-#if !defined(__WXMGL__) && !defined(__WXPM__) && !defined(__WXGTK12__)
     wxDELETE(m_check);
     CreateCheckBox(wxCHK_3STATE | wxCHK_ALLOW_3RD_STATE_FOR_USER);
 
@@ -144,7 +143,6 @@ void CheckBoxTestCase::ThirdStateUser()
     m_check->Set3StateValue(wxCHK_UNDETERMINED);
 
     CPPUNIT_ASSERT_EQUAL(wxCHK_UNDETERMINED, m_check->Get3StateValue());
-#endif
 }
 
 void CheckBoxTestCase::InvalidStyles()
@@ -170,4 +168,6 @@ void CheckBoxTestCase::InvalidStyles()
     WX_ASSERT_FAILS_WITH_ASSERT( CreateCheckBox(wxCHK_ALLOW_3RD_STATE_FOR_USER) );
 }
 
-#endif //wxUSE_CHECKBOX
+#endif // wxHAS_3STATE_CHECKBOX
+
+#endif // wxUSE_CHECKBOX