forgot to check-in wxGTK wxDC changes

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 63ab694b9910fe4a5e36ab56bb50643875ede91d..8ed9bff19b7201721ba9bf762e67920e6584c881 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -401,37 +401,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
-void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
-                           const wxColour & col, int style )
-{
-    if (GetBrush().GetStyle() == wxTRANSPARENT)
-    {
-        wxLogDebug(wxT("In FloodFill, current Brush is transparent, no filling done"));
-        return ;
-    }
-    int height = 0;
-    int width  = 0;
-    this->GetSize(&width, &height);
-    //it would be nice to fail if we don't get a sensible size...
-    if (width < 1 || height < 1)
-    {
-        wxLogError(wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-        return ;
-    }
+extern void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
 
-    //this is much faster than doing the individual pixels
-    wxMemoryDC memdc;
-    wxBitmap bitmap(width, height);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image = bitmap.ConvertToImage();
-    //image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
-    bitmap = wxBitmap(image);
-    memdc.SelectObject(bitmap);
-    Blit(0, 0, width, height, &memdc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
+void wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, int style)
+{
+    wxDoFloodFill(this, x, y, col, style);
 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 63ab694b9910fe4a5e36ab56bb50643875ede91d..8ed9bff19b7201721ba9bf762e67920e6584c881 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -401,37 +401,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
-void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
-                           const wxColour & col, int style )
-{
-    if (GetBrush().GetStyle() == wxTRANSPARENT)
-    {
-        wxLogDebug(wxT("In FloodFill, current Brush is transparent, no filling done"));
-        return ;
-    }
-    int height = 0;
-    int width  = 0;
-    this->GetSize(&width, &height);
-    //it would be nice to fail if we don't get a sensible size...
-    if (width < 1 || height < 1)
-    {
-        wxLogError(wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-        return ;
-    }
+extern void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
 
-    //this is much faster than doing the individual pixels
-    wxMemoryDC memdc;
-    wxBitmap bitmap(width, height);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image = bitmap.ConvertToImage();
-    //image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
-    bitmap = wxBitmap(image);
-    memdc.SelectObject(bitmap);
-    Blit(0, 0, width, height, &memdc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
+void wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, int style)
+{
+    wxDoFloodFill(this, x, y, col, style);
 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const