Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot to check-in wxGTK wxDC changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-04-08 22:56:14 +00:00
parent 11032cd905
commit 06cf7c08f2
2 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtk/dcclient.cpp
View File

@@ -401,37 +401,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
m_owner->GetSize(width, height); m_owner->GetSize(width, height);
} }
void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y, extern void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
const wxColour & col, int style ) const wxColour & col, int style);
void wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
const wxColour& col, int style)
{ {
if (GetBrush().GetStyle() == wxTRANSPARENT) wxDoFloodFill(this, x, y, col, style);
{
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.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);
} }
bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const

36
src/gtk1/dcclient.cpp
View File

@@ -401,37 +401,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
m_owner->GetSize(width, height); m_owner->GetSize(width, height);
} }
void wxWindowDC::DoFloodFill( wxCoord x, wxCoord y, extern void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
const wxColour & col, int style ) const wxColour & col, int style);
void wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
const wxColour& col, int style)
{ {
if (GetBrush().GetStyle() == wxTRANSPARENT) wxDoFloodFill(this, x, y, col, style);
{
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.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);
} }
bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const