X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3778b4d9c7eebc39f496a9dd055638e06fb9140..e86aa7a62cc8be79ffaeb0d07b70161cb9ea2c74:/tests/controls/radiobuttontest.cpp diff --git a/tests/controls/radiobuttontest.cpp b/tests/controls/radiobuttontest.cpp index f242614aae..6a402f1706 100644 --- a/tests/controls/radiobuttontest.cpp +++ b/tests/controls/radiobuttontest.cpp @@ -69,12 +69,9 @@ void RadioButtonTestCase::tearDown() void RadioButtonTestCase::Click() { - // GTK does not support selecting a single radio button -#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__) - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - - EventCounter count(m_radio, wxEVT_COMMAND_RADIOBUTTON_SELECTED); + // GTK and OS X do not support selecting a single radio button +#if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__) && !defined(__WXOSX__) + EventCounter selected(m_radio, wxEVT_RADIOBUTTON); wxUIActionSimulator sim; @@ -83,17 +80,14 @@ void RadioButtonTestCase::Click() wxYield(); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, selected.GetCount() ); #endif } void RadioButtonTestCase::Value() { #ifndef __WXGTK__ - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - - EventCounter count(m_radio, wxEVT_COMMAND_RADIOBUTTON_SELECTED); + EventCounter selected(m_radio, wxEVT_RADIOBUTTON); m_radio->SetValue(true); @@ -103,7 +97,7 @@ void RadioButtonTestCase::Value() CPPUNIT_ASSERT(!m_radio->GetValue()); - CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount()); + CPPUNIT_ASSERT_EQUAL(0, selected.GetCount()); #endif }