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

Move wxHAS_SVG definition to wx/features.h

Browse Source 
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:
Vadim Zeitlin
2021-12-02 15:25:06 +01:00
parent bbca67df67
commit 882a339a48
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/bmpbndl.h
View File

@@ -18,13 +18,6 @@ class wxBitmapBundleImpl;
class WXDLLIMPEXP_FWD_CORE wxImageList; class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxWindow; 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 // wxBitmapBundle provides 1 or more versions of a bitmap, all bundled together
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

9
include/wx/features.h
View File

@@ -95,6 +95,15 @@
#define wxHAVE_RAW_BITMAP #define wxHAVE_RAW_BITMAP
#endif #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 // 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 // be implemented for some of them (notably MSVC 6), but this is not the case

3
src/generic/bmpsvg.cpp
View File

@@ -19,8 +19,6 @@
// for compilers that support precompilation, includes "wx.h". // for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/bmpbndl.h"
#ifdef wxHAS_SVG #ifdef wxHAS_SVG
// Try to help people updating their sources from Git and forgetting to // Try to help people updating their sources from Git and forgetting to
@@ -42,6 +40,7 @@
#include "wx/utils.h" // Only for wxMin() #include "wx/utils.h" // Only for wxMin()
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/bmpbndl.h"
#ifdef wxUSE_FFILE #ifdef wxUSE_FFILE
#include "wx/ffile.h" #include "wx/ffile.h"
#elif wxUSE_FILE #elif wxUSE_FILE