* generic/tkInt.decls: move all platform test sources from tk lib into

	* generic/tkTest.c:      tktest directly, removes requirement to export
	* macosx/tkMacOSXTest.c: TkplatformtestInit from internal stubs table.
	* unix/Makefile.in:
	* win/Makefile.in:
	* win/makefile.vc:
	* win/tkWinTest.c:

	* generic/tkIntPlatDecls.h:
	* generic/tkStubInit.c: regen.

4 files changed, 6 insertions, 34 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index b360c0c..5bd1a4c 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.41 2005/11/27 02:36:13 das Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.42 2005/12/09 00:48:52 das Exp $
 
 library tk
 
@@ -693,10 +693,6 @@ declare 34 win {
 declare 35 win {
     int TkWinGetPlatformTheme(void)
 }
-# only needed by tktest:
-declare 36 win {
-    int TkplatformtestInit(Tcl_Interp *interp)
-}
 
 ########################
 # Mac OS X specific functions
@@ -879,10 +875,6 @@ declare 51 aqua {
 declare 53 aqua {
     unsigned long TkpGetMS(void)
 }
-# only needed by tktest:
-declare 54 aqua {
-    int TkplatformtestInit(Tcl_Interp *interp)
-}
 
 ##############################################################################
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 2a04ad1..f4cf68d 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.25 2005/11/27 02:36:14 das Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.26 2005/12/09 00:48:54 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -230,11 +230,6 @@ EXTERN void		TkWinSetHINSTANCE _ANSI_ARGS_((HINSTANCE hInstance));
 /* 35 */
 EXTERN int		TkWinGetPlatformTheme _ANSI_ARGS_((void));
 #endif
-#ifndef TkplatformtestInit_TCL_DECLARED
-#define TkplatformtestInit_TCL_DECLARED
-/* 36 */
-EXTERN int		TkplatformtestInit _ANSI_ARGS_((Tcl_Interp * interp));
-#endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
@@ -500,11 +495,6 @@ EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
 /* 53 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
 #endif
-#ifndef TkplatformtestInit_TCL_DECLARED
-#define TkplatformtestInit_TCL_DECLARED
-/* 54 */
-EXTERN int		TkplatformtestInit _ANSI_ARGS_((Tcl_Interp * interp));
-#endif
 #endif /* MAC_OSX_TK */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource_TCL_DECLARED
@@ -627,7 +617,6 @@ typedef struct TkIntPlatStubs {
     int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */
     void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */
     int (*tkWinGetPlatformTheme) _ANSI_ARGS_((void)); /* 35 */
-    int (*tkplatformtestInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 36 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
@@ -684,7 +673,6 @@ typedef struct TkIntPlatStubs {
     void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 51 */
     void *reserved52;
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */
-    int (*tkplatformtestInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 54 */
 #endif /* MAC_OSX_TK */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
@@ -860,10 +848,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
 #endif
-#ifndef TkplatformtestInit
-#define TkplatformtestInit \
-	(tkIntPlatStubsPtr->tkplatformtestInit) /* 36 */
-#endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents
@@ -1058,10 +1042,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
 #endif
-#ifndef TkplatformtestInit
-#define TkplatformtestInit \
-	(tkIntPlatStubsPtr->tkplatformtestInit) /* 54 */
-#endif
 #endif /* MAC_OSX_TK */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index fb75f6a..a8f2ba2 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.54 2005/11/27 02:36:14 das Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.55 2005/12/09 00:48:54 das Exp $
  */
 
 #include "tkInt.h"
@@ -348,7 +348,6 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkWinGetPlatformId, /* 33 */
     TkWinSetHINSTANCE, /* 34 */
     TkWinGetPlatformTheme, /* 35 */
-    TkplatformtestInit, /* 36 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     TkGenerateActivateEvents, /* 0 */
@@ -405,7 +404,6 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkGenWMDestroyEvent, /* 51 */
     NULL, /* 52 */
     TkpGetMS, /* 53 */
-    TkplatformtestInit, /* 54 */
 #endif /* MAC_OSX_TK */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 1999117..98df284 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTest.c,v 1.29 2005/11/27 02:36:14 das Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.30 2005/12/09 00:48:54 das Exp $
  */
 
 #include "tkInt.h"
@@ -217,6 +217,8 @@ static void		TrivialEventProc(ClientData clientData,
 
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 #define TkplatformtestInit(x) TCL_OK
+#else
+MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
 #endif
 
 /*