Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxD2DContext compilation when wxUSE_IMAGE==0

Browse Source
This commit is contained in:
Artur Wieczorek
2016-02-25 23:46:49 +01:00
parent 3cc8b4ae37
commit 2ea39a23e7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/graphicsd2d.cpp
View File

@@ -2239,6 +2239,7 @@ public:
} }
}; };
#if wxUSE_IMAGE
class wxD2DImageRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder class wxD2DImageRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder
{ {
public: public:
@@ -2409,6 +2410,7 @@ private:
ID2D1Factory* m_factory; ID2D1Factory* m_factory;
}; };
#endif // wxUSE_IMAGE
class wxD2DHwndRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder class wxD2DHwndRenderTargetResourceHolder : public wxD2DRenderTargetResourceHolder
{ {
@@ -2802,7 +2804,9 @@ public:
wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, HDC hdc, const wxSize& dcSize); wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, HDC hdc, const wxSize& dcSize);
#if wxUSE_IMAGE
wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image); wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image);
#endif // wxUSE_IMAGE
wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext); wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext);
@@ -2951,12 +2955,14 @@ wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dF
Init(); Init();
} }
#if wxUSE_IMAGE
wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image) : wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, wxImage& image) :
wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory), wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory),
m_renderTargetHolder(new wxD2DImageRenderTargetResourceHolder(&image, direct2dFactory)) m_renderTargetHolder(new wxD2DImageRenderTargetResourceHolder(&image, direct2dFactory))
{ {
Init(); Init();
} }
#endif // wxUSE_IMAGE
wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext) : wxD2DContext::wxD2DContext(wxGraphicsRenderer* renderer, ID2D1Factory* direct2dFactory, void* nativeContext) :
wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory) wxGraphicsContext(renderer), m_direct2dFactory(direct2dFactory)