Conditional compilation fix.

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

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index b5a6c66a5300031da30fe282ff5cda60a13ec8cf..4ef7d0083d6fb7596ca1aa65830c44dc04d1a76d 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -273,18 +273,19 @@ wxImageFloodFill(wxImage *image,
 }
 
 
 }
 
 

-void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

                    const wxColour& col, int style)
 {
     if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
                    const wxColour& col, int style)
 {
     if (dc->GetBrush().GetStyle() == wxTRANSPARENT)

-        return;
+        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...
 
     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_RET(width >= 1 && height >= 1, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
+    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;
 
     //this is much faster than doing the individual pixels
     wxMemoryDC memdc;


@@ -300,6 +301,8 @@ void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
     memdc.SelectObject(bitmap);
     dc->Blit(0, 0, width, height, &memdc, 0, 0);
     memdc.SelectObject(wxNullBitmap);
     memdc.SelectObject(bitmap);
     dc->Blit(0, 0, width, height, &memdc, 0, 0);
     memdc.SelectObject(wxNullBitmap);

+
+    return TRUE;

 }
 
 #endif // wxUSE_IMAGE
 }
 
 #endif // wxUSE_IMAGE