From 2b02da2bbdec3935a66f9fd421b59b0b841eccc4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 6 Nov 2017 02:16:07 +0100 Subject: [PATCH] Revert "fix build without graphics context" This reverts commit 44c91fedb8a64f3bc44232de3f0050c47fd60578 which is not necessary for wxQt any more as wxGraphicsContext is available for it now and didn't make much sense because wxActivityIndicator just can't be used without wxGraphicsContext, so a proper fix would be to disable the former completely if the latter is unavailable. --- src/generic/activityindicator.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/generic/activityindicator.cpp b/src/generic/activityindicator.cpp index 02ed29b22d..53c65e14bf 100644 --- a/src/generic/activityindicator.cpp +++ b/src/generic/activityindicator.cpp @@ -122,7 +122,7 @@ private: void OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC pdc(m_win); -#if wxUSE_GRAPHICS_CONTEXT + wxScopedPtr const gc(wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(pdc)); @@ -167,7 +167,6 @@ private: gc->FillPath(path); gc->Rotate(angle); } -#endif } AdvanceTimer m_timer;