Disable wxUIActionSimulator wxGrid tests using mouse under wxGTK.

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

diff --git a/tests/controls/bookctrlbasetest.cpp b/tests/controls/bookctrlbasetest.cpp
index 41ddeb282810ea4ec04fafd802e33942dd8e1aad..c28e238a687a0aab6cbf148289bb7f8df01b26e2 100644 (file)
--- a/tests/controls/bookctrlbasetest.cpp
+++ b/tests/controls/bookctrlbasetest.cpp
@@ -122,35 +122,36 @@ void BookCtrlBaseTestCase::PageManagement()
 
 void BookCtrlBaseTestCase::ChangeEvents()
 {
 
 void BookCtrlBaseTestCase::ChangeEvents()
 {

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

     wxBookCtrlBase * const base = GetBase();
 
     base->SetSelection(0);
 
     wxBookCtrlBase * const base = GetBase();
 
     base->SetSelection(0);
 

-    EventCounter count(base, GetChangingEvent());
-    EventCounter count1(base, GetChangedEvent());
+    EventCounter changing(base, GetChangingEvent());
+    EventCounter changed(base, GetChangedEvent());

 
     base->SetSelection(1);
 
 
     base->SetSelection(1);
 

-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangingEvent()));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangedEvent()));
+    CPPUNIT_ASSERT_EQUAL(1, changing.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());

 
 

+    changed.Clear();
+    changing.Clear();

     base->ChangeSelection(2);
 
     base->ChangeSelection(2);
 

-    CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount(GetChangingEvent()));
-    CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount(GetChangedEvent()));
+    CPPUNIT_ASSERT_EQUAL(0, changing.GetCount());
+    CPPUNIT_ASSERT_EQUAL(0, changed.GetCount());

 
     base->AdvanceSelection();
 
 
     base->AdvanceSelection();
 

-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangingEvent()));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangedEvent()));
+    CPPUNIT_ASSERT_EQUAL(1, changing.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());

 
 

+    changed.Clear();
+    changing.Clear();

     base->AdvanceSelection(false);
 
     base->AdvanceSelection(false);
 

-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangingEvent()));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(GetChangedEvent()));
+    CPPUNIT_ASSERT_EQUAL(1, changing.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());

 }
 
 void BookCtrlBaseTestCase::Image()
 }
 
 void BookCtrlBaseTestCase::Image()