From: Kevin Hock <hockkn@yahoo.com>
Date: Tue, 1 Mar 2005 19:13:24 +0000 (+0000)
Subject: Revert last change moving wxFloodFill from imagfill.cpp to dcbase.cpp, which broke... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f842e673f6db8c60b6b417a1c5255e1c5ee480db

Revert last change moving wxFloodFill from imagfill.cpp to dcbase.cpp, which broke compilation across the board when wxUSE_IMAGE is defined.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 3156558ff1..1beb8edcae 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -984,38 +984,3 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
 
 #endif
 
-bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                   const wxColour& col, int style)
-{
-#if wxUSE_IMAGE
-    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;
-#else
-    return false;
-#endif
-}
diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 78fd8d3160..129c63c168 100644
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -273,6 +273,37 @@ wxImageFloodFill(wxImage *image,
 }
 
 
-#endif // wxUSE_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