Use same type in both results of A?B:C operator (Tinderbox build fix).

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

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 129c63c168aafc230d60a529019f4c1d7d77b71a..b81b9770557a854d4cd6a03c93d544444a274fc4 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagfill.cpp
+// Name:        src/common/imagfill.cpp
 // Purpose:     FloodFill for wxImage
-// Author:
+// Author:      Julian Smart
 // RCS-ID:      $Id$
-// Copyright:
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,17 +15,14 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE && !defined(__WXMSW__)
 // we have no use for this code in wxMSW...
 
-#include "wx/image.h"
-
 #ifndef WX_PRECOMP
     #include "wx/brush.h"
     #include "wx/dc.h"
     #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
 // DoFloodFill
@@ -62,12 +59,15 @@ static void LINKAGEMODE
 wxImageFloodFill(wxImage *image,
                  wxCoord x, wxCoord y, const wxBrush & fillBrush,
                  const wxColour& testColour, int style,
-                int LogicalFunction)
+                 int WXUNUSED(LogicalFunction))
 {
     /* A diamond flood-fill using a circular queue system.
     Each pixel surrounding the current pixel is added to
     the queue if it meets the criteria, then is retrieved in
-    its turn.  Code originally based on http://www.drawit.co.nz/Developers.htm */
+    its turn.  Code originally based on http://www.drawit.co.nz/Developers.htm,
+    with explicit permission to use this for wxWidgets granted by Andrew Empson
+    (no copyright claimed)
+     */
 
     int width = image->GetWidth();
     int height = image->GetHeight();
@@ -306,4 +306,3 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
 }
 
 #endif // wxUSE_IMAGE
-