From ada25b6e95c3da511b0663775d79c59474344c34 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Jul 2013 22:17:55 +0000 Subject: [PATCH] Ensure that the MDI child is active in event propagation test. Call wxMDIChildFrame::Activate() explicitly as the behaviour was different under MSW (where the activation happened too late for the test) and GTK where the child did become active because of the hacks in place to ensure it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/events/propagation.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp index 53441b75c7..9f4b05ffcb 100644 --- a/tests/events/propagation.cpp +++ b/tests/events/propagation.cpp @@ -540,11 +540,14 @@ void EventPropagationTestCase::DocView() wxDocument* const doc = docTemplate.CreateDocument(""); wxView* const view = doc->GetFirstView(); - wxScopedPtr + wxScopedPtr child(new wxDocMDIChildFrame(doc, view, parent.get(), wxID_ANY, "Child")); wxMenu* const menuChild = CreateTestMenu(child.get()); + // Ensure that the child that we've just created is the active one. + child->Activate(); + #ifdef __WXGTK__ // There are a lot of hacks related to child frame menu bar handling in // wxGTK and, in particular, the code in src/gtk/mdi.cpp relies on getting -- 2.45.2