cleanup for wxUSE_THREADS

[wxWidgets.git] / src / common / imagfill.cpp

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index e20ce667fc7b57b3f30f2caf0977df89e1ff365f..129c63c168aafc230d60a529019f4c1d7d77b71a 100644 (file)
--- 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,17 +277,15 @@ 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...
-    wxASSERT_MSG(width >= 1 && height >= 1, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-    
-    if (width <= 1 || height <= 1)
-        return 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
     wxMemoryDC memdc;
@@ -303,8 +301,8 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
     memdc.SelectObject(bitmap);
     dc->Blit(0, 0, width, height, &memdc, 0, 0);
     memdc.SelectObject(wxNullBitmap);
-    
-    return TRUE;
+
+    return true;
 }
 
 #endif // wxUSE_IMAGE