From a33a38c1ad206f8a0a8e6560be132c8dbefdbade Mon Sep 17 00:00:00 2001 From: ali kettab Date: Fri, 10 Jul 2020 22:31:00 +0100 Subject: [PATCH] Remove unneeded workarounds --- tests/menu/menu.cpp | 4 ---- tests/validators/valnum.cpp | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index d9026f4aae..ef957e4f18 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -584,10 +584,6 @@ void MenuTestCase::Events() // Invoke the accelerator. m_frame->Show(); m_frame->SetFocus(); -#ifdef __WXGTK__ - // Without this, test fails when run with other tests under Xvfb. - m_frame->Raise(); -#endif wxYield(); wxUIActionSimulator sim; diff --git a/tests/validators/valnum.cpp b/tests/validators/valnum.cpp index 0d4e579c68..400011a232 100644 --- a/tests/validators/valnum.cpp +++ b/tests/validators/valnum.cpp @@ -211,16 +211,6 @@ void NumValidatorTestCase::Interactive() return; #endif // __WXMSW__ -#ifdef __WXGTK20__ - // Travis CI fails without this! - if ( IsAutomaticTest() ) - { - wxFrame* frame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame); - frame->SetFocus(); - frame->Raise(); - } -#endif // __WXGTK20__ - // Set a locale using comma as thousands separator character. wxLocale loc(wxLANGUAGE_ENGLISH_UK, wxLOCALE_DONT_LOAD_DEFAULT);