From e599e26395e005a7a1fb2265f7ee20df8658a04c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 29 Jan 2019 00:08:44 +0100 Subject: [PATCH] Test that showing a TLW generates wxActivateEvent Wait until wxEVT_ACTIVATE arrives and check that it does. --- tests/toplevel/toplevel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp index 3e94f12c8d..5a2d83025f 100644 --- a/tests/toplevel/toplevel.cpp +++ b/tests/toplevel/toplevel.cpp @@ -45,7 +45,13 @@ static void TopLevelWindowShowTest(wxTopLevelWindow* tlw) CHECK(!tlw->IsActive()); #endif + // Note that at least under MSW, ShowWithoutActivating() still generates + // wxActivateEvent, so we must only start counting these events after the + // end of the tests above. + EventCounter countActivate(tlw, wxEVT_ACTIVATE); + tlw->Show(true); + countActivate.WaitEvent(); // wxGTK needs many event loop iterations before the TLW becomes active and // this doesn't happen in this test, so avoid checking for it.