X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1699cd397f7db0193491c8498608578b43db12b..c8b751aa27764b6deb21e56f09c5403f230b0ce3:/src/mac/carbon/dc.cpp diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 2828b715c6..4a044f2887 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -652,8 +652,6 @@ void wxDC::SetLogicalFunction( int function ) void wxDC::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")); @@ -676,12 +674,15 @@ void wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, 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); this->Blit(0, 0, width, height, &memdc, 0, 0); memdc.SelectObject(wxNullBitmap); +} + + bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") );