summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2004-09-23 00:35:08 (GMT)
committermdejong <mdejong>2004-09-23 00:35:08 (GMT)
commit1df83bcde28bf0df5b71b229e0b1c2fbfa2ab183 (patch)
tree4daebe3f6998ec5b4880303535f326a21ee1f9bb
parentf837f5091a18171199a750026bdb22215b76a4b5 (diff)
downloadtk-1df83bcde28bf0df5b71b229e0b1c2fbfa2ab183.zip
tk-1df83bcde28bf0df5b71b229e0b1c2fbfa2ab183.tar.gz
tk-1df83bcde28bf0df5b71b229e0b1c2fbfa2ab183.tar.bz2
* win/tkWinWm.c: Rework WS_EX_LAYERED and LWA_ALPHA
defines so that compiling with mingw works again.
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinWm.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b9a8524..85c37a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-22 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/tkWinWm.c: Rework WS_EX_LAYERED and LWA_ALPHA
+ defines so that compiling with mingw works again.
+
2004-09-20 Jeff Hobbs <jeffh@ActiveState.com>
* win/tkWinWm.c (UpdateWrapper, WmAttributesCmd): handle attribute
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index bc5c387..67cfad2 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,17 +12,19 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.11 2004/09/21 00:08:56 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.12 2004/09/23 00:35:09 mdejong Exp $
*/
#include "tkWinInt.h"
#include <shellapi.h>
-#ifndef WS_EX_LAYERED
/*
- * This is only valid on Win2K/XP+.
+ * These next two defines are only valid on Win2K/XP+.
*/
+#ifndef WS_EX_LAYERED
#define WS_EX_LAYERED 0x00080000
+#endif
+#ifndef LWA_ALPHA
#define LWA_ALPHA 0x00000002
#endif