Applied FloodFill patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
#include "wx/dcmemory.h"
|
||||
#include "wx/region.h"
|
||||
#include "wx/image.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
|
||||
#if __MSL__ >= 0x6000
|
||||
@@ -653,6 +654,34 @@ void wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
|
||||
{
|
||||
}
|
||||
|
||||
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 ;
|
||||
}
|
||||
|
||||
//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);
|
||||
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") );
|
||||
|
||||
Reference in New Issue
Block a user