summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts@users.sourceforge.net <patthoyts>2007-10-24 01:03:37 (GMT)
committerpatthoyts@users.sourceforge.net <patthoyts>2007-10-24 01:03:37 (GMT)
commit375a26613b4991661dce6c89bfc51187bd2013c0 (patch)
tree9566ae8d9b743d980d258cd559a44562b04b2e4c
parent8033c1128d82e190ed38e829b41eb66f3c471d90 (diff)
downloadtk-375a26613b4991661dce6c89bfc51187bd2013c0.zip
tk-375a26613b4991661dce6c89bfc51187bd2013c0.tar.gz
tk-375a26613b4991661dce6c89bfc51187bd2013c0.tar.bz2
Applied patch from #1723362 for transparent bitmaps
-rw-r--r--ChangeLog2
-rw-r--r--win/tkWinDraw.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 831bf61..12e15f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-10-24 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * 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 <jeffh@ActiveState.com>
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);