added wxFontMapper::Get/Set

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

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index f199f0a4e825e46fe36cd5a93d6e83a6ef71107d..d337301e7bb1b38fbadc7e2aa6e6d1b655cbb345 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagfill.cpp
 // Purpose:     FloodFill for wxImage
-// Author:      
+// Author:
 // RCS-ID:      $Id$
-// Copyright:   
+// Copyright:
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,12 +17,14 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE
 
 #include "wx/image.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/brush.h"
+#endif
+
 // DoFloodFill
 // Fills with the colour extracted from fillBrush, starting at x,y until either
 // a color different from the start pixel is reached (wxFLOOD_SURFACE)
@@ -30,7 +32,7 @@
 
 bool wxImage::MatchPixel(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 = GetRed(x,y);
     unsigned char g = GetGreen(x,y);