X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..8f8e45c4d941c9b17a77ec71595e3d7a39058234:/src/common/rgncmn.cpp?ds=sidebyside diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp index c4fb8fae0b..581ecbf68e 100644 --- a/src/common/rgncmn.cpp +++ b/src/common/rgncmn.cpp @@ -23,7 +23,9 @@ #include "wx/region.h" #include "wx/bitmap.h" +#if wxUSE_IMAGE #include "wx/image.h" +#endif #include "wx/dcmemory.h" @@ -48,10 +50,17 @@ wxBitmap wxRegion::ConvertToBitmap() const //--------------------------------------------------------------------------- +#if wxUSE_IMAGE bool wxRegion::Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance) +#else +bool wxRegion::Union(const wxBitmap& WXUNUSED(bmp), + const wxColour& WXUNUSED(transColour), + int WXUNUSED(tolerance)) +#endif { +#if wxUSE_IMAGE unsigned char loR, loG, loB; unsigned char hiR, hiG, hiB; @@ -113,7 +122,11 @@ bool wxRegion::Union(const wxBitmap& bmp, } } - return TRUE; + return true; +#else + // No wxImage support + return false; +#endif } //---------------------------------------------------------------------------