diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2007-12-14 15:56:08 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-12-14 15:56:08 (GMT) |
| commit | f590d202080c26d797acadcbe6ba072adf79b3e3 (patch) | |
| tree | 4bb5b056ddecb200ee7354aec22717f50ba8d156 /win/tkWinWm.c | |
| parent | 1e2cc34c8fe57acaaf8376477933f36338c316c2 (diff) | |
| download | tk-f590d202080c26d797acadcbe6ba072adf79b3e3.zip tk-f590d202080c26d797acadcbe6ba072adf79b3e3.tar.gz tk-f590d202080c26d797acadcbe6ba072adf79b3e3.tar.bz2 | |
Add in missing function definitions to support plain MSVC6 and use
INT_PTR rather than LONG_PTR which isn'tr defined in the msvc6
headers.
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index f647c08..d9fc1ac 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.123 2007/12/13 15:28:56 dgp Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.124 2007/12/14 15:56:09 patthoyts Exp $ */ #include "tkWinInt.h" @@ -563,30 +563,6 @@ static void WmUpdateGeom(WmInfo *wmPtr, TkWindow *winPtr); */ #define WIDTHBYTES(bits) ((((bits) + 31)>>5)<<2) - -/* - * Hacks to make this file build with older versions of the SDK. - */ - -#ifndef GetClassLongPtr -# define GetClassLongPtrA GetClassLongA -# define GetClassLongPtrW GetClassLongW -# define SetClassLongPtrA SetClassLongA -# define SetClassLongPtrW SetClassLongW -# ifdef UNICODE -# define GetClassLongPtr GetClassLongPtrW -# define SetClassLongPtr SetClassLongPtrW -# else -# define GetClassLongPtr GetClassLongPtrA -# define SetClassLongPtr SetClassLongPtrA -# endif /* !UNICODE */ -#endif /* !GetClassLongPtr */ -#ifndef GCLP_HICON -# define GCLP_HICON GCL_HICON -#endif /* !GCLP_HICON */ -#ifndef GCLP_HICONSM -# define GCLP_HICONSM (-34) -#endif /* !GCLP_HICONSM */ /* *---------------------------------------------------------------------- @@ -2220,7 +2196,7 @@ UpdateWrapper( parentHWND, NULL, Tk_GetHINSTANCE(), NULL); Tcl_DStringFree(&classString); Tcl_DStringFree(&titleString); - SetWindowLongPtr(wmPtr->wrapper, GWLP_USERDATA, (LONG_PTR) winPtr); + SetWindowLongPtr(wmPtr->wrapper, GWLP_USERDATA, (INT_PTR) winPtr); tsdPtr->createWindow = NULL; if ((wmPtr->exStyleConfig & WS_EX_LAYERED) @@ -2274,7 +2250,7 @@ UpdateWrapper( WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); if (winPtr->flags & TK_EMBEDDED) { - SetWindowLongPtr(child, GWLP_WNDPROC, (LONG_PTR) TopLevelProc); + SetWindowLongPtr(child, GWLP_WNDPROC, (INT_PTR) TopLevelProc); } SetParent(child, wmPtr->wrapper); |