diff options
| author | davygrvy <davygrvy> | 2004-10-27 00:56:33 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-10-27 00:56:33 (GMT) |
| commit | f068b3c8aa0a0bfed87b981e99a3b096aed995d5 (patch) | |
| tree | 7584c0c682e4e97811f0996861722c6ad9401f04 /win | |
| parent | 8827901209d887d86a5625b7f71bcc5831110cf1 (diff) | |
| download | tk-f068b3c8aa0a0bfed87b981e99a3b096aed995d5.zip tk-f068b3c8aa0a0bfed87b981e99a3b096aed995d5.tar.gz tk-f068b3c8aa0a0bfed87b981e99a3b096aed995d5.tar.bz2 | |
* win/tkWinX.c: Signature for tkWinXCleanup needed to be
* generic/tkInt.decls: changed so it matches the Tcl_ExitProc
* generic/tkIntPlatDecls.h: typedef to avoid a bad-style cast.
* win/makefile.vc: Force TCL_LIBRARY envar when calling tclsh
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/tkWinX.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 51c254a..3862b84 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.86 2004/09/16 17:52:08 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.87 2004/10/27 00:56:33 davygrvy Exp $ #------------------------------------------------------------------------------ !if !defined(MSDEVDIR) && !defined(MSVCDIR) @@ -568,6 +568,7 @@ genstubs: !if !exist($(TCLSH)) @echo Build tclsh first! !else + set TCL_LIBRARY=$(TCL_LIBRARY) $(TCLSH) $(_TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \ $(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls !endif @@ -581,6 +582,7 @@ depend: !if !exist($(TCLSH)) @echo Build tclsh first! !else + set TCL_LIBRARY=$(TCL_LIBRARY) $(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \ -passthru:"-DBUILD_tcl $(TK_INCLUDES:"="")" $(GENERICDIR) \ $(COMPATDIR) $(WINDIR) @<< diff --git a/win/tkWinX.c b/win/tkWinX.c index 1bef5c4..d00214f 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.34 2004/09/24 01:15:07 patthoyts Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.35 2004/10/27 00:56:33 davygrvy Exp $ */ #include "tkWinInt.h" @@ -289,8 +289,7 @@ TkWinXInit(hInstance) /* * Make sure we cleanup on finalize. */ - TkCreateExitHandler((Tcl_ExitProc *) TkWinXCleanup, - (ClientData) hInstance); + TkCreateExitHandler(TkWinXCleanup, (ClientData) hInstance); } /* @@ -310,9 +309,10 @@ TkWinXInit(hInstance) */ void -TkWinXCleanup(hInstance) - HINSTANCE hInstance; +TkWinXCleanup(clientData) + ClientData clientData; { + HINSTANCE hInstance = (HINSTANCE) clientData; /* * Clean up our own class. */ |