X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/997ddb2cedad6381a16ca9c3af4d812f20e44403..1ec4e9c2b72a01a7ba7da569e0f8d04a81aaba10:/tests/controls/ownerdrawncomboboxtest.cpp?ds=sidebyside diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp index 54c228676e..ecaa344552 100644 --- a/tests/controls/ownerdrawncomboboxtest.cpp +++ b/tests/controls/ownerdrawncomboboxtest.cpp @@ -79,7 +79,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( OwnerDrawnComboBoxTestCase ); -// 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( OwnerDrawnComboBoxTestCase, "OwnerDrawnComboBoxTestCase" ); @@ -129,17 +129,14 @@ void OwnerDrawnComboBoxTestCase::Size() void OwnerDrawnComboBoxTestCase::PopDismiss() { - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - - EventCounter count(m_combo, wxEVT_COMMAND_COMBOBOX_DROPDOWN); - EventCounter count1(m_combo, wxEVT_COMMAND_COMBOBOX_CLOSEUP); + EventCounter drop(m_combo, wxEVT_COMMAND_COMBOBOX_DROPDOWN); + EventCounter close(m_combo, wxEVT_COMMAND_COMBOBOX_CLOSEUP); m_combo->Popup(); m_combo->Dismiss(); - CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_COMBOBOX_DROPDOWN)); - CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_COMBOBOX_CLOSEUP)); + CPPUNIT_ASSERT_EQUAL(1, drop.GetCount()); + CPPUNIT_ASSERT_EQUAL(1, close.GetCount()); } void OwnerDrawnComboBoxTestCase::Sort()