Disable wxUIActionSimulator wxGrid tests using mouse under wxGTK.

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

diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp
index 0cce6e3040fa921af90e28741f3dcd8aa953641a..4bee2246f2bff585381c2eec57044d7b322cc9f9 100644 (file)
--- a/tests/controls/frametest.cpp
+++ b/tests/controls/frametest.cpp
@@ -45,7 +45,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( FrameTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( FrameTestCase );
 

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


@@ -62,26 +62,20 @@ void FrameTestCase::tearDown()
 void FrameTestCase::Iconize()
 {
 #ifdef __WXMSW__
 void FrameTestCase::Iconize()
 {
 #ifdef __WXMSW__

-    wxTestableFrame* testframe = wxStaticCast(wxTheApp->GetTopWindow(),
-                                              wxTestableFrame);
-
-    EventCounter count(m_frame, wxEVT_ICONIZE);
+    EventCounter iconize(m_frame, wxEVT_ICONIZE);

 
     m_frame->Iconize();
     m_frame->Iconize(false);
 
 
     m_frame->Iconize();
     m_frame->Iconize(false);
 

-    CPPUNIT_ASSERT_EQUAL(2, testframe->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(2, iconize.GetCount());

 #endif
 }
 
 void FrameTestCase::Close()
 {
 #endif
 }
 
 void FrameTestCase::Close()
 {

-    wxTestableFrame* testframe = wxStaticCast(wxTheApp->GetTopWindow(),
-                                              wxTestableFrame);
-
-    EventCounter count(m_frame, wxEVT_CLOSE_WINDOW);
+    EventCounter close(m_frame, wxEVT_CLOSE_WINDOW);

 
     m_frame->Close();
 
 
     m_frame->Close();
 

-    CPPUNIT_ASSERT_EQUAL(1, testframe->GetEventCount());
+    CPPUNIT_ASSERT_EQUAL(1, close.GetCount());

 }
 }