compilation fix for !WXWIN_COMPATIBILITY_2_2

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index d903e9311c4c86e839075a27149f841ca0e7237b..929d71bfb9610f967990ca4c57db65e8c492377f 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -426,11 +426,11 @@ void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
     memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
     memdc.SelectObject(wxNullBitmap);
 
     memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
     memdc.SelectObject(wxNullBitmap);
 

-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();

     image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
     image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);

-    this->Blit(0, 0, width, height, &memdc, 0, 0);
+    Blit(0, 0, width, height, &memdc, 0, 0);

     memdc.SelectObject(wxNullBitmap);
 }
 
     memdc.SelectObject(wxNullBitmap);
 }
 

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index d903e9311c4c86e839075a27149f841ca0e7237b..929d71bfb9610f967990ca4c57db65e8c492377f 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -426,11 +426,11 @@ void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
     memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
     memdc.SelectObject(wxNullBitmap);
 
     memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
     memdc.SelectObject(wxNullBitmap);
 

-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();

     image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
     image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);

-    this->Blit(0, 0, width, height, &memdc, 0, 0);
+    Blit(0, 0, width, height, &memdc, 0, 0);

     memdc.SelectObject(wxNullBitmap);
 }
 
     memdc.SelectObject(wxNullBitmap);
 }