X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4f90c2a0c1f274d1918b320132ed0ca2922fe5..ede3a6d68af66772b4f5f94208b4126bab566cc8:/src/common/imagfill.cpp diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp index 4ef7d0083d..129c63c168 100644 --- a/src/common/imagfill.cpp +++ b/src/common/imagfill.cpp @@ -35,7 +35,7 @@ static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c) { - if ((x<0)||(x>=w)||(y<0)||(y>=h)) return FALSE; + if ((x<0)||(x>=w)||(y<0)||(y>=h)) return false; unsigned char r = img->GetRed(x,y); unsigned char g = img->GetGreen(x,y); @@ -45,16 +45,16 @@ static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, con static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound) { - if ((x<0)||(x>=w)||(y<0)||(y>=h)) return TRUE; + if ((x<0)||(x>=w)||(y<0)||(y>=h)) return true; unsigned char r = img->GetRed(x,y); unsigned char g = img->GetGreen(x,y); unsigned char b = img->GetBlue(x,y); if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b ) - return TRUE; + return true; if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b ) - return TRUE; - return FALSE; + return true; + return false; } @@ -277,14 +277,14 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, const wxColour& col, int style) { if (dc->GetBrush().GetStyle() == wxTRANSPARENT) - return TRUE; + return true; int height = 0; int width = 0; dc->GetSize(&width, &height); //it would be nice to fail if we don't get a sensible size... - wxCHECK_MSG(width >= 1 && height >= 1, FALSE, + wxCHECK_MSG(width >= 1 && height >= 1, false, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC")); //this is much faster than doing the individual pixels @@ -302,7 +302,7 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, dc->Blit(0, 0, width, height, &memdc, 0, 0); memdc.SelectObject(wxNullBitmap); - return TRUE; + return true; } #endif // wxUSE_IMAGE