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

Added comments explaining my recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-02-10 07:28:43 +00:00
parent 8fcae2d6ed
commit d624fd67f8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/dc.cpp
View File

@@ -685,6 +685,10 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
// about it, may be use MAKEROP4(SRCCOPY, DSTINVERT) twice? Or create a // about it, may be use MAKEROP4(SRCCOPY, DSTINVERT) twice? Or create a
// copy of the bitmap with the transparent part replaced with black // copy of the bitmap with the transparent part replaced with black
// pixels? // pixels?
// GRG: now this works regardless of what the source bitmap
// contains in the area which is to be transparent.
//
bool ok = ::MaskBlt(GetHdc(), x, y, width, height, bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
hdcMem, 0, 0, hdcMem, 0, 0,
hbmpMask, 0, 0, hbmpMask, 0, 0,
@@ -696,8 +700,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
{ {
// VZ: this is incorrect, Blit() doesn't (and can't) draw // VZ: this is incorrect, Blit() doesn't (and can't) draw
// transparently, but it's still better than nothing at all // transparently, but it's still better than nothing at all
// GRG: Blit() *should* draw transparently when there is a mask
// GRG: Blit() *should* draw transparently when there is a mask.
// Rather than reproduce wxDC::Blit, let's do it at the wxWin API level // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
wxMemoryDC memDC; wxMemoryDC memDC;
@@ -1339,7 +1342,6 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
return FALSE; return FALSE;
} }
bool success; bool success;
if (useMask) if (useMask)
@@ -1369,6 +1371,11 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
// we want the part of the image corresponding to the mask to be // we want the part of the image corresponding to the mask to be
// transparent, i.e. do PATCOPY there and apply dwRop elsewhere // transparent, i.e. do PATCOPY there and apply dwRop elsewhere
// GRG: PATCOPY is not transparent, as can be seen when blitting
// over a pattern: the 'transparent' area would be filled
// with the selected colour. We should use NOP instead, or
// do MaskBlt + BitBlt.
//
success = ::MaskBlt(GetHdc(), xdest, ydest, width, height, success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
GetHdcOf(*source), xsrc, ysrc, GetHdcOf(*source), xsrc, ysrc,
hbmpMask, 0, 0, hbmpMask, 0, 0,