X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3778b4d9c7eebc39f496a9dd055638e06fb9140..f83a9705cd1c82b7aad030890b7f88748b0e6101:/tests/controls/ownerdrawncomboboxtest.cpp?ds=sidebyside diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp index 9d1a200dfc..89e02664a3 100644 --- a/tests/controls/ownerdrawncomboboxtest.cpp +++ b/tests/controls/ownerdrawncomboboxtest.cpp @@ -3,7 +3,6 @@ // Purpose: OwnerDrawnComboBox unit test // Author: Jaakko Salli // Created: 2010-12-17 -// RCS-ID: $Id$ // Copyright: (c) 2010 Jaakko Salli /////////////////////////////////////////////////////////////////////////////// @@ -129,17 +128,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_COMBOBOX_DROPDOWN); + EventCounter close(m_combo, wxEVT_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()