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

Don't include wx/rawbmp.h unnecessary from src/generic/graphicc.cpp.

Browse Source 
This is not only unneeded but also breaks wxX11 (and probably other ports)
compilation because raw bitmap access is not available there.

Closes #11700.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@63405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-02-05 19:03:20 +00:00
parent cc1d7dd68d
commit baf84d8710
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/graphicc.cpp
View File

@@ -11,12 +11,12 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/dc.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_GRAPHICS_CONTEXT
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/image.h" #include "wx/image.h"
#include "wx/window.h" #include "wx/window.h"
@@ -39,7 +39,7 @@
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/rawbmp.h" #include "wx/rawbmp.h"
#if wxUSE_GRAPHICS_CONTEXT && wxUSE_CAIRO #if wxUSE_CAIRO
#include <vector> #include <vector>
@@ -1606,9 +1606,8 @@ wxGraphicsBitmap wxGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
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
@@ -1617,4 +1616,5 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
return NULL; return NULL;
#endif #endif
} }
#endif
#endif // wxUSE_GRAPHICS_CONTEXT