diff options
| author | hobbs <hobbs> | 2001-08-04 00:30:54 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-08-04 00:30:54 (GMT) |
| commit | 47d6b0bbd29cea9eef30188b9c682c2627d61067 (patch) | |
| tree | 2aa45757fa8bd4f3e9a9df7b9ad797ec44225b6b | |
| parent | 0982cb960103918bb368fc971fa42b4fb784c5c8 (diff) | |
| download | tk-47d6b0bbd29cea9eef30188b9c682c2627d61067.zip tk-47d6b0bbd29cea9eef30188b9c682c2627d61067.tar.gz tk-47d6b0bbd29cea9eef30188b9c682c2627d61067.tar.bz2 | |
Win64 #ifdef pointer fixes
| -rw-r--r-- | win/tkWinWm.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index a521a2a..0fc7494 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.22.2.3 2001/04/04 07:57:18 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.22.2.4 2001/08/04 00:30:54 hobbs Exp $ */ #include "tkWinInt.h" @@ -815,7 +815,15 @@ WinSetIcon(interp, titlebaricon, tkw) } } else { ThreadSpecificData *tsdPtr; - if (!SetClassLong(hwnd, GCL_HICONSM, (LPARAM)GetIcon(titlebaricon, ICON_SMALL))) { + if ( +#ifdef _WIN64 + !SetClassLongPtr(hwnd, GCLP_HICONSM, + (LPARAM)GetIcon(titlebaricon, ICON_SMALL)) +#else + !SetClassLong(hwnd, GCL_HICONSM, + (LPARAM)GetIcon(titlebaricon, ICON_SMALL)) +#endif + ) { /* * For some reason this triggers, even though it seems * to be successful This is probably related to the @@ -828,7 +836,15 @@ WinSetIcon(interp, titlebaricon, tkw) * return TCL_ERROR; */ } - if (!SetClassLong(hwnd, GCL_HICON, (LPARAM)GetIcon(titlebaricon, ICON_BIG))) { + if ( +#ifdef _WIN64 + !SetClassLongPtr(hwnd, GCLP_HICON, + (LPARAM)GetIcon(titlebaricon, ICON_BIG)) +#else + !SetClassLong(hwnd, GCL_HICON, + (LPARAM)GetIcon(titlebaricon, ICON_BIG)) +#endif + ) { Tcl_AppendResult(interp,"Unable to set new icon", (char*)NULL); return TCL_ERROR; } |