summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-01-16 23:45:32 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-01-16 23:45:32 (GMT)
commit572a7283c96879bc8cc228b51be2e24abc22fc0b (patch)
tree47222533ed55420dc62da877b683ef22bd10aac5
parentc306dbafc3a98beb1f880c967fd8bd82d39ab951 (diff)
downloadtk-572a7283c96879bc8cc228b51be2e24abc22fc0b.zip
tk-572a7283c96879bc8cc228b51be2e24abc22fc0b.tar.gz
tk-572a7283c96879bc8cc228b51be2e24abc22fc0b.tar.bz2
* win/tkWinWm.c (WmAttributesCmd): Fix a single use of
SetWindowLongPtr which was not properly ifdef'd.
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinWm.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 96a724b..23ffc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-16 Andreas Kupries <andreask@activestate.com>
+
+ * win/tkWinWm.c (WmAttributesCmd): Fix a single use of
+ SetWindowLongPtr which was not properly ifdef'd.
+
2008-11-04 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tkPort.h: remove the ../unix/ header dir as the build
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 2cc885c..5b0a4ec 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
* 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.28 2007/12/05 19:18:09 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.29 2009/01/16 23:45:32 andreas_kupries Exp $
*/
#include "tkWinInt.h"
@@ -2990,8 +2990,13 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv)
* translation. Add the 0.5 to round the value.
*/
if (!(wmPtr->exStyleConfig & WS_EX_LAYERED)) {
+#ifdef _WIN64
SetWindowLongPtr(wmPtr->wrapper, GWL_EXSTYLE,
*stylePtr);
+#else
+ SetWindowLongPtr(wmPtr->wrapper, GWL_EXSTYLE,
+ *stylePtr);
+#endif
}
setLayeredWindowAttributesProc((HWND) wmPtr->wrapper,
wmPtr->colorref, (BYTE) (wmPtr->alpha * 255 + 0.5),