diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 0ca6e03f73..7ff2f0a997 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -16,7 +16,7 @@ #include "wx/dc.h" -#if wxUSE_GRAPHICS_CONTEXT +#if wxUSE_GRAPHICS_GDIPLUS #ifndef WX_PRECOMP #include "wx/msw/wrapcdlg.h" @@ -1995,11 +1995,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRenderer,wxGraphicsRenderer) static wxGDIPlusRenderer gs_GDIPlusRenderer; -wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() +wxGraphicsRenderer* wxGraphicsRenderer::GetGDIPlusRenderer() { return &gs_GDIPlusRenderer; } +wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() +{ + wxGraphicsRenderer* renderer; + +#if wxUSE_GRAPHICS_DIRECT2D + renderer = wxGraphicsRenderer::GetDirect2DRenderer(); + if (renderer == NULL) +#endif + renderer = wxGraphicsRenderer::GetGDIPlusRenderer(); + + return renderer; +} + bool wxGDIPlusRenderer::EnsureIsLoaded() { // load gdiplus.dll if not yet loaded, but don't bother doing it again @@ -2391,4 +2404,4 @@ void wxGCDC::ReleaseHDC(WXHDC hdc) g->ReleaseHDC((HDC)hdc); } -#endif // wxUSE_GRAPHICS_CONTEXT +#endif // wxUSE_GRAPHICS_GDIPLUS \ No newline at end of file