diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2007-12-09 20:44:07 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2007-12-09 20:44:07 (GMT) |
| commit | c4981617ac9afe19315d30fa22bbf9cd72f3f49e (patch) | |
| tree | 13f8a3f79b611c6818a100d36f54ccbbdfdb0965 /win | |
| parent | 5327a1a02eb7eb43b35c01a1b4f190b0aad1d8ed (diff) | |
| download | tk-c4981617ac9afe19315d30fa22bbf9cd72f3f49e.zip tk-c4981617ac9afe19315d30fa22bbf9cd72f3f49e.tar.gz tk-c4981617ac9afe19315d30fa22bbf9cd72f3f49e.tar.bz2 | |
Fix suite of small problems that prevented a build from working for me.
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.in | 4 | ||||
| -rw-r--r-- | win/tkWinWm.c | 26 |
2 files changed, 27 insertions, 3 deletions
diff --git a/win/configure.in b/win/configure.in index ff1e19f..b49e1cb 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.72 2007/11/19 18:39:33 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.73 2007/12/09 20:44:08 dkf Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -179,7 +179,7 @@ TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -eval "TK_SRC_DIR=`cd $srcdir/..; pwd`" +eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" diff --git a/win/tkWinWm.c b/win/tkWinWm.c index adf6a62..a1293dd 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.121 2007/12/05 19:08:00 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.122 2007/12/09 20:44:08 dkf Exp $ */ #include "tkWinInt.h" @@ -563,6 +563,30 @@ 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 */ /* *---------------------------------------------------------------------- |