From cdc413660803a2d8ed88478d3828b26361cba224 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Wed, 24 Oct 2007 01:03:37 +0000 Subject: Applied patch from #1723362 for transparent bitmaps FossilOrigin-Name: 7e79cdbfba5d7c5d54f4cb18f5063fb6515568a8 --- ChangeLog | 2 ++ win/tkWinDraw.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 831bf61..12e15f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-10-24 Pat Thoyts + * win/tkWinDraw.c: Applied patch #1723362 for transparent bitmaps + * generic/tkWindow.c: permit wm manage of any widget (esp: ttk::frame) 2007-10-23 Jeff Hobbs diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index 8c736ab..d1be3e1 100644 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinDraw.c,v 1.18 2007/01/11 15:35:40 dkf Exp $ + * RCS: @(#) $Id: tkWinDraw.c,v 1.19 2007/10/24 01:03:37 patthoyts Exp $ */ #include "tkWinInt.h" @@ -414,6 +414,8 @@ XCopyPlane( fgBrush = CreateSolidBrush(gc->foreground); oldBrush = SelectObject(destDC, fgBrush); + SetBkColor(destDC, RGB(255,255,255)); + SetTextColor(destDC, RGB(0,0,0)); BitBlt(destDC, dest_x, dest_y, (int) width, (int) height, srcDC, src_x, src_y, MASKPAT); SelectObject(destDC, oldBrush); -- cgit v0.12