reset the associated view frame pointer when the frame is deleted directly instead...

[wxWidgets.git] / tests / events / propagation.cpp

diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp
index 27c395eccf417f1de4435af161d1e6d63ae141cf..e240dd6e17736d9b2459fbc4de307320ac73d215 100644 (file)
--- 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 );