compilation fix for !WXWIN_COMPATIBILITY_2_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -426,11 +426,11 @@ void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
|
|||||||
memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
|
memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
|
||||||
memdc.SelectObject(wxNullBitmap);
|
memdc.SelectObject(wxNullBitmap);
|
||||||
|
|
||||||
wxImage image(bitmap);
|
wxImage image = bitmap.ConvertToImage();
|
||||||
image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
|
image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
|
||||||
bitmap = wxBitmap(image);
|
bitmap = wxBitmap(image);
|
||||||
memdc.SelectObject(bitmap);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -426,11 +426,11 @@ void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y,
|
|||||||
memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
|
memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
|
||||||
memdc.SelectObject(wxNullBitmap);
|
memdc.SelectObject(wxNullBitmap);
|
||||||
|
|
||||||
wxImage image(bitmap);
|
wxImage image = bitmap.ConvertToImage();
|
||||||
image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
|
image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
|
||||||
bitmap = wxBitmap(image);
|
bitmap = wxBitmap(image);
|
||||||
memdc.SelectObject(bitmap);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user