From 0e2fee17557ab29bea641d2e44bbf9853b42d0a8 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com> Date: Wed, 4 Jan 2023 21:59:10 +0100 Subject: [PATCH] Enable wxPaintDC-related tests under wxOSX With delay after refreshing testing window added in 808bbe8341 ("Fix executing wxPaintDC-related tests under wxGTK", 2023-01-04) wxPaintDC tests work also under wxOSX. --- tests/graphics/clipper.cpp | 4 ---- tests/graphics/clippingbox.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tests/graphics/clipper.cpp b/tests/graphics/clipper.cpp index 49ed6abb63..0ab95b3f19 100644 --- a/tests/graphics/clipper.cpp +++ b/tests/graphics/clipper.cpp @@ -663,9 +663,6 @@ TEST_CASE("ClipperTestCase::wxSVGFileDC", "[clipper][dc][svgdc]") TEST_CASE("ClipperTestCase::wxPaintDC", "[clipper][dc][paintdc]") { -#ifdef __WXOSX__ - WARN("Skipping tests known to fail in wxOSX"); -#else // Ensure window is shown and large enough for testing wxTheApp->GetTopWindow()->Raise(); REQUIRE(wxTheApp->GetTopWindow()->IsShown()); @@ -761,5 +758,4 @@ TEST_CASE("ClipperTestCase::wxPaintDC", "[clipper][dc][paintdc]") } CHECK(paintExecuted == true); -#endif // !__WXOSX__ } diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp index 9740e00351..0f63242c8a 100644 --- a/tests/graphics/clippingbox.cpp +++ b/tests/graphics/clippingbox.cpp @@ -3967,9 +3967,6 @@ TEST_CASE("ClippingBoxTestCase::wxSVGFileDC", "[clip][dc][svgdc]") TEST_CASE("ClippingBoxTestCase::wxPaintDC", "[clip][dc][paintdc]") { -#ifdef __WXOSX__ - WARN("Skipping tests known to fail in wxOSX"); -#else wxBitmap bmp; // We need wxNullBitmap because we can't check the output // Ensure window is shown and large enough for testing wxTheApp->GetTopWindow()->Raise(); @@ -4331,7 +4328,6 @@ TEST_CASE("ClippingBoxTestCase::wxPaintDC", "[clip][dc][paintdc]") } CHECK(paintExecuted == true); -#endif // !__WXOSX__ } #if wxUSE_GRAPHICS_CONTEXT