Move wxHAS_SVG definition to wx/features.h
This is more consistent with the other wxHAS_XXXs and makes it possible to only include wx/bmpbndl.h in bmpsvg.cpp if SVG support is indeed available.
This commit is contained in:
@@ -18,13 +18,6 @@ class wxBitmapBundleImpl;
|
||||
class WXDLLIMPEXP_FWD_CORE wxImageList;
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
|
||||
// It should be possible to implement SVG rasterizing without raw bitmap
|
||||
// support using wxDC::DrawSpline(), but currently we don't do it and so
|
||||
// FromSVG() is only available in the ports providing raw bitmap access.
|
||||
#ifdef wxHAS_RAW_BITMAP
|
||||
#define wxHAS_SVG
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxBitmapBundle provides 1 or more versions of a bitmap, all bundled together
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@@ -95,6 +95,15 @@
|
||||
#define wxHAVE_RAW_BITMAP
|
||||
#endif
|
||||
|
||||
/*
|
||||
While it should be possible to implement SVG rasterizing without raw bitmap
|
||||
support using wxDC::DrawSpline(), currently we don't do it and so FromSVG()
|
||||
is only available in the ports providing raw bitmap access.
|
||||
*/
|
||||
#ifdef wxHAS_RAW_BITMAP
|
||||
#define wxHAS_SVG
|
||||
#endif
|
||||
|
||||
|
||||
// Previously this symbol wasn't defined for all compilers as Bind() couldn't
|
||||
// be implemented for some of them (notably MSVC 6), but this is not the case
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
// for compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/bmpbndl.h"
|
||||
|
||||
#ifdef wxHAS_SVG
|
||||
|
||||
// Try to help people updating their sources from Git and forgetting to
|
||||
@@ -42,6 +40,7 @@
|
||||
#include "wx/utils.h" // Only for wxMin()
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
#include "wx/bmpbndl.h"
|
||||
#ifdef wxUSE_FFILE
|
||||
#include "wx/ffile.h"
|
||||
#elif wxUSE_FILE
|
||||
|
||||
Reference in New Issue
Block a user