X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..09d350c0bc105653e7cd59a8290684a3c4e70d7e:/src/common/imagfill.cpp

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index cc00767d59..78fd8d3160 100644
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -4,7 +4,7 @@
 // Author:
 // RCS-ID:      $Id$
 // Copyright:
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -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;
 }
 
 
@@ -273,37 +273,6 @@ wxImageFloodFill(wxImage *image,
 }
 
 
-bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                   const wxColour& col, int style)
-{
-    if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
-        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,
-                wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-
-    //this is much faster than doing the individual pixels
-    wxMemoryDC memdc;
-    wxBitmap bitmap(width, height);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, width, height, dc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image = bitmap.ConvertToImage();
-    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style,
-                     dc->GetLogicalFunction());
-    bitmap = wxBitmap(image);
-    memdc.SelectObject(bitmap);
-    dc->Blit(0, 0, width, height, &memdc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
-
-    return TRUE;
-}
-
 #endif // wxUSE_IMAGE
 
+