Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index efe4df59617960fe64ad3fc2176188d7311b2628..825d60715f7cb080478fba1c1ba5c553ea697dd3 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -2,7 +2,6 @@
 // Name:        src/common/imagfill.cpp
 // Purpose:     FloodFill for wxImage
 // Author:      Julian Smart
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -58,8 +57,7 @@ static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, in
 static void LINKAGEMODE
 wxImageFloodFill(wxImage *image,
                  wxCoord x, wxCoord y, const wxBrush & fillBrush,
-                 const wxColour& testColour, int style,
-                 int WXUNUSED(LogicalFunction))
+                 const wxColour& testColour, int style)
 {
     /* A diamond flood-fill using a circular queue system.
     Each pixel surrounding the current pixel is added to
@@ -274,9 +272,9 @@ wxImageFloodFill(wxImage *image,
 
 
 bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                   const wxColour& col, int style)
+                   const wxColour& col, wxFloodFillStyle style)
 {
-    if (dc->GetBrush().GetStyle() == wxBRUSHSTYLE_TRANSPARENT)
+    if (dc->GetBrush().IsTransparent())
         return true;
 
     int height = 0;
@@ -313,8 +311,7 @@ bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();
-    wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style,
-                     dc->GetLogicalFunction());
+    wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style);
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
     dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0);