Fixed compilation for !wxUSE_IMAGE as well as !wxUSE_TOOLBAR.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-02-16 23:27:54 +00:00
parent 05e4fd64c4
commit 1904aa72f0
7 changed files with 31 additions and 7 deletions

View File

@@ -50,9 +50,15 @@ 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;
@@ -116,10 +122,10 @@ bool wxRegion::Union(const wxBitmap& bmp,
}
}
return TRUE;
return true;
#else
// No wxImage support
return FALSE;
return false;
#endif
}