applying editor part of patch, see #15003

[wxWidgets.git] / tests / html / htmlwindow.cpp

diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp
index bfeadc5a473454fb8ab1edb4041d707b24c50b70..47e980c76f64cda25d801ffadb5620a1409f102e 100644 (file)
--- a/tests/html/htmlwindow.cpp
+++ b/tests/html/htmlwindow.cpp
@@ -120,10 +120,7 @@ void HtmlWindowTestCase::Title()
 #if wxUSE_UIACTIONSIMULATOR
 void HtmlWindowTestCase::CellClick()
 {
 #if wxUSE_UIACTIONSIMULATOR
 void HtmlWindowTestCase::CellClick()
 {

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count1(m_win, wxEVT_COMMAND_HTML_CELL_CLICKED);
+    EventCounter clicked(m_win, wxEVT_HTML_CELL_CLICKED);

 
     wxUIActionSimulator sim;
 
 
     wxUIActionSimulator sim;
 


@@ -137,15 +134,12 @@ void HtmlWindowTestCase::CellClick()
     sim.MouseClick();
     wxYield();
 
     sim.MouseClick();
     wxYield();
 

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

 }
 
 void HtmlWindowTestCase::LinkClick()
 {
 }
 
 void HtmlWindowTestCase::LinkClick()
 {

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count1(m_win, wxEVT_COMMAND_HTML_LINK_CLICKED);
+    EventCounter clicked(m_win, wxEVT_HTML_LINK_CLICKED);

 
     wxUIActionSimulator sim;
 
 
     wxUIActionSimulator sim;
 


@@ -159,7 +153,7 @@ void HtmlWindowTestCase::LinkClick()
     sim.MouseClick();
     wxYield();
 
     sim.MouseClick();
     wxYield();
 

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

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