diff options
author | das <das> | 2005-12-09 00:48:51 (GMT) |
---|---|---|
committer | das <das> | 2005-12-09 00:48:51 (GMT) |
commit | eeef28e57a775d4290fcc11d968af58b50830a0d (patch) | |
tree | d4cc4ad147a14ead3f76869e5fa86da611d8d993 /win | |
parent | 1984dc757cacc9d2a5497ac210daecd3e569f4d6 (diff) | |
download | tk-eeef28e57a775d4290fcc11d968af58b50830a0d.zip tk-eeef28e57a775d4290fcc11d968af58b50830a0d.tar.gz tk-eeef28e57a775d4290fcc11d968af58b50830a0d.tar.bz2 |
* 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.
Diffstat (limited to 'win')
-rw-r--r-- | win/Makefile.in | 9 | ||||
-rw-r--r-- | win/makefile.vc | 9 | ||||
-rw-r--r-- | win/tkWinTest.c | 4 |
3 files changed, 15 insertions, 7 deletions
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); + /* *---------------------------------------------------------------------- * |