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

Compilation fix for wxUSE_CAIRO==0 after last commit.

Browse Source 
Include wx/graphics.h when wxUSE_CAIRO==0 but wxUSE_GRAPHICS_CONTEXT==1 (as in
e.g. MSW builds).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-27 21:36:03 +00:00
parent 6c99dbd55e
commit 9a67941f0b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/graphicc.cpp
View File

@@ -15,9 +15,12 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO #if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h" #include "wx/graphics.h"
#if wxUSE_CAIRO
#include "wx/cairo.h" #include "wx/cairo.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
@@ -1949,9 +1952,8 @@ wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap),
return wxNullGraphicsBitmap; return wxNullGraphicsBitmap;
} }
#endif // wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO #endif // wxUSE_CAIRO
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer() wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
{ {
#if wxUSE_CAIRO #if wxUSE_CAIRO
@@ -1960,4 +1962,5 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
return NULL; return NULL;
#endif #endif
} }
#endif
#endif // wxUSE_GRAPHICS_CONTEXT