Revert "Use MaskBlt() with the correct ROP when drawing bitmaps with mask."
This reverts r78040 (see #16512) as it broke the appearance of the disabled buttons in MSW toolbars as can be seen in the sample. The change itself might still be correct and could have just uncovered some other bug elsewhere, but for now still revert it just to make the toolbars usable again. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1430,16 +1430,11 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
|
|||||||
::RealizePalette(hdcMem);
|
::RealizePalette(hdcMem);
|
||||||
}
|
}
|
||||||
#endif // wxUSE_PALETTE
|
#endif // wxUSE_PALETTE
|
||||||
// Apply mask and source bitmap to the destination bitmap
|
|
||||||
// (note that we have inverted mask).
|
|
||||||
// AND mask orig.: 0 1
|
|
||||||
// AND mask inv.: 1 0
|
|
||||||
// dest. bitmap: 0 XOR src dst XOR src
|
|
||||||
// =src (src=0 => dst unchanged)
|
|
||||||
ok = ::MaskBlt(cdc, x, y, width, height,
|
ok = ::MaskBlt(cdc, x, y, width, height,
|
||||||
hdcMem, 0, 0,
|
hdcMem, 0, 0,
|
||||||
hbmpMask, 0, 0,
|
hbmpMask, 0, 0,
|
||||||
MAKEROP4(SRCCOPY, SRCINVERT)) != 0;
|
MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
|
||||||
|
|
||||||
#if wxUSE_PALETTE
|
#if wxUSE_PALETTE
|
||||||
if (oldPal)
|
if (oldPal)
|
||||||
|
Reference in New Issue
Block a user