From eeef28e57a775d4290fcc11d968af58b50830a0d Mon Sep 17 00:00:00 2001 From: das Date: Fri, 9 Dec 2005 00:48:51 +0000 Subject: * 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. --- ChangeLog | 19 ++++++++++++++++--- generic/tkInt.decls | 10 +--------- generic/tkIntPlatDecls.h | 22 +--------------------- generic/tkStubInit.c | 4 +--- generic/tkTest.c | 4 +++- macosx/tkMacOSXTest.c | 7 ++++--- unix/Makefile.in | 10 ++++++---- win/Makefile.in | 9 ++++++--- win/makefile.vc | 9 ++++++--- win/tkWinTest.c | 4 +++- 10 files changed, 47 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a733f6..06156a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-12-09 Daniel Steffen + + * 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. + 2005-12-08 Jeff Hobbs * win/tcl.m4: Add build support for Windows-x64 builds. @@ -16,9 +29,9 @@ 2005-12-08 Daniel Steffen - * macosx/tkMacOSXDraw.c: remove inclusion of tclInt.h and use of tcl - * macosx/tkMacOSXFont.c: internals wherever possible in tk/macosx, the - * macosx/tkMacOSXInit.c: only remaining tcl internals in TkAqua are + * macosx/tkMacOSXDraw.c: remove inclusion of tclInt.h and use of tcl + * macosx/tkMacOSXFont.c: internals wherever possible in tk/macosx, the + * macosx/tkMacOSXInit.c: only remaining tcl internals in TkAqua are * macosx/tkMacOSXNotify.c: TclServiceIdle() in tkMacOSXScrlbr.c and * macosx/tkMacOSXScrlbr.c: Tcl_Get/SetStartupScript() in tkMacOSXInit.c [Bug 1336531]. 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 /* diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c index be32f4d..51189eb 100644 --- a/macosx/tkMacOSXTest.c +++ b/macosx/tkMacOSXTest.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: tkMacOSXTest.c,v 1.4 2005/11/27 02:36:15 das Exp $ + * RCS: @(#) $Id: tkMacOSXTest.c,v 1.5 2005/12/09 00:48:54 das Exp $ */ #include "tkMacOSXInt.h" @@ -19,8 +19,9 @@ * Forward declarations of procedures defined later in this file: */ -static int DebuggerCmd _ANSI_ARGS_((ClientData dummy, - Tcl_Interp *interp, int argc, CONST char **argv)); +static int DebuggerCmd (ClientData dummy, Tcl_Interp *interp, + int argc, CONST char **argv); +MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp); /* *---------------------------------------------------------------------- diff --git a/unix/Makefile.in b/unix/Makefile.in index 5d6c2f1..e97ba2a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.110 2005/12/08 21:13:17 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.111 2005/12/09 00:48:54 das Exp $ # Current Tk version; used in various names. @@ -332,7 +332,7 @@ ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ WISH_OBJS = tkAppInit.o -TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o +TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o $(@TK_WINDOWINGSYSTEM@_TKTEST_OBJS) WIDG_OBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \ tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \ @@ -374,11 +374,13 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \ tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \ tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \ tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \ - tkMacOSXSubwindows.o tkMacOSXTest.o tkMacOSXWindowEvent.o \ + tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \ tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXCarbonEvents.o \ tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \ xcolors.o xdraw.o xgc.o ximage.o xutil.o +AQUA_TKTEST_OBJS = tkMacOSXTest.o + OBJS = $(GENERIC_OBJS) $(WIDG_OBJS) $(CANV_OBJS) $(IMAGE_OBJS) $(TEXT_OBJS) \ $(STUB_OBJS) $(@TK_WINDOWINGSYSTEM@_OBJS) @PLAT_OBJS@ @@ -1213,7 +1215,7 @@ tkMacOSXSubwindows.o: $(MAC_OSX_DIR)/tkMacOSXSubwindows.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSubwindows.c tkMacOSXTest.o: $(MAC_OSX_DIR)/tkMacOSXTest.c - $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c + $(CC) -c $(CC_SWITCHES_NO_STUBS) $(MAC_OSX_DIR)/tkMacOSXTest.c tkMacOSXWindowEvent.o: $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c diff --git a/win/Makefile.in b/win/Makefile.in index 8fdcd94..1f7c891 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.65 2005/12/08 20:25:42 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.66 2005/12/09 00:48:54 das Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -233,7 +233,8 @@ WISH_OBJS = \ TKTEST_OBJS = \ testMain.$(OBJEXT) \ tkSquare.$(OBJEXT) \ - tkTest.$(OBJEXT) + tkTest.$(OBJEXT) \ + tkWinTest.$(OBJEXT) XLIB_OBJS = \ xcolors.$(OBJEXT) \ @@ -268,7 +269,6 @@ TK_OBJS = \ tkWinScrlbr.$(OBJEXT) \ tkWinSend.$(OBJEXT) \ tkWinSendCom.$(OBJEXT) \ - tkWinTest.$(OBJEXT) \ tkWinWindow.$(OBJEXT) \ tkWinWm.$(OBJEXT) \ tkWinX.$(OBJEXT) \ @@ -593,6 +593,9 @@ testMain.$(OBJEXT): winMain.c tkTest.$(OBJEXT): tkTest.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) +tkWinTest.$(OBJEXT): tkWinTest.c + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) + tkSquare.$(OBJEXT): tkSquare.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) diff --git a/win/makefile.vc b/win/makefile.vc index 9eb3e5b..2f2c21b 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.91 2005/12/08 22:14:15 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.92 2005/12/09 00:48:54 das Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -229,7 +229,8 @@ WISHOBJS = \ TKTESTOBJS = \ $(TMP_DIR)\tkTest.obj \ $(TMP_DIR)\tkSquare.obj \ - $(TMP_DIR)\testMain.obj + $(TMP_DIR)\testMain.obj \ + $(TMP_DIR)\tkWinTest.obj XLIBOBJS = \ $(TMP_DIR)\xcolors.obj \ @@ -264,7 +265,6 @@ TKOBJS = \ $(TMP_DIR)\tkWinScrlbr.obj \ $(TMP_DIR)\tkWinSend.obj \ $(TMP_DIR)\tkWinSendCom.obj \ - $(TMP_DIR)\tkWinTest.obj \ $(TMP_DIR)\tkWinWindow.obj \ $(TMP_DIR)\tkWinWm.obj \ $(TMP_DIR)\tkWinX.obj \ @@ -700,6 +700,9 @@ $(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? +$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c + $(cc32) $(WISH_CFLAGS) -Fo$@ $? + $(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 958ac6d..195605a 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinTest.c,v 1.10 2005/12/02 13:42:29 dkf Exp $ + * RCS: @(#) $Id: tkWinTest.c,v 1.11 2005/12/09 00:48:54 das Exp $ */ #include "tkWinInt.h" @@ -27,7 +27,9 @@ static int TestclipboardObjCmd(ClientData clientData, Tcl_Obj *CONST objv[]); static int TestwineventCmd(ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); +MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp); + /* *---------------------------------------------------------------------- * -- cgit v0.12