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

Applied (part of) small patch from Chris Bogolte which

Browse Source 
corrects a test in the Blit code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-10-17 14:32:42 +00:00
parent e9a05074a9
commit f53df133a6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/dcclient.cpp
View File

@@ -1308,7 +1308,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
// Scale bitmap if required // Scale bitmap if required
wxBitmap use_bitmap; wxBitmap use_bitmap;
if ((bm_width != bm_ww) || (bm_height != bm_hh)) if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
{ {
// This indicates that the blitting code below will get // This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin // a clipped bitmap and therefore needs to move the origin
@@ -1426,7 +1426,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
} }
else // use_bitmap_method else // use_bitmap_method
{ {
if ((width != ww) || (height != hh)) if ((memDC->m_selected.GetWidth() != ww) || (memDC->m_selected.GetHeight() != hh))
{ {
// get clip coords // get clip coords
wxRegion tmp( xx,yy,ww,hh ); wxRegion tmp( xx,yy,ww,hh );

4
src/gtk1/dcclient.cpp
View File

@@ -1308,7 +1308,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
// Scale bitmap if required // Scale bitmap if required
wxBitmap use_bitmap; wxBitmap use_bitmap;
if ((bm_width != bm_ww) || (bm_height != bm_hh)) if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
{ {
// This indicates that the blitting code below will get // This indicates that the blitting code below will get
// a clipped bitmap and therefore needs to move the origin // a clipped bitmap and therefore needs to move the origin
@@ -1426,7 +1426,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
} }
else // use_bitmap_method else // use_bitmap_method
{ {
if ((width != ww) || (height != hh)) if ((memDC->m_selected.GetWidth() != ww) || (memDC->m_selected.GetHeight() != hh))
{ {
// get clip coords // get clip coords
wxRegion tmp( xx,yy,ww,hh ); wxRegion tmp( xx,yy,ww,hh );