using button impl

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

diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp
index 54c228676e944956c8080c173b27bea5f80ba6b0..ecaa344552122eef8ccb3217d80ecbe2b6511afc 100644 (file)
--- 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 );
 
 // 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" );
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OwnerDrawnComboBoxTestCase,
                                        "OwnerDrawnComboBoxTestCase" );
 


@@ -129,17 +129,14 @@ void OwnerDrawnComboBoxTestCase::Size()
 
 void OwnerDrawnComboBoxTestCase::PopDismiss()
 {
 
 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();
 
 
     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()
 }
 
 void OwnerDrawnComboBoxTestCase::Sort()