From 2ea39a23e71c3bd1fb4d1dfaa83f672946bc41d8 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 25 Feb 2016 23:46:49 +0100 Subject: [PATCH] Fix wxD2DContext compilation when wxUSE_IMAGE==0 --- src/msw/graphicsd2d.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp index f61e540b93..48b74c7c79 100644 --- a/src/msw/graphicsd2d.cpp +++ b/src/msw/graphicsd2d.cpp @@ -2239,6 +2239,7 @@ public: } }; +#if wxUSE_IMAGE class wxD2DImageRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder { public: @@ -2409,6 +2410,7 @@ private: ID2D1Factory* m_factory; }; +#endif // wxUSE_IMAGE class wxD2DHwndRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder { @@ -2802,7 +2804,9 @@ public: wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, HDC hdc, const wxSize& dcSize); +#if wxUSE_IMAGE wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image); +#endif // wxUSE_IMAGE wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext); @@ -2951,12 +2955,14 @@ wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dF Init(); } +#if wxUSE_IMAGE wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image) : wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory), m_renderTargetHolder(new wxD2DImageRenderTargetResourceHolder(&image, direct2dFactory)) { Init(); } +#endif // wxUSE_IMAGE wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext) : wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory)