X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3b38e2a022d97b2afae69cb5f322f96a6a0140f3:/src/common/rgncmn.cpp diff --git a/src/common/rgncmn.cpp b/src/common/rgncmn.cpp index 13bcd6e184..b06227cc24 100644 --- a/src/common/rgncmn.cpp +++ b/src/common/rgncmn.cpp @@ -100,6 +100,7 @@ static bool DoRegionUnion(wxRegion& region, bool wxRegion::Union(const wxBitmap& bmp) { +#if (!defined(__WXMSW__) || wxUSE_WXDIB) if (bmp.GetMask()) { wxImage image = bmp.ConvertToImage(); @@ -111,6 +112,7 @@ bool wxRegion::Union(const wxBitmap& bmp) 0); } else +#endif { return Union(0, 0, bmp.GetWidth(), bmp.GetHeight()); } @@ -120,12 +122,16 @@ bool wxRegion::Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance) { +#if (!defined(__WXMSW__) || wxUSE_WXDIB) wxImage image = bmp.ConvertToImage(); return DoRegionUnion(*this, image, transColour.Red(), transColour.Green(), transColour.Blue(), tolerance); +#else + return false; +#endif } #else