AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tlw-activate-event'

Browse Source 
Extend activation event unit tests and enable them for wxGTK where they
seem to pass too now.

See https://github.com/wxWidgets/wxWidgets/pull/1194
This commit is contained in:
Vadim Zeitlin 2019-01-30 17:40:03 +01:00
commit c5f9bed8ff
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/toplevel/toplevel.cpp
View File

@ -45,20 +45,22 @@ static void TopLevelWindowShowTest(wxTopLevelWindow* tlw)
CHECK(!tlw->IsActive());
#endif
tlw->Show(true);
// 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.
#ifndef __WXGTK__
CHECK(tlw->IsActive());
#endif
CHECK(tlw->IsShown());
tlw->Hide();
CHECK(!tlw->IsShown());
#ifndef __WXGTK__
countActivate.WaitEvent();
CHECK(!tlw->IsActive());
#endif
}
TEST_CASE("wxTopLevel::Show", "[tlw][show]")