Compile with wxUSE_DYNLIB_CLASS and wxUSE_WXDIB set to 0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-21 16:47:30 +00:00
parent 14d776932c
commit 64c288fa47
22 changed files with 76 additions and 14 deletions

View File

@@ -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