X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1649d2886bda74a85dc0654e35044cd8fb3a6859..3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d:/tests/events/propagation.cpp diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp index 27c395eccf..e240dd6e17 100644 --- a/tests/events/propagation.cpp +++ b/tests/events/propagation.cpp @@ -18,9 +18,11 @@ #endif #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/event.h" + #include "wx/window.h" #endif // WX_PRECOMP -#include "wx/event.h" #include "wx/scopeguard.h" namespace @@ -182,7 +184,7 @@ void EventPropagationTestCase::WindowWithoutHandler() TestWindow * const child = new TestWindow(parent, 'c'); - child->ProcessEvent(event); + child->GetEventHandler()->ProcessEvent(event); CPPUNIT_ASSERT_EQUAL( "acpA", g_str ); } @@ -196,10 +198,10 @@ void EventPropagationTestCase::WindowWithHandler() TestEvtHandler h1('1'); child->PushEventHandler(&h1); - wxON_BLOCK_EXIT_OBJ0( *child, wxWindow::PopEventHandler ); + wxON_BLOCK_EXIT_OBJ1( *child, wxWindow::PopEventHandler, false ); TestEvtHandler h2('2'); child->PushEventHandler(&h2); - wxON_BLOCK_EXIT_OBJ0( *child, wxWindow::PopEventHandler ); + wxON_BLOCK_EXIT_OBJ1( *child, wxWindow::PopEventHandler, false ); child->HandleWindowEvent(event); CPPUNIT_ASSERT_EQUAL( "oa2o1cpA", g_str );