* 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

5 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d680c4..68994e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-26  David Gravereaux <davygrvy@pobox.com>
+
+	* 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
+
 2004-10-26  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* win/tkWinRegion.c (TkpBuildRegionFromAlphaData): Fixed syntax error
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index f88b670..eb37556 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.37 2004/09/21 19:13:56 mdejong Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.38 2004/10/27 00:56:33 davygrvy Exp $
 
 library tk
 
@@ -823,7 +823,7 @@ declare 27 win {
 }
 
 declare 28 win {
-    void  TkWinXCleanup (HINSTANCE hInstance)
+    void  TkWinXCleanup (ClientData clientData)
 }
 
 declare 29 win {
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index e83cf84..471eabd 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.18 2004/09/21 19:13:57 mdejong Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.19 2004/10/27 00:56:33 davygrvy Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -190,7 +190,7 @@ EXTERN void		TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance));
 #ifndef TkWinXCleanup_TCL_DECLARED
 #define TkWinXCleanup_TCL_DECLARED
 /* 28 */
-EXTERN void		TkWinXCleanup _ANSI_ARGS_((HINSTANCE hInstance));
+EXTERN void		TkWinXCleanup _ANSI_ARGS_((ClientData clientData));
 #endif
 #ifndef TkWinXInit_TCL_DECLARED
 #define TkWinXInit_TCL_DECLARED
@@ -603,7 +603,7 @@ typedef struct TkIntPlatStubs {
     void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */
     void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 26 */
     void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 27 */
-    void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 28 */
+    void (*tkWinXCleanup) _ANSI_ARGS_((ClientData clientData)); /* 28 */
     void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 29 */
     void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 30 */
     void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 31 */
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.
      */