diff options
| author | hobbs <hobbs@noemail.net> | 2000-02-08 11:31:27 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2000-02-08 11:31:27 (GMT) |
| commit | 6425b8563000a38896957048e230b624e7787221 (patch) | |
| tree | aaba98591be690b73fe87702aaa4023a89457083 /win | |
| parent | bb9ddb68e864d2c686a08a1f9270dba0f1c25a4c (diff) | |
| download | tk-6425b8563000a38896957048e230b624e7787221.zip tk-6425b8563000a38896957048e230b624e7787221.tar.gz tk-6425b8563000a38896957048e230b624e7787221.tar.bz2 | |
* generic/tkDecls.h:
* generic/tk.decls:
* generic/tk.h: moved new public functions created in dash patch
to the stubs interface [Bug: 4062]
* generic/tk.h:
* doc/CrtImgType.3:
* doc/CrtPhImgFmt.3:
* generic/tk.h:
* generic/tkImgGIF.c:
* generic/tkImgPhoto.c:
* generic/tkStubImg.c (new file):
* generic/tkTest.c:
* unix/Makefile.in:
* win/Makefile.in:
* win/makefile.vc: improved support for moving from the old style
image C API to the new obj'ified one with new Tk_InitImageArgs
command and stub'ing of image code. See docs for how to make the
transition. [Bug: 4060]
FossilOrigin-Name: dbe34fe5efcb725442acc347dcb728ad8e30493c
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 5 | ||||
| -rw-r--r-- | win/makefile.vc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index f0f412b..ab801f1 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.17 2000/02/01 11:41:43 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.18 2000/02/08 11:31:49 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -331,7 +331,8 @@ TK_OBJS = \ tkWindow.$(OBJEXT) STUB_OBJS = \ - tkStubLib.$(OBJEXT) + tkStubLib.$(OBJEXT) \ + tkStubImg.$(OBJEXT) TCL_DOCS = "$(TCL_SRC_DIR_NATIVE)"/../doc/*.[13n] TK_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n] diff --git a/win/makefile.vc b/win/makefile.vc index f4ac608..254631e 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.30 1999/12/09 14:46:41 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.31 2000/02/08 11:31:49 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -216,6 +216,7 @@ TKOBJS = \ $(TMPDIR)\tkWindow.obj TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj \ + $(TMPDIR)\tkStubImg.obj cc32 = "$(TOOLS32)\bin\cl.exe" |