using button impl

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

diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp
index 64247d03f3c5fdb5abff453a7f1d8ef2b15cf27f..37502ea4fe6ddba0ad638c212b8e56e7df322ef5 100644 (file)
--- a/tests/controls/buttontest.cpp
+++ b/tests/controls/buttontest.cpp
@@ -61,7 +61,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ButtonTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ButtonTestCase );
 

-// 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( ButtonTestCase, "ButtonTestCase" );
 
 void ButtonTestCase::setUp()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ButtonTestCase, "ButtonTestCase" );
 
 void ButtonTestCase::setUp()


@@ -80,12 +80,9 @@ void ButtonTestCase::tearDown()
 
 void ButtonTestCase::Click()
 {
 
 void ButtonTestCase::Click()
 {

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-

     //We use the internal class EventCounter which handles connecting and
     //disconnecting the control to the wxTestableFrame
     //We use the internal class EventCounter which handles connecting and
     //disconnecting the control to the wxTestableFrame

-    EventCounter count(m_button, wxEVT_COMMAND_BUTTON_CLICKED);
+    EventCounter clicked(m_button, wxEVT_COMMAND_BUTTON_CLICKED);

 
     wxUIActionSimulator sim;
 
 
     wxUIActionSimulator sim;
 


@@ -97,15 +94,12 @@ void ButtonTestCase::Click()
     sim.MouseClick();
     wxYield();
 
     sim.MouseClick();
     wxYield();
 

-    CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() );
+    CPPUNIT_ASSERT_EQUAL( 1, clicked.GetCount() );

 }
 
 void ButtonTestCase::Disabled()
 {
 }
 
 void ButtonTestCase::Disabled()
 {

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_button, wxEVT_COMMAND_BUTTON_CLICKED);
+    EventCounter clicked(m_button, wxEVT_COMMAND_BUTTON_CLICKED);

 
     wxUIActionSimulator sim;
 
 
     wxUIActionSimulator sim;
 


@@ -118,7 +112,7 @@ void ButtonTestCase::Disabled()
     sim.MouseClick();
     wxYield();
 
     sim.MouseClick();
     wxYield();
 

-    CPPUNIT_ASSERT_EQUAL( 0, frame->GetEventCount() );
+    CPPUNIT_ASSERT_EQUAL( 0, clicked.GetCount() );

 }
 
 #endif // wxUSE_UIACTIONSIMULATOR
 }
 
 #endif // wxUSE_UIACTIONSIMULATOR


@@ -147,7 +141,7 @@ void ButtonTestCase::Auth()
 
 void ButtonTestCase::BitmapMargins()
 {
 
 void ButtonTestCase::BitmapMargins()
 {

-    //Some functions only work on specific platfroms in which case we can use
+    //Some functions only work on specific platforms in which case we can use

     //a preprocessor check
 #ifdef __WXMSW__
     //We must set a bitmap before we can set its margins, when writing unit
     //a preprocessor check
 #ifdef __WXMSW__
     //We must set a bitmap before we can set its margins, when writing unit