diff options
| -rw-r--r-- | ChangeLog | 34 | ||||
| -rw-r--r-- | win/configure.in | 4 | ||||
| -rw-r--r-- | win/tkWinWm.c | 26 |
3 files changed, 48 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2007-12-09 Donal K. Fellows <dkf@users.sf.net> + + * win/configure.in: Adjusted code so that running configure does not + generate an error message when the full current directory name + contains a space. + + * win/tkWinWm.c: Added set of #defs to make this file build with my + version of the SDK (i.e. with the msys suite we distribute). + 2007-12-07 Joe English <jenglish@users.sourceforge.net> * library/ttk/altTheme.tcl, library/ttk/classicTheme.tcl: @@ -6,19 +15,18 @@ 2007-12-07 Don Porter <dgp@users.sourceforge.net> * unix/README: Mention the stub library created by `make` and warn - about the effect of embedded paths in the installed binaries. - Thanks to Larry Virden. [Tcl Bug 1794084] + about the effect of embedded paths in the installed binaries. Thanks + to Larry Virden. [Tcl Bug 1794084] 2007-12-05 Joe English <jenglish@users.sourceforge.net> - * macosx/ttkMacOSXTheme.c: Fix TCombobox layout so as - not to truncate long text when combobox is wider than - requested [Bug 1845164]. + * macosx/ttkMacOSXTheme.c: Fix TCombobox layout so as not to truncate + long text when combobox is wider than requested. [Bug 1845164] 2007-12-05 Jeff Hobbs <jeffh@ActiveState.com> - * library/demos/widget: reduce start size to 70% of screenheight - from sh-200 for a more reasonable size. + * library/demos/widget: reduce start size to 70% of screenheight from + sh-200 for a more reasonable size. * win/tkWinButton.c, win/tkWinDialog.c: use SetWindowLongPtr and * win/tkWinScrlbr.c, win/tkWinWm.c: GetWindowLongPtr only. @@ -27,16 +35,16 @@ * win/tkWinInt.h: remove CS_CLASSDC (not recommended for any apps now) * win/tkWinX.c: and simplify WNDCLASS to one style. * win/tkWinWm.c: Reduce wrapper update for exStyle to toolwindow - change only and set WS_EX_LAYERED as sticky (once set on a window, - do not remove it) to reduce alpha transition flicker. + change only and set WS_EX_LAYERED as sticky (once set on a window, do + not remove it) to reduce alpha transition flicker. - * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32 - -loleaut32 but not msvc for Tk's [send]. [Bug 1844749] + * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32 -loleaut32 + but not msvc for Tk's [send]. [Bug 1844749] 2007-12-04 Joe English <jenglish@users.sourceforge.net> - * doc/ttk_style.n: Remove nonsense about "this manpage has - not yet been written"; everything supported is documented. + * doc/ttk_style.n: Remove nonsense about "this manpage has not yet + been written"; everything supported is documented. 2007-12-04 Donal K. Fellows <dkf@users.sf.net> 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 */ /* *---------------------------------------------------------------------- |