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

fixed incorrect passing of bitmap dimensions in DoBlit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-14 16:48:56 +00:00
parent 3278b06e6b
commit 119441fc6f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mgl/dc.cpp
View File

@@ -1433,17 +1433,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
/* scale/translate size and position */ /* scale/translate size and position */
wxCoord xx = XLOG2DEV(xdest); wxCoord xx = XLOG2DEV(xdest);
wxCoord yy = YLOG2DEV(ydest); wxCoord yy = YLOG2DEV(ydest);
wxCoord ww = XLOG2DEVREL(width);
wxCoord hh = YLOG2DEVREL(height);
if ( source->m_isMemDC ) if ( source->m_isMemDC )
{ {
wxMemoryDC *memDC = (wxMemoryDC*) source; wxMemoryDC *memDC = (wxMemoryDC*) source;
DoDrawSubBitmap(memDC->GetSelectedObject(), xsrc, ysrc, ww, hh, DoDrawSubBitmap(memDC->GetSelectedObject(),
xsrc, ysrc, width, height,
xdest, ydest, rop, useMask); xdest, ydest, rop, useMask);
} }
else else
{ {
wxCoord ww = XLOG2DEVREL(width);
wxCoord hh = YLOG2DEVREL(height);
m_MGLDC->makeCurrent(); // will go away with MGL6.0 m_MGLDC->makeCurrent(); // will go away with MGL6.0
m_MGLDC->bitBlt(*source->GetMGLDC(), m_MGLDC->bitBlt(*source->GetMGLDC(),
xsrc, ysrc, xsrc + ww, ysrc + hh, xsrc, ysrc, xsrc + ww, ysrc + hh,