Update TEA

generic/*.c: Eliminate some unnecessary type-casts
Rename "trunk" to "main", add "trunk" tag, as done with other Tcl-related fossil repositories.

.fossil-settings/binary-glob

@@ -0,0 +1,12 @@
+*.a
+*.bmp
+*.dll
+*.exe
+*.gif
+*.gz
+*.jpg
+*.lib
+*.pdf
+*.png
+*.xlsx
+*.zip

.fossil-settings/crlf-glob

@@ -0,0 +1,18 @@
+compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+compat/zlib/contrib/vstudio/readme.txt
+compat/zlib/contrib/vstudio/*/zlib.rc
+compat/zlib/contrib/vstudio/*/*.sln
+compat/zlib/win32/*.txt
+compat/zlib/win64/*.txt
+libtommath/*.dsp
+libtommath/*.sln
+libtommath/*.vcproj
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.vc
+win/rules.vc
+win/rules-ext.vc
+win/targets.vc
+win/tcl.dsp
+win/tcl.dsw

.fossil-settings/encoding-glob

@@ -0,0 +1,7 @@
+tools/tcl.wse.in
+win/buildall.vc.bat
+win/coffbase.txt
+win/makefile.vc
+win/rules.vc
+win/tcl.dsp
+win/tcl.dsw

.fossil-settings/ignore-glob

@@ -0,0 +1,29 @@
+*.a
+*.dll
+*.dylib
+*.dylib.E
+*.exe
+*.exp
+*.la
+*.lib
+*.lo
+*.o
+*.obj
+*.pdb
+*.res
+*.sl
+*.so
+Makefile
+autom4te.cache
+config.cache
+config.log
+config.status
+itkConfig.sh
+pkgIndex.tcl
+versions.vc
+version.vc
+libitk.vfs
+libitk_*.zip
+html
+win/nmakehlp.out
+win/nmhlp-out.txt

.fossil-settings/manifest

@@ -0,0 +1 @@
+u

.gitattributes

@@ -0,0 +1,40 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* eol=lf
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.3 text
+*.c text
+*.css text
+*.enc text
+*.h text
+*.htm text
+*.html text
+*.java text
+*.js text
+*.json text
+*.n text
+*.svg text
+*.ts text
+*.tcl text
+*.test text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat eol=crlf
+*.sln eol=crlf
+*.vc eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.a binary
+*.bmp binary
+*.dll binary
+*.exe binary
+*.gif binary
+*.gz binary
+*.jpg binary
+*.lib binary
+*.pdf binary
+*.png binary
+*.xlsx binary
+*.zip binary

.gitignore

@@ -0,0 +1,33 @@
+*.a
+*.bundle
+*.dll
+*.dylib
+*.dylib.E
+*.exe
+*.exp
+*.lib
+*.o
+*.obj
+*.pdb
+*.res
+*.sl
+*.so
+.fslckout
+Makefile
+autom4te.cache
+config.cache
+config.log
+config.status
+config.status.lineno
+html
+manifest.uuid
+_FOSSIL_
+itkConfig.sh
+pkgIndex.tcl
+versions.vc
+version.vc
+libitk.vfs
+libitk_*.zip
+html
+win/nmakehlp.out
+win/nmhlp-out.txt

ChangeLog

@@ -0,0 +1,27 @@
+NOTICE: This ChangeLog is no longer being maintained. To examine
+the series of changes checked into Itk sources, follow the Timeline
+
+https://core.tcl.tk/itk/timeline
+
+2014-09-07 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* generic/itkArchetype.c: Fix for SF bug #253.
+
+2013-02-03 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* bumped version to 4.0.0 for release
+	* added tools directory
+	* Makefile.in: added genstubs tag for generating stubs entries
+	* generic/itkArchBase.c: fixed some param types to fit to itcl changes
+
+2011-04-29 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* configure, configure.in, generic/itk.h: Bump version to 4.0b6
+
+2010-08-17  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* configure, configure.in, generic/itk.h: Bump version to 4.0b5
+	* tclconfig/tcl.m4: full update to TEA 3.9
+
+2007-09-08 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* all new modules installed and added
+This is the ChangeLog file for itcl-ng/itk
+it is here as Itk and itcl-ng/itk will be different modules in the future
+

Makefile.in

@@ -7,223 +7,179 @@
 #	replaced in the actual Makefile.
 #
 # Copyright (c) 1999 Scriptics Corporation.
+# Copyright (c) 2002-2005 ActiveState Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: Makefile.in,v 1.9 2000/03/17 22:09:05 wart Exp $
-
-#========================================================================
-# Edit the following few lines when writing a new extension
-#========================================================================
-
-#========================================================================
-# Change the name of the variable "exampleA_LIB_FILE" to match the one
-# used in the configure script.  This is the parameterized name of the
-# library that we are building.
-#========================================================================
-
-lib_BINARIES=$(itk_LIB_FILE) $(itkstub_LIB_FILE)
-BINARIES=$(lib_BINARIES)
-
-#========================================================================
-# Enumerate the names of the source files included in this package.
-# This will be used when a dist target is added to the Makefile.
-#========================================================================
-
-WIN_DIR=$(srcdir)/win
-UNIX_DIR=$(srcdir)/unix
-GENERIC_DIR=$(srcdir)/generic
-PLATFORM_DIR=@PLATFORM_DIR@
-
-WIN_SOURCES=$(PLATFORM_DIR)/tclAppInit.c \
-	$(PLATFORM_DIR)/dllEntryPoint.c
-UNIX_SOURCES=$(PLATFORM_DIR)/tclAppInit.c
-GENERIC_SOURCES = $(GENERIC_DIR)/itk_cmds.c \
-	$(GENERIC_DIR)/itk_option.c \
-	$(GENERIC_DIR)/itk_archetype.c \
-	$(GENERIC_DIR)/itk_util.c \
-	$(GENERIC_DIR)/itkStubInit.c \
-	$(GENERIC_DIR)/itkStubLib.c 
-PLATFORM_SOURCES = @PLATFORM_SOURCES@
-itk_SOURCES = $(PLATFORM_SOURCES) $(GENERIC_SOURCES)
-SOURCES = $(itk_SOURCES)
-
-#========================================================================
-# Enumerate the names of the object files included in this package.
-# These objects are created and linked into the final library.  In
-# most cases these object files will correspond to the source files
-# above.
-#
-#========================================================================
-
-WIN_OBJECTS = dllEntryPoint.$(OBJEXT)
-UNIX_OBJECTS =
-GENERIC_OBJECTS = itk_cmds.$(OBJEXT) \
-	itk_option.$(OBJEXT) \
-	itk_archetype.$(OBJEXT) \
-	itk_util.$(OBJEXT) \
-	itkStubInit.$(OBJEXT) \
-	itkStubLib.$(OBJEXT) 
-PLATFORM_OBJECTS = @PLATFORM_OBJECTS@
-itk_OBJECTS = $(PLATFORM_OBJECTS) $(GENERIC_OBJECTS)
-itkstub_OBJECTS = itkStubLib.$(OBJEXT)
-OBJECTS = $(itk_OBJECTS) $(itkstub_OBJECTS)
-
-#========================================================================
-# The substitution of "exampleA_LIB_FILE" into the variable name below
-# let's us refer to the objects for the library without knowing the name
-# of the library in advance.  It also lets us use the "$@" variable in
-# the rule for building the library, so we can refer to both the list of 
-# objects and the library itself in a platform-independent manner.
-#========================================================================
-
-itk_LIB_FILE = @itk_LIB_FILE@
-$(itk_LIB_FILE)_OBJECTS = $(itk_OBJECTS)
-
-itkstub_LIB_FILE = @itkstub_LIB_FILE@
-$(itkstub_LIB_FILE)_OBJECTS = $(itkstub_OBJECTS)
-
-itclstub_LIB_FILE = @itclstub_LIB_FILE@
-
-tkstub_LIB_SPEC = @tkstub_LIB_SPEC@
-
-#========================================================================
-# This is a list of header files to be installed
-#========================================================================
-
-GENERIC_HDRS= \
-	$(srcdir)/generic/itk.h
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
-# have been added to the configure script.
+# have been added in a customized configure script.
 #========================================================================
 
-SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
-
-ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
-
-ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@
-ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@
-ITK_WIN_DIR_NATIVE = @ITK_WIN_DIR_NATIVE@
+#SAMPLE_NEW_VAR	= @SAMPLE_NEW_VAR@
 
 #========================================================================
-# Nothing of the variables below this line need to be changed.  Please
-# check the TARGETS section below to make sure the make targets are
-# correct.
+# Nothing of the variables below this line should need to be changed.
+# Please check the TARGETS section below to make sure the make targets
+# are correct.
 #========================================================================
 
-SHELL = @SHELL@
+#========================================================================
+# The names of the source files is defined in the configure script.
+# The object files are used for linking into the final library.
+# This will be used when a dist target is added to the Makefile.
+# It is not important to specify the directory, as long as it is the
+# $(srcdir) or in the generic, win or unix subdirectory.
+#========================================================================
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+PKG_SOURCES	= @PKG_SOURCES@
+PKG_OBJECTS	= @PKG_OBJECTS@
 
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
 
-DESTDIR =
+#========================================================================
+# PKG_TCL_SOURCES identifies Tcl runtime files that are associated with
+# this package that need to be installed, if any.
+#========================================================================
 
-pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
-pkglibdir = $(libdir)/@PACKAGE@@VERSION@
-pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
+PKG_TCL_SOURCES = @PKG_TCL_SOURCES@
 
-top_builddir = .
+#========================================================================
+# This is a list of header files to be installed
+# itk.h includes itclInt.h, which needs itclIntDecls.h,
+# so we must install them.
+#========================================================================
 
-INSTALL = $(top_srcdir)/../config/install-sh -c
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
-transform = @program_transform_name@
+PKG_HEADERS	= @PKG_HEADERS@
 
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
+#========================================================================
+# "PKG_LIB_FILE" refers to the library (dynamic or static as per
+# configuration options) composed of the named objects.
+#========================================================================
 
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-CC = @CC@
-CFLAGS_DEBUG = @CFLAGS_DEBUG@
-CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
-CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
-CLEANFILES = @CLEANFILES@
-EXEEXT = @EXEEXT@
-LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
-LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
-LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
-MAKE_LIB = @MAKE_LIB@
-MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
-MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
-OBJEXT = @OBJEXT@
-RANLIB = @RANLIB@
-SHLIB_CFLAGS = @SHLIB_CFLAGS@
-SHLIB_LD = @SHLIB_LD@
-SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-STLIB_LD = @STLIB_LD@
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_DEFS = @TCL_DEFS@
-TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@
-TCL_LD_FLAGS = @TCL_LD_FLAGS@
-TCL_LIBS = @TCL_LIBS@
-TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@
-TCL_SRC_DIR = @TCL_SRC_DIR@
-TCL_DBGX = @TCL_DBGX@
-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
-TCL_TOOL_DIR_NATIVE = @TCL_TOOL_DIR_NATIVE@
-TCL_TOP_DIR_NATIVE = @TCL_TOP_DIR_NATIVE@
-TCL_UNIX_DIR_NATIVE = @TCL_UNIX_DIR_NATIVE@
-TCL_WIN_DIR_NATIVE = @TCL_WIN_DIR_NATIVE@
-INCLUDE_DIR_NATIVE = @INCLUDE_DIR_NATIVE@
-TCL_BMAP_DIR_NATIVE = @TCL_BMAP_DIR_NATIVE@
-TCL_PLATFORM_DIR_NATIVE = @TCL_PLATFORM_DIR_NATIVE@
-TCL_GENERIC_DIR_NATIVE = @TCL_GENERIC_DIR_NATIVE@
-TK_TOP_DIR_NATIVE = $(TK_SRC_DIR)
-TK_SRC_DIR = @TK_SRC_DIR@
-TCLSH_PROG = @TCLSH_PROG@
-TK_XINCLUDES = @TK_XINCLUDES@
-TCL_INCLUDES = @TCL_INCLUDES@
-TK_INCLUDES = @TK_INCLUDES@
-ITCL_INCLUDES = @ITCL_INCLUDES@
-ITK_INCLUDES = @ITCL_INCLUDES@ @ITK_INCLUDES@ @TK_XINCLUDES@
+PKG_LIB_FILE	= @PKG_LIB_FILE@
+PKG_LIB_FILE8	= @PKG_LIB_FILE8@
+PKG_LIB_FILE9	= @PKG_LIB_FILE9@
+PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
-AUTOCONF = autoconf
+lib_BINARIES	= $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
+BINARIES	= $(lib_BINARIES)
 
-LDFLAGS = $(LDFLAGS_DEFAULT)
+SHELL		= @SHELL@
 
-INCLUDES = @TCL_INCLUDES@ @TK_INCLUDES@ $(ITK_INCLUDES)
+srcdir		= @srcdir@
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
 
-EXTRA_CFLAGS = $(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) $(NO_DEPRECATED_FLAGS) $(TCL_EXTRA_CFLAGS)
+bindir		= @bindir@
+libdir		= @libdir@
+includedir	= @includedir@
+datarootdir	= @datarootdir@
+runstatedir	= @runstatedir@
+datadir		= @datadir@
+mandir		= @mandir@
 
-DEFS = @DEFS@ $(EXTRA_CFLAGS) -DITK_LIBRARY=\"$(ITK_LIBRARY)\"
+DESTDIR		=
 
-ACLOCAL_M4 = $(srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
+PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+pkgdatadir	= $(datadir)/$(PKG_DIR)
+pkglibdir	= $(libdir)/$(PKG_DIR)
+pkgincludedir	= $(includedir)/$(PKG_DIR)
 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-AR = ar
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+top_builddir	= @abs_top_builddir@
+
+INSTALL_OPTIONS	=
+INSTALL		= @INSTALL@ $(INSTALL_OPTIONS)
+INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
+INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+INSTALL_LIBRARY	= @INSTALL_LIBRARY@
+
+PACKAGE_NAME	= @PACKAGE_NAME@
+PACKAGE_VERSION	= @PACKAGE_VERSION@
+CC		= @CC@
+CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+CFLAGS_WARNING	= @CFLAGS_WARNING@
+EXEEXT		= @EXEEXT@
+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
+MAKE_LIB	= @MAKE_LIB@
+MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
+MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
+MAKE_STUB_LIB	= @MAKE_STUB_LIB@
+OBJEXT		= @OBJEXT@
+RANLIB		= @RANLIB@
+RANLIB_STUB	= @RANLIB_STUB@
+SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+SHLIB_LD	= @SHLIB_LD@
+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+STLIB_LD	= @STLIB_LD@
+#TCL_DEFS	= @TCL_DEFS@
+TCL_BIN_DIR	= @TCL_BIN_DIR@
+TCL_SRC_DIR	= @TCL_SRC_DIR@
+TK_SRC_DIR	= @TK_SRC_DIR@
+TK_BIN_DIR	= @TK_BIN_DIR@
+ITCL_TOOLS_DIR	= @itcl_SRC_DIR@/tools
+
+# Not used, but retained for reference of what libs Tcl required
+#TCL_LIBS	= @TCL_LIBS@
+
+#========================================================================
+# TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
+# package without installing.  The other environment variables allow us
+# to test against an uninstalled Tcl.  Add special env vars that you
+# require for testing here (like TCLX_LIBRARY).
+#========================================================================
+
+#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
+EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
+TCLLIBPATH	= $(top_builddir) @itcl_BIN_DIR@
+TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
+PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
+		  PATH="$(EXTRA_PATH):$(PATH)" \
+		  ITCL_LIBRARY=`@CYGPATH@ @itcl_SRC_DIR@/library` \
+		  ITK_LIBRARY=`@CYGPATH@ $(srcdir)/library` \
+		  TCLLIBPATH="$(TCLLIBPATH)"
+
+TCLSH_PROG	= @TCLSH_PROG@
+TCLSH		= $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG)
+
+WISH_ENV	= TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
+WISH_PROG	= @WISH_PROG@
+WISH		= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
+
+SHARED_BUILD	= @SHARED_BUILD@
+
+#INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
+
+PKG_CFLAGS	= @PKG_CFLAGS@
+
+# TCL_DEFS is not strictly need here, but if you remove it, then you
+# must make sure that configure.ac checks for the necessary components
+# that your library may use.  TCL_DEFS can actually be a problem if
+# you do not compile with a similar machine setup as the Tcl core was
+# compiled with.
+#DEFS		= $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
+DEFS		= @DEFS@ $(PKG_CFLAGS) -DITK_LIBRARY=\"$(pkglibdir)\"
+
+CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itkConfig.sh pkgIndex.tcl
+CLEANFILES	= @CLEANFILES@
+
+CPPFLAGS	= @CPPFLAGS@
+LIBS		= @PKG_LIBS@ @LIBS@
+AR		= @AR@
+CFLAGS		= @CFLAGS@
+COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+GDB		= gdb
+VALGRIND	= valgrind
+VALGRINDARGS	= --tool=memcheck --num-callers=8 --leak-resolution=high \
+		  --leak-check=yes --show-reachable=yes -v
+
+.SUFFIXES: .c .$(OBJEXT)
 
 #========================================================================
 # Start of user-definable TARGETS section
@@ -231,7 +187,7 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
 #========================================================================
 # TEA TARGETS.  Please note that the "libraries:" target refers to platform
-# independent files, and the "binaries:" target inclues executable programs and
+# independent files, and the "binaries:" target includes executable programs and
 # platform-dependent libraries.  Modify these targets so that they install
 # the various pieces of your package.  The make and install rules
 # for the BINARIES that you specified above have already been done.
@@ -250,6 +206,12 @@ binaries: $(BINARIES)
 
 libraries:
 
+#========================================================================
+# Your doc target should differentiate from doc builds (by the developer)
+# and doc installs (see install-doc), which just install the docs on the
+# end user machine when building from source.
+#========================================================================
+
 doc:
 
 install: all install-binaries install-libraries install-doc
@@ -258,19 +220,15 @@ install-binaries: binaries install-lib-binaries install-bin-binaries
 
 #========================================================================
 # This rule installs platform-independent files, such as header files.
+# The list=...; for p in $$list handles the empty list case x-platform.
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
-	@echo "Installing header files in $(includedir)"
-	@for i in $(GENERIC_HDRS) ; do \
-	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(includedir) ; \
-	done;
-	@echo "Installing library files in $(ITK_LIBRARY)"
-	@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
-	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(includedir)"
+	@echo "Installing header files in $(DESTDIR)$(includedir)"
+	@list='$(PKG_HEADERS)'; for i in $$list; do \
+	    echo "Installing $(srcdir)/$$i" ; \
+	    $(INSTALL_DATA) $(srcdir)/$$i "$(DESTDIR)$(includedir)" ; \
 	done;
 
 #========================================================================
@@ -279,81 +237,148 @@ install-libraries: libraries
 #========================================================================
 
 install-doc: doc
-	$(mkinstalldirs) $(mandir)/mann
-	@echo "Installing man pages in $(mandir)"
-	@for i in $(srcdir)/doc/*.n; \
-	    do \
-	    echo "Installing $$i"; \
-	    rm -f $(mandir)/mann/$$i; \
-	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
-	    done
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/mann"
+	@echo "Installing documentation in $(DESTDIR)$(mandir)"
+	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
+	    if test X"$$i" = X'$(srcdir)/doc/*.n'; then break; fi; \
+	    bi=`basename $$i`; \
+	    echo "Installing $$bi"; \
+	    sed -e '/man\.macros/r $(srcdir)/doc/man.macros' -e '/man\.macros/d' $$i > $$bi.tmp \
+	    && $(INSTALL_DATA) $$bi.tmp "$(DESTDIR)$(mandir)/mann/$$bi" \
+	    && rm -f $$bi.tmp; \
+	done
 
-test:
+test: binaries libraries
+	$(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) -load "package require -exact itk $(PACKAGE_VERSION)"
+
+shell: binaries libraries
+	@$(WISH) $(SCRIPT)
+
+gdb:
+	$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(WISH_PROG) $(SCRIPT)
+
+gdb-test: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
+	    --args $(WISH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
+	    $(TESTFLAGS) -singleproc 1 \
+	    -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
+		[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
+
+valgrind: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) \
+	    `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+
+valgrindshell: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) $(SCRIPT)
 
 depend:
 
+genstubs: $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic/itk.decls
+	$(TCLSH) $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic $(srcdir)/generic/itk.decls
+
 #========================================================================
-# Enumerate the names of the object files included in this package.
-# These objects are created and linked into the final library.  In
-# most cases these object files will correspond to the source files
-# above.
+# $(PKG_LIB_FILE) should be listed as part of the BINARIES variable
+# mentioned above.  That will ensure that this target is built when you
+# run "make binaries".
 #
-# $(exampleA_LIB_FILE) should be listed as part of the BINARIES variable
-# at the top of the Makefile.  That will ensure that this target is built
-# when you run "make binaries".
-#
-# You shouldn't need to modify this target, except to change the package
-# name from "exampleA" to your package's name.
+# The $(PKG_OBJECTS) objects are created and linked into the final
+# library.  In most cases these object files will correspond to the
+# source files above.
 #========================================================================
 
-$(itk_LIB_FILE): $(itk_OBJECTS)
-	-rm -f $(itk_LIB_FILE)
-	@MAKE_LIB@
-	$(RANLIB) $(itk_LIB_FILE)
+$(PKG_LIB_FILE): $(PKG_OBJECTS)
+	-rm -f $(PKG_LIB_FILE)
+	${MAKE_LIB}
+	$(RANLIB) $(PKG_LIB_FILE)
 
-$(itkstub_LIB_FILE): $(itkstub_OBJECTS)
-	-rm -f $(itkstub_LIB_FILE)
-	@MAKE_STATIC_LIB@
-	$(RANLIB) $(itkstub_LIB_FILE)
+$(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
+	-rm -f $(PKG_STUB_LIB_FILE)
+	${MAKE_STUB_LIB}
+	$(RANLIB_STUB) $(PKG_STUB_LIB_FILE)
 
 #========================================================================
 # We need to enumerate the list of .c to .o lines here.
-# Unfortunately, there does not seem to be any other way to do this
-# in a Makefile-independent way.  We can't use VPATH because it picks up
-# object files that may be located in the source directory.
 #
 # In the following lines, $(srcdir) refers to the toplevel directory
 # containing your extension.  If your sources are in a subdirectory,
 # you will have to modify the paths to reflect this:
 #
-# exampleA.$(OBJEXT): $(srcdir)/src/win/exampleA.c
-# 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/src/win/exampleA.c` -o $@
+# sample.$(OBJEXT): $(srcdir)/generic/sample.c
+#	$(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/sample.c` -o $@
+#
+# Setting the VPATH variable to a list of paths will cause the makefile
+# to look into these paths when resolving .c to .obj dependencies.
+# As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
-dllEntryPoint.$(OBJEXT): $(WIN_DIR)/dllEntryPoint.c
-	$(COMPILE) -c `@CYGPATH@ $(WIN_DIR)/dllEntryPoint.c` -o $@
+VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
 
-tclAppInit.$(OBJEXT): $(PLATFORM_DIR)/tclAppInit.c
-	$(COMPILE) -c `@CYGPATH@ $(PLATFORM_DIR)/tclAppInit.c` -o $@
+.c.@OBJEXT@:
+	$(COMPILE) -c `@CYGPATH@ $<` -I. -o $@
 
-itkStubInit.$(OBJEXT): $(GENERIC_DIR)/itkStubInit.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itkStubInit.c` -o $@
+itkBase.@OBJEXT@:	itkUuid.h
 
-itkStubLib.$(OBJEXT): $(GENERIC_DIR)/itkStubLib.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itkStubLib.c` -o $@
+$(srcdir)/manifest.uuid:
+	printf "git-" >$(srcdir)/manifest.uuid
+	(cd $(srcdir); git rev-parse HEAD >>$(srcdir)/manifest.uuid || \
+	    (printf "svn-r" >$(srcdir)/manifest.uuid ; \
+	    svn info --show-item last-changed-revision >>$(srcdir)/manifest.uuid) || \
+	    printf "unknown" >$(srcdir)/manifest.uuid)
 
-itk_cmds.$(OBJEXT): $(GENERIC_DIR)/itk_cmds.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_cmds.c` -o $@
+itkUuid.h:	$(srcdir)/manifest.uuid
+	echo "#define ITK_VERSION_UUID \\" >$@
+	cat $(srcdir)/manifest.uuid >>$@
+	echo "" >>$@
 
-itk_option.$(OBJEXT): $(GENERIC_DIR)/itk_option.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_option.c` -o $@
+#========================================================================
+# Distribution creation
+# You may need to tweak this target to make it work correctly.
+#========================================================================
 
-itk_archetype.$(OBJEXT): $(GENERIC_DIR)/itk_archetype.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_archetype.c` -o $@
+#COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
+COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
+DIST_ROOT	= /tmp/dist
+DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
 
-itk_util.$(OBJEXT): $(GENERIC_DIR)/itk_util.c
-	$(COMPILE) -c `@CYGPATH@ $(GENERIC_DIR)/itk_util.c` -o $@
+DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
+DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
 
+dist-clean:
+	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
+
+dist: dist-clean $(srcdir)/manifest.uuid
+	$(INSTALL_DATA_DIR) $(DIST_DIR)
+
+	# TEA files
+	$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
+	    $(srcdir)/manifest.uuid $(DISTDIR) \
+	    $(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
+	    $(DIST_DIR)/
+	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
+
+	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
+	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
+	    $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
+	    $(DIST_DIR)/tclconfig/
+
+	# Extension files
+	$(DIST_INSTALL_DATA) \
+	    $(srcdir)/ChangeLog \
+	    $(srcdir)/license.terms \
+	    $(srcdir)/pkgIndex.tcl.in \
+	    $(srcdir)/itkConfig.sh.in \
+	    $(DIST_DIR)/
+
+	list='demos doc examples generic library tests win win/rc'; \
+	for p in $$list; do \
+	    $(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \
+	    for f in $(srcdir)/$$p/*; do \
+		if ! test -f $$f; then continue; fi; \
+		$(DIST_INSTALL_DATA) $$f $(DIST_DIR)/$$p/; \
+	    done; \
+	done
+
+	(cd $(DIST_ROOT); $(COMPRESS);)
 
 #========================================================================
 # End of user-definable section
@@ -361,99 +386,96 @@ itk_util.$(OBJEXT): $(GENERIC_DIR)/itk_util.c
 
 #========================================================================
 # Don't modify the file to clean here.  Instead, set the "CLEANFILES"
-# variable in configure.in
+# variable in configure.ac
 #========================================================================
 
-clean:  
+clean:
 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
+	-rm -f *.$(OBJEXT) core *.core
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean: clean
 	-rm -f *.tab.c
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-rm -f config.status
+	-rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log config.status
 
 #========================================================================
 # Install binary object libraries.  On Windows this includes both .dll and
 # .lib files.  Because the .lib files are not explicitly listed anywhere,
 # we need to deduce their existence from the .dll file of the same name.
-# Additionally, the .dll files go into the bin directory, but the .lib
-# files go into the lib directory.  On Unix platforms, all library files
-# go into the lib directory.  In addition, this will generate the pkgIndex.tcl
-# file in the install location (assuming it can find a usable tclsh8.2 shell)
+# Library files go into the lib directory.
+# In addition, this will generate the pkgIndex.tcl
+# file in the install location (assuming it can find a usable tclsh shell)
 #
 # You should not have to modify this target.
 #========================================================================
 
-install-lib-binaries: installdirs
+install-lib-binaries: binaries
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)"
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
+	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+	    $(INSTALL_LIBRARY) $$p "$(DESTDIR)$(pkglibdir)/$$p"; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
-	        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
-	        $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
-		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
+		    $(INSTALL_DATA) $$lib "$(DESTDIR)$(pkglibdir)/$$lib"; \
 		fi; \
-	    else \
-		echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-	        $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
-	  else :; fi; \
+	  fi; \
 	done
-	@list='$(lib_BINARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(bindir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(bindir)/$$p; \
-	  else :; fi; \
+	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    destp=`basename $$p`; \
+	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(pkglibdir)/$$destp"; \
+	  fi; \
 	done
-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+	@if test "x$(SHARED_BUILD)" = "x1"; then \
+	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
+	    $(INSTALL_DATA) pkgIndex.tcl "$(DESTDIR)$(pkglibdir)"; \
+	fi
+	$(INSTALL_DATA) itkConfig.sh "$(DESTDIR)$(pkglibdir)"
 
 #========================================================================
-# Install binary executables (e.g. .exe files)
+# Install binary executables (e.g. .exe files and dependent .dll files)
+# This is for files that must go in the bin directory (located next to
+# wish and tclsh), like dependent .dll files on Windows.
 #
-# You should not have to modify this target.
+# You should not have to modify this target, except to define bin_BINARIES
+# above if necessary.
 #========================================================================
 
-install-bin-binaries: installdirs
+install-bin-binaries: binaries
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(bindir)"
 	@list='$(bin_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(bindir)/$$p; \
-	  else :; fi; \
+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
+	    $(INSTALL_PROGRAM) $$p "$(DESTDIR)$(bindir)/$$p"; \
+	  fi; \
 	done
 
-.SUFFIXES: .c .o .obj
-
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-#	$(SHELL) ./config.status --recheck
-#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-#	cd $(srcdir) && $(AUTOCONF)
-
-
 uninstall-binaries:
-	@$(NORMAL_UNINSTALL)
-	list='$(BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	list='$(lib_BINARIES)'; for p in $$list; do \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+	done
+	list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+	  p=`basename $$p`; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+	done
+	list='$(bin_BINARIES)'; for p in $$list; do \
+	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
 	done
 
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir)
-	$(mkinstalldirs)  $(DESTDIR)$(bindir)
-	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs)  $(ITK_LIBRARY)
-
-.PHONY: all binaries clean depend distclean doc install installdirs \
-libraries test
+.PHONY: all binaries clean depend distclean doc install libraries test
+.PHONY: gdb gdb-test valgrind valgrindshell
+.PHONY: genstubs
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aclocal.m4

@@ -1 +1,9 @@
-builtin(include,../tcl.m4)
+#
+# Include the TEA standard macro set
+#
+
+builtin(include,tclconfig/tcl.m4)
+
+#
+# Add here whatever m4 macros you want to define for your package
+#

configure.ac

@@ -0,0 +1,262 @@
+#!/bin/bash -norc
+dnl	This file is an input file used by the GNU "autoconf" program to
+dnl	generate the file "configure", which is run during Tcl installation
+dnl	to configure the system for the local environment.
+
+#-----------------------------------------------------------------------
+# Sample configure.ac for Tcl Extensions.  The only places you should
+# need to modify this file are marked by the string __CHANGE__
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# __CHANGE__
+# Set your package name and version numbers here.
+#
+# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION
+# set as provided.  These will also be added as -D defs in your Makefile
+# so you can encode the package version directly into the source files.
+# This will also define a special symbol for Windows (BUILD_<PACKAGE_NAME>
+# so that we create the export library with the dll.
+#-----------------------------------------------------------------------
+
+AC_INIT([itk],[4.2.7])
+
+#--------------------------------------------------------------------
+# Call TEA_INIT as the first TEA_ macro to set up initial vars.
+# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
+# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
+#--------------------------------------------------------------------
+
+TEA_INIT()
+
+#--------------------------------------------------------------------
+# Try to ensure the existence of a tclconfig directory in either
+# $srcdir or the current dir, if one can't be found in $srcdir.
+# If this package is being built as part of a bundle then a tclconfig
+# directory might exist in $srcdir's parent directory.
+#--------------------------------------------------------------------
+
+AC_PROG_LN_S
+CONFIG_CLEAN_FILES=
+if test ! -d $srcdir/tclconfig ; then
+    if test -d $srcdir/../tclconfig ; then
+	$LN_S $srcdir/../tclconfig tclconfig
+	CONFIG_CLEAN_FILES=tclconfig
+    fi
+fi
+AC_SUBST(CONFIG_CLEAN_FILES)
+
+#--------------------------------------------------------------------
+# Tell autoconf where to find tcl.m4 and install.sh.
+#--------------------------------------------------------------------
+
+AC_CONFIG_AUX_DIR(tclconfig)
+
+#--------------------------------------------------------------------
+# Load the tclConfig.sh file
+#--------------------------------------------------------------------
+
+TEA_PATH_TCLCONFIG
+TEA_LOAD_TCLCONFIG
+
+#--------------------------------------------------------------------
+# Load the tkConfig.sh file if necessary (Tk extension)
+#--------------------------------------------------------------------
+
+TEA_PATH_TKCONFIG
+TEA_LOAD_TKCONFIG
+
+#--------------------------------------------------------------------
+# Load the itclConfig.sh file
+#--------------------------------------------------------------------
+
+TEA_PATH_CONFIG(itcl)
+TEA_LOAD_CONFIG(itcl)
+
+ITCL_INCLUDES="-I\"`${CYGPATH} ${itcl_SRC_DIR}/generic`\""
+
+#-----------------------------------------------------------------------
+# Handle the --prefix=... option by defaulting to what Tcl gave.
+# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
+#-----------------------------------------------------------------------
+
+TEA_PREFIX
+
+#-----------------------------------------------------------------------
+# Standard compiler checks.
+# This sets up CC by using the CC env var, or looks for gcc otherwise.
+# This also calls AC_PROG_CC and a few others to create the basic setup
+# necessary to compile executables.
+#-----------------------------------------------------------------------
+
+TEA_SETUP_COMPILER
+
+#-----------------------------------------------------------------------
+# __CHANGE__
+# Specify the C source files to compile in TEA_ADD_SOURCES,
+# public headers that need to be installed in TEA_ADD_HEADERS,
+# stub library C source files to compile in TEA_ADD_STUB_SOURCES,
+# and runtime Tcl library files in TEA_ADD_TCL_SOURCES.
+# This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS
+# and PKG_TCL_SOURCES.
+#-----------------------------------------------------------------------
+
+TEA_ADD_SOURCES([
+		itkArchBase.c
+		itkArchetype.c
+		itkBase.c
+		itkCmd.c
+		itkHelpers.c
+		itkOption.c
+		itkUtil.c
+		itkStubInit.c
+		])
+TEA_ADD_HEADERS([generic/itk.h generic/itkInt.h])
+TEA_ADD_INCLUDES([${ITCL_INCLUDES} -I\"`${CYGPATH} ${srcdir}/generic`\"])
+TEA_ADD_LIBS([])
+TEA_ADD_CFLAGS([])
+TEA_ADD_STUB_SOURCES([itkStubLib.c])
+TEA_ADD_TCL_SOURCES([library/Archetype.itk
+		library/Toplevel.itk
+		library/Widget.itk
+		library/itk.tcl
+		library/tclIndex])
+
+#--------------------------------------------------------------------
+# __CHANGE__
+#
+# You can add more files to clean if your extension creates any extra
+# files by extending CLEANFILES.
+# Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure
+# and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var.
+#
+# A few miscellaneous platform-specific items:
+# TEA_ADD_* any platform specific compiler/build info here.
+#--------------------------------------------------------------------
+
+#CLEANFILES="$CLEANFILES pkgIndex.tcl"
+if test "${TEA_PLATFORM}" = "windows" ; then
+    # Ensure no empty if clauses
+    :
+    #TEA_ADD_SOURCES([win/winFile.c])
+    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
+    TEA_ADD_SOURCES([dllEntryPoint.c])
+else
+    # Ensure no empty else clauses
+    :
+    #TEA_ADD_SOURCES([unix/unixFile.c])
+    #TEA_ADD_LIBS([-lsuperfly])
+fi
+
+#--------------------------------------------------------------------
+# __CHANGE__
+# Choose which headers you need.  Extension authors should try very
+# hard to only rely on the Tcl public header files.  Internal headers
+# contain private data structures and are subject to change without
+# notice.
+# This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG
+#--------------------------------------------------------------------
+
+#TEA_PUBLIC_TCL_HEADERS
+TEA_PRIVATE_TCL_HEADERS
+
+TEA_PUBLIC_TK_HEADERS
+#TEA_PRIVATE_TK_HEADERS
+TEA_PATH_X
+
+#--------------------------------------------------------------------
+# We need to enable the threading macros found in tcl.h and tclInt.h.
+# The use of the threading features is determined by the core the
+# extension is loaded into, but we need to compile with these macros
+# turned on.
+#--------------------------------------------------------------------
+
+AC_DEFINE(TCL_THREADS)
+
+#--------------------------------------------------------------------
+# Check whether --enable-threads or --disable-threads was given.
+# This auto-enables if Tcl was compiled threaded.
+#--------------------------------------------------------------------
+
+#TEA_ENABLE_THREADS
+
+#--------------------------------------------------------------------
+# The statement below defines a collection of symbols related to
+# building as a shared library instead of a static library.
+#--------------------------------------------------------------------
+
+TEA_ENABLE_SHARED
+
+#--------------------------------------------------------------------
+# This macro figures out what flags to use with the compiler/linker
+# when building shared/static debug/optimized objects.  This information
+# can be taken from the tclConfig.sh file, but this figures it all out.
+#--------------------------------------------------------------------
+
+TEA_CONFIG_CFLAGS
+
+#--------------------------------------------------------------------
+# Set the default compiler switches based on the --enable-symbols option.
+#--------------------------------------------------------------------
+
+TEA_ENABLE_SYMBOLS
+
+#--------------------------------------------------------------------
+# Itcl stubs
+#--------------------------------------------------------------------
+
+if test "${SHARED_BUILD}" = "1" ; then
+    AC_DEFINE(USE_ITCL_STUBS)
+fi
+
+#--------------------------------------------------------------------
+# This macro generates a line to use when building a library.  It
+# depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS,
+# and TEA_LOAD_TCLCONFIG macros above.
+#--------------------------------------------------------------------
+
+TEA_MAKE_LIB
+
+#--------------------------------------------------------------------
+# Determine the name of the tclsh and/or wish executables in the
+# Tcl and Tk build directories or the location they were installed
+# into. These paths are used to support running test cases only,
+# the Makefile should not be making use of these paths to generate
+# a pkgIndex.tcl file or anything else at extension build time.
+#--------------------------------------------------------------------
+
+TEA_PROG_TCLSH
+TEA_PROG_WISH
+
+#--------------------------------------------------------------------
+# Setup a *Config.sh.in configuration file.
+#--------------------------------------------------------------------
+
+# itk_SRC_DIR must be a fully qualified path
+eval itk_SRC_DIR="$srcdir"
+itk_SRC_DIR="`(cd "${itk_SRC_DIR}"; pwd)`"
+
+itk_LIB_FILE="${PKG_LIB_FILE}"
+itk_STUB_LIB_FILE="${PKG_STUB_LIB_FILE}"
+
+TEA_EXPORT_CONFIG([itk])
+AC_SUBST(ITCL_VERSION)
+AC_SUBST(itk_SRC_DIR)
+AC_SUBST(itk_LIB_FILE)
+AC_SUBST(itk_STUB_LIB_FILE)
+
+#--------------------------------------------------------------------
+# Specify files to substitute AC variables in. You may alternatively
+# have a special pkgIndex.tcl.in or other files which require
+# substituting the AC variables in. Include these here.
+#--------------------------------------------------------------------
+
+AC_CONFIG_FILES([Makefile pkgIndex.tcl])
+AC_CONFIG_FILES([itkConfig.sh])
+
+#--------------------------------------------------------------------
+# Finally, substitute all of the various values into the files
+# specified with AC_CONFIG_FILES.
+#--------------------------------------------------------------------
+
+AC_OUTPUT

configure.in

@@ -1,360 +0,0 @@
-#--------------------------------------------------------------------
-# Sample configure.in for Tcl Extensions.  The only places you should
-# need to modify this file are marked by the string __CHANGE__
-#--------------------------------------------------------------------
-
-#--------------------------------------------------------------------
-# __CHANGE__
-# This very first macro is used to verify that the configure script can 
-# find the sources.  The argument to AC_INIT should be a unique filename
-# for this package, and can be a relative path, such as:
-#
-# AC_INIT(../generic/tcl.h)
-#--------------------------------------------------------------------
-
-AC_INIT(generic/itk.h)
-AC_CONFIG_AUX_DIR(../config)
-
-#--------------------------------------------------------------------
-# __CHANGE__
-# Set your package name and version numbers here.  The NODOT_VERSION is
-# required for constructing the library name on systems that don't like
-# dots in library names (Windows).  The VERSION variable is used on the
-# other systems.
-#--------------------------------------------------------------------
-
-PACKAGE=itk
-
-MAJOR_VERSION=3
-MINOR_VERSION=1
-PATCHLEVEL=.0
-
-VERSION=${MAJOR_VERSION}.${MINOR_VERSION}
-NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION}
-
-
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
-#--------------------------------------------------------------------
-# We put this here so that you can compile with -DVERSION="1.2" to
-# encode the package version directly into the source files.
-#--------------------------------------------------------------------
-
-eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
-
-#--------------------------------------------------------------------
-# Check whether --enable-gcc or --disable-gcc was given.  Do this 
-# before AC_CYGWIN is called so the compiler can 
-# be fully tested by built-in autoconf tools.
-# This macro also calls AC_PROG_CC to set the compiler if --enable-gcc
-# was not used.
-#--------------------------------------------------------------------
-
-SC_ENABLE_GCC
-AC_PROG_INSTALL
-
-#--------------------------------------------------------------------
-# Checks to see if the make program sets the $MAKE variable.
-#--------------------------------------------------------------------
-
-AC_PROG_MAKE_SET
-
-#--------------------------------------------------------------------
-# Find ranlib
-#--------------------------------------------------------------------
-
-AC_PROG_RANLIB
-
-#--------------------------------------------------------------------
-# This macro performs additional compiler tests.
-#--------------------------------------------------------------------
-
-AC_CYGWIN
-
-#--------------------------------------------------------------------
-# Determines the correct binary file extension (.o, .obj, .exe etc.)
-#--------------------------------------------------------------------
-
-AC_OBJEXT
-AC_EXEEXT
-
-#--------------------------------------------------------------------
-# "cygpath" is used on windows to generate native path names for include
-# files.
-# These variables should only be used with the compiler and linker since
-# they generate native path names.
-#
-# Unix tclConfig.sh points SRC_DIR at the top-level directory of
-# the Tcl sources, while the Windows tclConfig.sh points SRC_DIR at
-# the win subdirectory.  Hence the different usages of SRC_DIR below.
-#
-# This must be done before calling SC_PUBLIC_TCL_HEADERS
-#--------------------------------------------------------------------
-
-case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
-	CYGPATH="cygpath -w"
-	RELPATH=".. .. bin"
-    ;;
-    *)
-	CYGPATH=echo
-	RELPATH=..
-    ;;
-esac
-
-AC_SUBST(CYGPATH)
-AC_SUBST(RELPATH)
-
-#--------------------------------------------------------------------
-# Includes for this package
-#--------------------------------------------------------------------
-
-ITK_GENERIC_DIR_NATIVE=`${CYGPATH} ${srcdir}/generic`
-ITK_WIN_DIR_NATIVE=`${CYGPATH} ${srcdir}/win`
-ITK_UNIX_DIR_NATIVE=`${CYGPATH} ${srcdir}/unix`
-
-case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
-	ITK_PLATFORM_DIR_NATIVE=${ITK_WIN_DIR_NATIVE}
-    ;;
-    *)
-	ITK_PLATFORM_DIR_NATIVE=${ITK_UNIX_DIR_NATIVE}
-    ;;
-esac
-
-ITK_INCLUDES="-I\"${ITK_GENERIC_DIR_NATIVE}\" -I\"${ITK_PLATFORM_DIR_NATIVE}\""
-
-AC_SUBST(ITK_GENERIC_DIR_NATIVE)
-AC_SUBST(ITK_WIN_DIR_NATIVE)
-AC_SUBST(ITK_UNIX_DIR_NATIVE)
-AC_SUBST(ITK_INCLUDES)
-
-#--------------------------------------------------------------------
-# Load the tclConfig.sh file
-#--------------------------------------------------------------------
-
-SC_PATH_TCLCONFIG
-SC_LOAD_TCLCONFIG
-
-#--------------------------------------------------------------------
-# Load the tkConfig.sh file
-#--------------------------------------------------------------------
-
-SC_PATH_TKCONFIG
-SC_LOAD_TKCONFIG
-
-AC_ARG_WITH(itcl, [  --with-itclinclude=DIR          use Itcl headers from DIR],
-        ITCL_LIB_DIR=$withval, ITCL_LIB_DIR=`cd ${srcdir}/../itcl; pwd`)
-
-if test ! -r "${ITCL_LIB_DIR}/generic/itclInt.h" ; then
-    AC_MSG_ERROR(Can't find Itcl private header files.  Use --with-itclinclude to specify the directory containing the Itcl private headers on your system.)
-fi
-
-ITCL_INCLUDES=-I\"`${CYGPATH} ${ITCL_LIB_DIR}/generic`\"
-AC_SUBST(ITCL_INCLUDES)
-
-#--------------------------------------------------------------------
-# The value for this should have been cached during the Itcl configuration.
-# Make sure the cache-ID that appears here is the same as the one that
-# appears in the Itcl configure script.
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING(for name if Itcl stub library)
-AC_CACHE_VAL(ac_cv_itclstub_LIB_FILE, ac_cv_itclstub_LIB_FILE="NONE")
-if test x"${ac_cv_itclstub_LIB_FILE}" = x"NONE" ; then
-    AC_MSG_ERROR(Can't find name of Itcl stub library.  How did this happen?)
-else
-    AC_MSG_RESULT(${ac_cv_itclstub_LIB_FILE})
-fi
-itclstub_LIB_FILE=${ac_cv_itclstub_LIB_FILE}
-AC_SUBST(itclstub_LIB_FILE)
-
-SC_LIB_SPEC(tkstub, ${TK_BIN_DIR})
-AC_SUBST(tkstub_LIB_SPEC)
-
-SC_LIB_SPEC(itclstub, ../itcl)
-
-#--------------------------------------------------------------------
-# __CHANGE__
-# Choose which headers you need.  Extension authors should try very
-# hard to only rely on the Tcl public header files.  Internal headers
-# contain private data structures and are subject to change without
-# notice.
-# This must be done AFTER calling SC_PATH_TCLCONFIG/SC_LOAD_TCLCONFIG
-# so that we can extract TCL_SRC_DIR from the config file (in the case
-# of private headers
-#--------------------------------------------------------------------
-
-#SC_PUBLIC_TCL_HEADERS
-SC_PRIVATE_TCL_HEADERS
-
-#SC_PUBLIC_TK_HEADERS
-SC_PRIVATE_TK_HEADERS
-
-#--------------------------------------------------------------------
-# __CHANGE__
-# A few miscellaneous platform-specific items:
-#
-# Define a special symbol for Windows (BUILD_itk in this case) so
-# that we create the export library with the dll.  See sha1.h on how
-# to use this.
-#
-# Windows creates a few extra files that need to be cleaned up.
-# You can add more files to clean if your extension creates any extra
-# files.
-#
-# Define any extra compiler flags in the PACKAGE_CFLAGS variable.
-# These will be appended to the current set of compiler flags for
-# your system.
-#--------------------------------------------------------------------
-
-case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
-	AC_DEFINE_UNQUOTED(BUILD_${PACKAGE})
-	CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch"
-	PLATFORM_SOURCES='$(WIN_SOURCES)'
-	PLATFORM_OBJECTS='$(WIN_OBJECTS)'
-	PLATFORM_DIR='$(WIN_DIR)'
-    ;;
-    *)
-	CLEANFILES=
-	PLATFORM_SOURCES='$(UNIX_SOURCES)'
-	PLATFORM_OBJECTS='$(UNIX_OBJECTS)'
-	PLATFORM_DIR='$(UNIX_DIR)'
-    ;;
-esac
-
-AC_SUBST(CLEANFILES)
-AC_SUBST(PLATFORM_SOURCES)
-AC_SUBST(PLATFORM_OBJECTS)
-AC_SUBST(PLATFORM_DIR)
-
-#--------------------------------------------------------------------
-# Check whether --enable-threads or --disable-threads was given.
-# So far only Tcl responds to this one.
-#--------------------------------------------------------------------
-
-SC_ENABLE_THREADS
-
-#--------------------------------------------------------------------
-# The statement below defines a collection of symbols related to
-# building as a shared library instead of a static library.
-#--------------------------------------------------------------------
-
-SC_ENABLE_SHARED
-
-#--------------------------------------------------------------------
-# This macro figures out what flags to use with the compiler/linker
-# when building shared/static debug/optimized objects.  This information
-# is all taken from the tclConfig.sh file.
-#--------------------------------------------------------------------
-
-CFLAGS_DEBUG=${TCL_CFLAGS_DEBUG}
-CFLAGS_OPTIMIZE=${TCL_CFLAGS_OPTIMIZE}
-LDFLAGS_DEBUG=${TCL_LDFLAGS_DEBUG}
-LDFLAGS_OPTIMIZE=${TCL_LDFLAGS_OPTIMIZE}
-SHLIB_LD=${TCL_SHLIB_LD}
-STLIB_LD=${TCL_STLIB_LD}
-SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
-
-AC_SUBST(CFLAGS_DEBUG)
-AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(STLIB_LD)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_LDFLAGS)
-
-#--------------------------------------------------------------------
-# Set the default compiler switches based on the --enable-symbols 
-# option.
-#--------------------------------------------------------------------
-
-SC_ENABLE_SYMBOLS
-
-if test "${SHARED_BUILD}" = "1" ; then
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}'
-else
-    CFLAGS='${CFLAGS_DEFAULT} ${CFLAGS_WARNING}'
-fi
-
-#--------------------------------------------------------------------
-# Everyone should be linking against the Tcl stub library.  If you
-# can't for some reason, remove this definition.  If you aren't using
-# stubs, you also need to modify the SHLIB_LD_LIBS setting below to
-# link against the non-stubbed Tcl library.
-#--------------------------------------------------------------------
-
-AC_DEFINE(USE_TCL_STUBS)
-AC_DEFINE(USE_TK_STUBS)
-AC_DEFINE(USE_ITCL_STUBS)
-
-#--------------------------------------------------------------------
-# This macro generates a line to use when building a library.  It
-# depends on values set by the SC_ENABLE_SHARED, SC_ENABLE_SYMBOLS,
-# and SC_LOAD_TCLCONFIG macros above.
-#--------------------------------------------------------------------
-
-SC_MAKE_LIB
-
-#--------------------------------------------------------------------
-# eval these two values to dereference the ${DBGX} variable.
-#--------------------------------------------------------------------
-
-eval "SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-eval "UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
-
-#--------------------------------------------------------------------
-# Shared libraries and static libraries have different names.
-#--------------------------------------------------------------------
-
-case "`uname -s`" in
-    *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
-	if test "${SHARED_BUILD}" = "1" ; then
-	    SHLIB_LD_LIBS="\"`cygpath -w ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}`\" ${TCL_SHLIB_LD_LIBS} \"`${CYGPATH} ../itcl/${itclstub_LIB_FILE}`\" ${tkstub_LIB_SPEC} "
-	    eval "${PACKAGE}_LIB_FILE=${PACKAGE}${SHARED_LIB_SUFFIX}"
-	    RANLIB=:
-	else
-	    eval "${PACKAGE}_LIB_FILE=${PACKAGE}${UNSHARED_LIB_SUFFIX}"
-	fi
-	eval "${PACKAGE}stub_LIB_FILE=${PACKAGE}stub${UNSHARED_LIB_SUFFIX}"
-	;;
-    *)
-	if test "${SHARED_BUILD}" = "1" ; then
-	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
-	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
-	    RANLIB=:
-	else
-	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${UNSHARED_LIB_SUFFIX}"
-	fi
-	eval "${PACKAGE}stub_LIB_FILE=lib${PACKAGE}stub${UNSHARED_LIB_SUFFIX}"
-	;;
-esac
-
-#--------------------------------------------------------------------
-# __CHANGE__
-# Change the name from exampeA_LIB_FILE to match your package name.
-# Use the stub_LIB_FILE substitution if your package creates a stub
-# library.
-#--------------------------------------------------------------------
-
-AC_SUBST(itkstub_LIB_FILE)
-AC_SUBST(itk_LIB_FILE)
-AC_SUBST(SHLIB_LD_LIBS)
-
-#--------------------------------------------------------------------
-# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
-# file during the install process.  Don't run the TCLSH_PROG through
-# ${CYGPATH} because it's being used directly by make.
-# Require that we use a tclsh shell version 8.2 or later since earlier
-# versions have bugs in the pkg_mkIndex routine.
-#--------------------------------------------------------------------
-
-SC_PROG_TCLSH
-
-#--------------------------------------------------------------------
-# Finally, substitute all of the various values into the Makefile.
-#--------------------------------------------------------------------
-
-AC_OUTPUT([Makefile \
-	pkgIndex.tcl])

demos/itkedit

@@ -1,13 +1,13 @@
 #!/bin/sh
 #\
-exec itkwish $0
+exec wish8.4 "$0"
 # ======================================================================
 # Simple text editor built with [incr Widgets]
 # ----------------------------------------------------------------------
 #   AUTHOR:  Michael J. McLennan
 #    CLASS:  Object-Oriented Programming with [incr Tcl]
 # ======================================================================
-package require Iwidgets 2.1
+package require Iwidgets 4.0
 
 option add *edit.width 5i startupFile
 option add *edit.height 4i startupFile
@@ -20,24 +20,24 @@ set FileWindows 0
 # ----------------------------------------------------------------------
 #  Dialog boxes
 # ----------------------------------------------------------------------
-messagedialog .notice -title "itkedit: Notice" \
+iwidgets::messagedialog .notice -title "itkedit: Notice" \
     -bitmap info -buttonboxpos e -modality application
 .notice hide OK
 .notice hide Help
 .notice buttonconfigure Cancel -text "Dismiss"
 
-messagedialog .confirm -title "itkedit: Confirm" \
+iwidgets::messagedialog .confirm -title "itkedit: Confirm" \
     -bitmap questhead -modality application
 .confirm hide Help
 .confirm buttonconfigure OK -text "Yes"
 .confirm buttonconfigure Cancel -text "No"
 
-fileselectiondialog .files -title "itkedit: Files" \
+iwidgets::fileselectiondialog .files -title "itkedit: Files" \
     -childsitepos s -modality application
 .files hide Help
 
 set PaneMenu "[.files childsite].panes"
-optionmenu $PaneMenu -labeltext "Edit Window:"
+iwidgets::optionmenu $PaneMenu -labeltext "Edit Window:"
 pack $PaneMenu -pady 6
 
 # ----------------------------------------------------------------------
@@ -53,26 +53,26 @@ proc file_load {} {
 
     .files buttonconfigure OK -text "Load"
     if {[.files activate]} {
-        set fname [.files get]
-        set cmd {
-            set fid [open $fname r]
-            set text [read $fid]
-            close $fid
-        }
-        if {[catch $cmd err] != 0} {
-            .notice configure -bitmap error \
-                -text "Cannot load file \"$fname\":\n$err"
-            .notice activate
-            return
-        }
+	set fname [.files get]
+	set cmd {
+	    set fid [open $fname r]
+	    set text [read $fid]
+	    close $fid
+	}
+	if {[catch $cmd err] != 0} {
+	    .notice configure -bitmap error \
+		-text "Cannot load file \"$fname\":\n$err"
+	    .notice activate
+	    return
+	}
 
-        set pane [$PaneMenu get]
-        set win [.edit childsite $pane]
-        clear_text $win
-        $win.text insert end $text
-        $win.text configure -labeltext "file: $fname"
+	set pane [$PaneMenu get]
+	set win [.edit childsite $pane]
+	clear_text $win
+	$win.text insert end $text
+	$win.text configure -labeltext "file: $fname"
 
-        set FileName($win) $fname
+	set FileName($win) $fname
     }
 }
 
@@ -89,12 +89,12 @@ proc file_save_as {} {
 
     .files buttonconfigure OK -text "Save"
     if {[.files activate]} {
-        set pane [$PaneMenu get]
-        set win [.edit childsite $pane]
+	set pane [$PaneMenu get]
+	set win [.edit childsite $pane]
 
-        set FileName($win) [.files get]
+	set FileName($win) [.files get]
 
-        file_save $win
+	file_save $win
     }
 }
 
@@ -108,16 +108,16 @@ proc file_save {win} {
     global FileName FileChanged
 
     set cmd {
-        set fid [open $FileName($win) w]
-        puts $fid [$win.text get 1.0 end]
-        close $fid
-        set FileChanged($win) 0
-        $win.text configure -labeltext "file: $FileName($win)"
+	set fid [open $FileName($win) w]
+	puts $fid [$win.text get 1.0 end]
+	close $fid
+	set FileChanged($win) 0
+	$win.text configure -labeltext "file: $FileName($win)"
     }
     if {[catch $cmd err] != 0} {
-        .notice configure -bitmap error \
-            -text "Cannot save file \"$FileName($win)\":\n$err"
-        .notice activate
+	.notice configure -bitmap error \
+	    -text "Cannot save file \"$FileName($win)\":\n$err"
+	.notice activate
     }
 }
 
@@ -132,22 +132,22 @@ proc clear_text {{areas ""}} {
     global FileName FileChanged FileWindows
 
     if {$areas == ""} {
-        for {set i 0} {$i < $FileWindows} {incr i} {
-            set pane "area #[expr $i+1]"
-            lappend areas [.edit childsite $pane]
-        }
+	for {set i 0} {$i < $FileWindows} {incr i} {
+	    set pane "area #[expr $i+1]"
+	    lappend areas [.edit childsite $pane]
+	}
     }
 
     foreach win $areas {
-        if {$FileChanged($win)} {
-            set fname [file tail $FileName($win)]
-            .confirm configure -text "File \"$fname\" has changed.\nSave changes?"
-            if {[.confirm activate]} {
-                file_save $win
-            }
-        }
-        $win.text delete 1.0 end
-        set FileChanged($win) 0
+	if {$FileChanged($win)} {
+	    set fname [file tail $FileName($win)]
+	    .confirm configure -text "File \"$fname\" has changed.\nSave changes?"
+	    if {[.confirm activate]} {
+		file_save $win
+	    }
+	}
+	$win.text delete 1.0 end
+	set FileChanged($win) 0
     }
 }
 
@@ -168,12 +168,12 @@ proc split_view {} {
     set FileName($win) untitled.txt
     set FileChanged($win) 0
 
-    scrolledtext $win.text -wrap none -labeltext "file: $FileName($win)" \
-        -hscrollmode none -vscrollmode dynamic -visibleitems 1x1
+    iwidgets::scrolledtext $win.text -wrap none -labeltext "file: $FileName($win)" \
+	-hscrollmode none -vscrollmode dynamic -visibleitems 1x1
     pack $win.text -expand yes -fill both
 
     bind [$win.text component text] <KeyPress> "
-        set FileChanged($win) 1
+	set FileChanged($win) 1
     "
 }
 
@@ -213,7 +213,7 @@ menu .mbar.view.menu
 # ----------------------------------------------------------------------
 #  Editor
 # ----------------------------------------------------------------------
-panedwindow .edit -orient horizontal
+iwidgets::panedwindow .edit -orient horizontal
 pack .edit -expand yes -fill both
 
 split_view
@@ -225,3 +225,5 @@ after idle {
     update idletasks
     wm minsize . [winfo reqwidth .] [winfo reqheight .]
 }
+
+

doc/Archetype.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: Archetype.n,v 1.1 1998/07/27 18:45:35 stanton Exp $
-'\"
 .so man.macros
 .TH Archetype n 3.0 itk "[incr\ Tk]"
 .BS
@@ -50,7 +48,7 @@ inherits from \fBArchetype\fR, but adds a Tk toplevel which acts
 as the "hull".
 .PP
 \fIEach derived class must invoke the \fBitk_initialize\fP method
-within its constructor\fR, so that all options are properly
+within its constructor, so that all options are properly
 integrated and initialized in the composite list.
 
 
@@ -192,7 +190,7 @@ override settings determined from the X11 resource database.
 The arguments to the constructor are usually passed along
 to this method as follows:
 .CS
-class MyWidget {
+itcl::class MyWidget {
     inherit Widget
 
     constructor {args} {
@@ -230,7 +228,7 @@ for their "hull" component:  -background and -cursor.  A derived
 class can override this decision, and add options that control
 the border of the "hull" component as well:
 .CS
-class MyWidget {
+itcl::class MyWidget {
     inherit Widget
 
     constructor {args} {
@@ -267,7 +265,7 @@ new value is reported to standard output.  Note that this synthetic
 option is integrated with the rest of the "-background" options
 that have been kept from component widgets:
 .CS
-class MyWidget {
+itcl::class MyWidget {
     inherit Widget
     constructor {args} {
         itk_component add label {
@@ -295,8 +293,8 @@ used to remove options at a later time.  For example, a derived
 class can override an option defined in a base class by removing
 and redefining the option:
 .CS
-class Base {
-    inherit Widget
+itcl::class Base {
+    inherit itk::Widget
     constructor {args} {
         eval itk_initialize $args
     }
@@ -306,7 +304,7 @@ class Base {
     }
 }
 
-class Derived {
+itcl::class Derived {
     inherit Base
 
     constructor {args} {

doc/Toplevel.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: Toplevel.n,v 1.3 1998/08/11 14:40:53 welch Exp $
-'\"
 .so man.macros
 .TH Toplevel n 3.0 itk "[incr\ Tk]"
 .BS
@@ -68,7 +66,7 @@ user can dismiss by pushing the "Dismiss" button.
 .CS
 option add *MessageInfo.title "Notice" widgetDefault
 
-class MessageInfo {
+itcl::class MessageInfo {
     inherit itk::Toplevel
 
     constructor {args} {
@@ -117,7 +115,7 @@ class MessageInfo {
     }
 }
 
-usual MessageInfo {
+itk::usual MessageInfo {
     keep -background -cursor -foreground -font
     keep -activebackground -activeforeground -disabledforeground
     keep -highlightcolor -highlightthickness

doc/Widget.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: Widget.n,v 1.1 1998/07/27 18:45:36 stanton Exp $
-'\"
 .so man.macros
 .TH Widget n 3.0 itk "[incr\ Tk]"
 .BS
@@ -60,7 +58,7 @@ option add *TextDisplay.textBackground ivory widgetDefault
 option add *TextDisplay.width 40 widgetDefault
 option add *TextDisplay.height 10 widgetDefault
 
-class TextDisplay {
+itcl::class TextDisplay {
     inherit itk::Widget
 
     constructor {args} {
@@ -87,20 +85,20 @@ class TextDisplay {
     public method append {info}
 }
 
-body TextDisplay::display {info} {
+itcl::body TextDisplay::display {info} {
     $itk_component(text) configure -state normal
     $itk_component(text) delete 1.0 end
     $itk_component(text) insert 1.0 $info
     $itk_component(text) configure -state disabled
 }
 
-body TextDisplay::append {info} {
+itcl::body TextDisplay::append {info} {
     $itk_component(text) configure -state normal
     $itk_component(text) insert end $info
     $itk_component(text) configure -state disabled
 }
 
-usual TextDisplay {
+itk::usual TextDisplay {
     keep -background -cursor -foreground -font
     keep -activebackground -activerelief
     keep -highlightcolor -highlightthickness

doc/itk.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: itk.n,v 1.1 1998/07/27 18:45:36 stanton Exp $
-'\"
 .so man.macros
 .TH itk n 3.0 itk "[incr\ Tk]"
 .BS

doc/itkvars.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: itkvars.n,v 1.1 1998/07/27 18:45:37 stanton Exp $
-'\"
 .so man.macros
 .TH itkvars n 3.0 itk "[incr\ Tk]"
 .BS
@@ -30,9 +28,9 @@ or from a compiled-in value otherwise.
 .sp
 When \fB[incr\ Tk]\fR is added to an interpreter, it executes
 the script "\fCinit.itk\fR" in this directory.  This script,
-in turn, looks for other script files with the name "\fCinit.\fIxxx\fR".
+in turn, looks for other script files with the name "\fCinit.\fR\fIxxx\fR".
 Mega-widget libraries will be automatically initialized if they
-install a script named "\fCinit.\fIxxx\fR" in this directory,
+install a script named "\fCinit.\fR\fIxxx\fR" in this directory,
 where "\fIxxx\fR" is the name of the mega-widget library.
 For example, the \fB[incr\ Widgets]\fR library installs
 the script "\fCinit.iwidgets\fR" in this directory.

doc/itkwish.1

@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1998  Lucent Technologies, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: $Id: itkwish.1,v 1.1 1998/07/27 18:45:37 stanton Exp $
-'\"
-.so man.macros
-.TH itkwish 1 3.0 itk "[incr\ Tk]"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-itkwish \- Simple windowing shell for [incr\ Tcl] / [incr\ Tk]
-.SH SYNOPSIS
-\fBitkwish\fR ?\fIfileName arg arg ...\fR?
-.SH OPTIONS
-.IP "\fB\-display \fIdisplay\fR" 20
-Display (and screen) on which to display window.
-.IP "\fB\-geometry \fIgeometry\fR" 20
-Initial geometry to use for window.  If this option is specified, its
-value is stored in the \fBgeometry\fR global variable of the application's
-Tcl interpreter.
-.IP "\fB\-name \fIname\fR" 20
-Use \fIname\fR as the title to be displayed in the window, and
-as the name of the interpreter for \fBsend\fR commands.
-.IP "\fB\-sync\fR" 20
-Execute all X server commands synchronously, so that errors
-are reported immediately.  This will result in much slower
-execution, but it is useful for debugging.
-.IP "\fB\-\|\-\fR" 20
-Pass all remaining arguments through to the script's \fBargv\fR
-variable without interpreting them.
-This provides a mechanism for passing arguments such as \fB\-name\fR
-to a script instead of having \fBitkwish\fR interpret them.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBitkwish\fR is a simple program consisting of the Tcl command
-language, the Tk toolkit, the \fB[incr\ Tcl]\fR extension for
-object-oriented programming, and the \fB[incr\ Tk]\fR extension
-for building mega-widgets.  The main program creates an
-interpreter, creates a main window, and then processes Tcl
-commands from standard input or from a file.
-.PP
-\fBitkwish\fR is just like \fBwish\fR, but includes the
-\fB[incr\ Tcl]\fR / \fB[incr\ Tk]\fR extensions.
-.PP
-See the \fBwish\fR man page for details concerning usage.  See
-the \fBitcl\fR and \fBitk\fR man pages for an overview of
-\fB[incr\ Tcl]\fR / \fB[incr\ Tk]\fR.
-
-.SH KEYWORDS
-Tcl, Tk, itcl, itk, interpreter, shell, toolkit

doc/man.macros

@@ -1,80 +1,86 @@
-'\" The definitions below are for supplemental macros used in Tcl/Tk
-'\" manual entries.
-'\"
-'\" .AP type name in/out ?indent?
-'\"	Start paragraph describing an argument to a library procedure.
-'\"	type is type of argument (int, etc.), in/out is either "in", "out",
-'\"	or "in/out" to describe whether procedure reads or modifies arg,
-'\"	and indent is equivalent to second arg of .IP (shouldn't ever be
-'\"	needed;  use .AS below instead)
-'\"
-'\" .AS ?type? ?name?
-'\"	Give maximum sizes of arguments for setting tab stops.  Type and
-'\"	name are examples of largest possible arguments that will be passed
-'\"	to .AP later.  If args are omitted, default tab stops are used.
-'\"
-'\" .BS
-'\"	Start box enclosure.  From here until next .BE, everything will be
-'\"	enclosed in one large box.
-'\"
-'\" .BE
-'\"	End of box enclosure.
-'\"
-'\" .CS
-'\"	Begin code excerpt.
-'\"
-'\" .CE
-'\"	End code excerpt.
-'\"
-'\" .VS ?version? ?br?
-'\"	Begin vertical sidebar, for use in marking newly-changed parts
-'\"	of man pages.  The first argument is ignored and used for recording
-'\"	the version when the .VS was added, so that the sidebars can be
-'\"	found and removed when they reach a certain age.  If another argument
-'\"	is present, then a line break is forced before starting the sidebar.
-'\"
-'\" .VE
-'\"	End of vertical sidebar.
-'\"
-'\" .DS
-'\"	Begin an indented unfilled display.
-'\"
-'\" .DE
-'\"	End of indented unfilled display.
-'\"
-'\" .SO
-'\"	Start of list of standard options for a Tk widget.  The
-'\"	options follow on successive lines, in four columns separated
-'\"	by tabs.
-'\"
-'\" .SE
-'\"	End of list of standard options for a Tk widget.
-'\"
-'\" .OP cmdName dbName dbClass
-'\"	Start of description of a specific option.  cmdName gives the
-'\"	option's name as specified in the class command, dbName gives
-'\"	the option's name in the option database, and dbClass gives
-'\"	the option's class in the option database.
-'\"
-'\" .UL arg1 arg2
-'\"	Print arg1 underlined, then print arg2 normally.
-'\"
-'\" SCCS: @(#) man.macros 1.9 97/08/22 18:50:59
-'\"
-'\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
 .if t .wh -1.3i ^B
 .nr ^l \n(.l
 .ad b
-'\"	# Start an argument description
+.\"	# Start an argument description
 .de AP
 .ie !"\\$4"" .TP \\$4
 .el \{\
 .   ie !"\\$2"" .TP \\n()Cu
 .   el          .TP 15
 .\}
-.ie !"\\$3"" \{\
 .ta \\n()Au \\n()Bu
-\&\\$1	\\fI\\$2\\fP	(\\$3)
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
 .\".b
 .\}
 .el \{\
@@ -87,7 +93,7 @@
 .\}
 .\}
 ..
-'\"	# define tabbing values for .AP
+.\"	# define tabbing values for .AP
 .de AS
 .nr )A 10n
 .if !"\\$1"" .nr )A \\w'\\$1'u+3n
@@ -97,9 +103,9 @@
 .nr )C \\n()Bu+\\w'(in/out)'u+2n
 ..
 .AS Tcl_Interp Tcl_CreateInterp in/out
-'\"	# BS - start boxed text
-'\"	# ^y = starting y location
-'\"	# ^b = 1
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
 .de BS
 .br
 .mk ^y
@@ -109,7 +115,7 @@
 .if n \l'\\n(.lu\(ul'
 .if n .fi
 ..
-'\"	# BE - end boxed text (draw box now)
+.\"	# BE - end boxed text (draw box now)
 .de BE
 .nf
 .ti 0
@@ -129,16 +135,16 @@
 .br
 .nr ^b 0
 ..
-'\"	# VS - start vertical sidebar
-'\"	# ^Y = starting y location
-'\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
 .de VS
 .if !"\\$2"" .br
 .mk ^Y
 .ie n 'mc \s12\(br\s0
 .el .nr ^v 1u
 ..
-'\"	# VE - end of vertical sidebar
+.\"	# VE - end of vertical sidebar
 .de VE
 .ie n 'mc
 .el \{\
@@ -153,9 +159,9 @@
 .\}
 .nr ^v 0
 ..
-'\"	# Special macro to handle page bottom:  finish off current
-'\"	# box/sidebar if in box/sidebar mode, then invoked standard
-'\"	# page bottom macro.
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
 .de ^B
 .ev 2
 'ti 0
@@ -182,34 +188,36 @@
 .mk ^Y
 .\}
 ..
-'\"	# DS - begin display
+.\"	# DS - begin display
 .de DS
 .RS
 .nf
 .sp
 ..
-'\"	# DE - end display
+.\"	# DE - end display
 .de DE
 .fi
 .RE
 .sp
 ..
-'\"	# SO - start of list of standard options
+.\"	# SO - start of list of standard options
 .de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
 .SH "STANDARD OPTIONS"
 .LP
 .nf
-.ta 4c 8c 12c
+.ta 5.5c 11c
 .ft B
 ..
-'\"	# SE - end of list of standard options
+.\"	# SE - end of list of standard options
 .de SE
 .fi
 .ft R
 .LP
-See the \\fBoptions\\fR manual entry for details on the standard options.
+See the \\*(So manual entry for details on the standard options.
 ..
-'\"	# OP - start of full description for a single option
+.\"	# OP - start of full description for a single option
 .de OP
 .LP
 .nf
@@ -220,17 +228,40 @@ Database Class:	\\fB\\$3\\fR
 .fi
 .IP
 ..
-'\"	# CS - begin code excerpt
+.\"	# CS - begin code excerpt
 .de CS
 .RS
 .nf
 .ta .25i .5i .75i 1i
 ..
-'\"	# CE - end code excerpt
+.\"	# CE - end code excerpt
 .de CE
 .fi
 .RE
 ..
+.\"	# UL - underline word
 .de UL
 \\$1\l'|0\(ul'\\$2
 ..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..

doc/usual.n

@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: $Id: usual.n,v 1.1 1998/07/27 18:45:40 stanton Exp $
-'\"
 .so man.macros
 .TH usual n 3.0 itk "[incr\ Tk]"
 .BS
@@ -61,7 +59,7 @@ all \fItag\fR names previously registered.
 Following is the \fBusual\fR declaration for the standard
 Tk button widget:
 .CS
-usual Button {
+itk::usual Button {
     keep -background -cursor -foreground -font
     keep -activebackground -activeforeground -disabledforeground
     keep -highlightcolor -highlightthickness

examples/Info.itk

@@ -13,42 +13,42 @@ class Info {
     inherit itk::Toplevel
 
     constructor {args} {
-        itk_component add dismiss {
-            button $itk_interior.dismiss -text "Dismiss" \
-                -command "destroy $itk_component(hull)"
-        }
-        pack $itk_component(dismiss) -side bottom -pady 4
+	itk_component add dismiss {
+	    button $itk_interior.dismiss -text "Dismiss" \
+		-command "destroy $itk_component(hull)"
+	}
+	pack $itk_component(dismiss) -side bottom -pady 4
 
-        itk_component add separator {
-            frame $itk_interior.sep -height 2 -borderwidth 1 -relief sunken
-        }
-        pack $itk_component(separator) -side bottom -fill x -padx 4
+	itk_component add separator {
+	    frame $itk_interior.sep -height 2 -borderwidth 1 -relief sunken
+	}
+	pack $itk_component(separator) -side bottom -fill x -padx 4
 
-        itk_component add icon {
-            label $itk_interior.icon -bitmap info
-        }
-        pack $itk_component(icon) -side left -padx 8 -pady 8
+	itk_component add icon {
+	    label $itk_interior.icon -bitmap info
+	}
+	pack $itk_component(icon) -side left -padx 8 -pady 8
 
-        itk_component add infoFrame {
-            frame $itk_interior.info
-        }
-        pack $itk_component(infoFrame) -side left -expand yes \
-            -fill both -padx 4 -pady 4
+	itk_component add infoFrame {
+	    frame $itk_interior.info
+	}
+	pack $itk_component(infoFrame) -side left -expand yes \
+	    -fill both -padx 4 -pady 4
 
-        set itk_interior $itk_component(infoFrame)
+	set itk_interior $itk_component(infoFrame)
 
-        eval itk_initialize $args
+	eval itk_initialize $args
 
-        after idle [code $this centerOnScreen]
+	after idle [code $this centerOnScreen]
     }
 
     protected method centerOnScreen {} {
-        update idletasks
-        set wd [winfo reqwidth $itk_component(hull)]
-        set ht [winfo reqheight $itk_component(hull)]
-        set x [expr ([winfo screenwidth $itk_component(hull)]-$wd)/2]
-        set y [expr ([winfo screenheight $itk_component(hull)]-$ht)/2]
-        wm geometry $itk_component(hull) +$x+$y
+	update idletasks
+	set wd [winfo reqwidth $itk_component(hull)]
+	set ht [winfo reqheight $itk_component(hull)]
+	set x [expr ([winfo screenwidth $itk_component(hull)]-$wd)/2]
+	set y [expr ([winfo screenheight $itk_component(hull)]-$ht)/2]
+	wm geometry $itk_component(hull) +$x+$y
     }
 }
 

examples/MessageInfo.itk

@@ -13,23 +13,23 @@ class MessageInfo {
     inherit Info
 
     constructor {args} {
-        itk_component add message {
-            label $itk_interior.mesg -width 20
-        } {
-            usual
-            rename -text -message message Text
-        }
-        pack $itk_component(message) -expand yes -fill both
-        bind $itk_component(message) <Configure> [code $this resize]
+	itk_component add message {
+	    label $itk_interior.mesg -width 20
+	} {
+	    usual
+	    rename -text -message message Text
+	}
+	pack $itk_component(message) -expand yes -fill both
+	bind $itk_component(message) <Configure> [code $this resize]
 
-        eval itk_initialize $args
+	eval itk_initialize $args
     }
 
     private method resize {} {
-        set w [winfo width $itk_component(message)]
-        if {$w > 1} {
-            $itk_component(message) configure -wraplength $w
-        }
+	set w [winfo width $itk_component(message)]
+	if {$w > 1} {
+	    $itk_component(message) configure -wraplength $w
+	}
     }
 }
 

examples/TextDisplay.itk

@@ -18,36 +18,36 @@ class TextDisplay {
     inherit itk::Widget
 
     constructor {args} {
-        itk_option add hull.width hull.height
+	itk_option add hull.width hull.height
 
-        itk_component add text {
-            text $itk_interior.info -state disabled -width 1 -height 1 \
-                -yscrollcommand [code $itk_interior.sbar set]
-        } {
-            usual
-            keep -wrap -tabs
-            rename -background -textbackground textBackground Background
-        }
-        pack $itk_component(text) -side left -expand yes -fill both
+	itk_component add text {
+	    text $itk_interior.info -state disabled -width 1 -height 1 \
+		-yscrollcommand [code $itk_interior.sbar set]
+	} {
+	    usual
+	    keep -wrap -tabs
+	    rename -background -textbackground textBackground Background
+	}
+	pack $itk_component(text) -side left -expand yes -fill both
 
-        itk_component add scrollbar {
-            scrollbar $itk_interior.sbar \
-                -command [code $itk_interior.info yview]
-        }
-        pack $itk_component(scrollbar) -side right -fill y
+	itk_component add scrollbar {
+	    scrollbar $itk_interior.sbar \
+		-command [code $itk_interior.info yview]
+	}
+	pack $itk_component(scrollbar) -side right -fill y
 
-        eval itk_initialize $args
+	eval itk_initialize $args
 
-        pack propagate $itk_component(hull) 0
+	pack propagate $itk_component(hull) 0
 
-        fixScrollbar
-        bind $itk_component(text) <Configure> [code $this fixScrollbar]
+	fixScrollbar
+	bind $itk_component(text) <Configure> [code $this fixScrollbar]
 
-        $itk_component(text) tag configure bold \
-            -font -*-courier-bold-r-normal--*-120-*
+	$itk_component(text) tag configure bold \
+	    -font -*-courier-bold-r-normal--*-120-*
 
-        $itk_component(text) tag configure italic \
-            -font -*-courier-medium-o-normal--*-120-*
+	$itk_component(text) tag configure italic \
+	    -font -*-courier-medium-o-normal--*-120-*
     }
 
     public method display {info}
@@ -55,14 +55,14 @@ class TextDisplay {
     public method substitute {word newword}
 
     itk_option define -scrollbar scrollbar Scrollbar "on" {
-        switch -- $itk_option(-scrollbar) {
-            on - off - auto {
-                fixScrollbar
-            }
-            default {
-                error "bad value \"$itk_option(-scollbar)\""
-            }
-        }
+	switch -- $itk_option(-scrollbar) {
+	    on - off - auto {
+		fixScrollbar
+	    }
+	    default {
+		error "bad value \"$itk_option(-scollbar)\""
+	    }
+	}
     }
 
     protected method fixScrollbar {}
@@ -89,13 +89,13 @@ body TextDisplay::substitute {word newword} {
 
     set index 1.0
     while {1} {
-        set index [$itk_component(text) search -count len $word $index]
-        if {$index != ""} {
-            $itk_component(text) delete $index "$index + $len chars"
-            $itk_component(text) insert $index $newword
-        } else {
-            break
-        }
+	set index [$itk_component(text) search -count len $word $index]
+	if {$index != ""} {
+	    $itk_component(text) delete $index "$index + $len chars"
+	    $itk_component(text) insert $index $newword
+	} else {
+	    break
+	}
     }
     $itk_component(text) configure -state disabled
     fixScrollbar
@@ -103,25 +103,25 @@ body TextDisplay::substitute {word newword} {
 
 body TextDisplay::fixScrollbar {} {
     switch $itk_option(-scrollbar) {
-        on  { set sbstate 1 }
-        off { set sbstate 0 }
+	on  { set sbstate 1 }
+	off { set sbstate 0 }
 
-        auto {
-            if {[$itk_component(text) bbox 1.0] == "" ||
-                [$itk_component(text) bbox end-1char] == ""} {
-                set sbstate 1
-            } else {
-                set sbstate 0
-            }
-        }
+	auto {
+	    if {[$itk_component(text) bbox 1.0] == "" ||
+		[$itk_component(text) bbox end-1char] == ""} {
+		set sbstate 1
+	    } else {
+		set sbstate 0
+	    }
+	}
     }
     if {$sbstate != $sbvisible} {
-        if {$sbstate} {
-            pack $itk_component(scrollbar) -side right -fill y
-        } else {
-            pack forget $itk_component(scrollbar)
-        }
-        set sbvisible $sbstate
+	if {$sbstate} {
+	    pack $itk_component(scrollbar) -side right -fill y
+	} else {
+	    pack forget $itk_component(scrollbar)
+	}
+	set sbvisible $sbstate
     }
 }
 

examples/TextInfo.itk

@@ -13,24 +13,24 @@ class TextInfo {
     inherit Info
 
     constructor {args} {
-        itk_component add textArea {
-            TextDisplay $itk_interior.txt -scrollbar auto
-        } {
-            usual
-            keep -wrap -tabs
-            rename -font -textfont textFont Font
-        }
-        pack $itk_component(textArea) -expand yes -fill both
+	itk_component add textArea {
+	    TextDisplay $itk_interior.txt -scrollbar auto
+	} {
+	    usual
+	    keep -wrap -tabs
+	    rename -font -textfont textFont Font
+	}
+	pack $itk_component(textArea) -expand yes -fill both
 
-        eval itk_initialize $args
+	eval itk_initialize $args
     }
 
     public method display {args} {
-        eval $itk_component(textArea) display $args
+	eval $itk_component(textArea) display $args
     }
 
     public method append {args} {
-        eval $itk_component(textArea) append $args
+	eval $itk_component(textArea) append $args
     }
 }
 

examples/viewfile

@@ -31,14 +31,14 @@ bind .file <KeyPress-Return> {show_file [.file get]}
 
 proc show_file {file} {
     set cmd {
-        set fid [open $file r]
-        set info [read $fid]
-        close $fid
+	set fid [open $file r]
+	set info [read $fid]
+	close $fid
     }
     if {[catch $cmd] == 0} {
-        set win [TextInfo .#auto -wrap none]
-        $win display $info
+	set win [TextInfo .#auto -wrap none]
+	$win display $info
     } else {
-        MessageInfo .#auto -message "Cannot read file:\n$file"
+	MessageInfo .#auto -message "Cannot read file:\n$file"
     }
 }

generic/itk.decls

@@ -1,18 +1,20 @@
+# -*- tcl -*-
+
 # itk.decls --
 #
 #	This file contains the declarations for all supported public
 #	functions that are exported by the Itk library via the stubs table.
 #	This file is used to generate the itkDecls.h file.
-#	
 #
-# Copyright (c) 1998-1999 by XXXX
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: 
 
+# public API
 library itk
 interface itk
+hooks {itkInt}
+epoch 0
+scspec ITKAPI
 
 # Declare each of the functions in the public Itk interface.  Note that
 # the an index should never be reused for a different function in order
@@ -23,64 +25,11 @@ interface itk
 #  Exported functions:
 #
 
-declare 0 generic {
-    int Itk_Init (Tcl_Interp *interp)
+declare 0 {
+    int Itk_Init(Tcl_Interp *interp)
 }
-#declare 1 generic {
-#    int Itk_SafeInit (Tcl_Interp *interp)
-#}
-
-
-#
-#  Functions used internally by this package:
-#
-
-declare 2 generic {
-    int Itk_ConfigBodyCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 3 generic {
-    int Itk_UsualCmd (ClientData cdata, Tcl_Interp *interp, int objc, \
-        Tcl_Obj *CONST objv[])
-}
-
-
-#
-#  Functions for managing options included in class definitions:
-#
-
-declare 4 generic {
-    int Itk_ClassOptionDefineCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 5 generic {
-    int Itk_ClassOptionIllegalCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 6 generic {
-    int Itk_ConfigClassOption (Tcl_Interp *interp, ItclObject *contextObj, \
-        ClientData cdata, char* newVal)
-}
-declare 7 generic {
-    ItkClassOptTable* Itk_CreateClassOptTable( Tcl_Interp *interp, \
-        ItclClass *cdefn)
-}
-declare 8 generic {
-    ItkClassOptTable* Itk_FindClassOptTable (ItclClass *cdefn)
-}
-#declare 9 generic {
-#    void Itk_DeleteClassOptTable (Tcl_Interp *interp, ItclClass *cdefn)
-#}
-declare 10 generic {
-    int Itk_CreateClassOption (Tcl_Interp *interp, ItclClass *cdefn, \
-        char *switchName, char *resName, char *resClass, char *defVal, \
-        char *config, ItkClassOption **optPtr)
-}
-declare 11 generic {
-    ItkClassOption* Itk_FindClassOption (ItclClass *cdefn, char *switchName)
-}
-declare 12 generic {
-    void Itk_DelClassOption (ItkClassOption *opt)
+declare 1 {
+    int Itk_SafeInit(Tcl_Interp *interp)
 }
 
 
@@ -88,24 +37,85 @@ declare 12 generic {
 #  Functions needed for the Archetype base class:
 #
 
-declare 13 generic {
-    int Itk_ArchetypeInit (Tcl_Interp* interp)
+declare 13 {
+    int Itk_ArchetypeInit(Tcl_Interp *interp)
 }
 
 
+
+# private API
+interface itkInt
+
+#
+# Functions used within the package, but not considered "public"
+#
+
+#
+#  Functions used internally by this package:
+#
+
+declare 2 {
+    int Itk_ConfigBodyCmd(void *cdata, Tcl_Interp *interp,
+	int objc, Tcl_Obj *const objv[])
+}
+declare 3 {
+    int Itk_UsualCmd(void *cdata, Tcl_Interp *interp, int objc,
+	Tcl_Obj *const objv[])
+}
+
+#
+#  Functions for managing options included in class definitions:
+#
+
+declare 4 {
+    int Itk_ClassOptionDefineCmd(void *cdata, Tcl_Interp *interp,
+	int objc, Tcl_Obj *const objv[])
+}
+declare 5 {
+    int Itk_ClassOptionIllegalCmd(void *cdata, Tcl_Interp *interp, \
+	int objc, Tcl_Obj *const objv[])
+}
+declare 6 {
+    int Itk_ConfigClassOption(Tcl_Interp *interp, ItclObject *contextObj, \
+	void *cdata, const char *newVal)
+}
+declare 7 {
+    ItkClassOptTable* Itk_CreateClassOptTable(Tcl_Interp *interp, \
+	ItclClass *cdefn)
+}
+declare 8 {
+    ItkClassOptTable* Itk_FindClassOptTable(ItclClass *cdefn)
+}
+#declare 9 {
+#    void Itk_DeleteClassOptTable(Tcl_Interp *interp, ItclClass *cdefn)
+#}
+declare 10 {
+    int Itk_CreateClassOption(Tcl_Interp *interp, ItclClass *cdefn,
+	const char *switchName, const char *resName, const char *resClass, const char *defVal,
+	const char *config, ItkClassOption **optPtr)
+}
+declare 11 {
+    ItkClassOption* Itk_FindClassOption(ItclClass *cdefn, const char *switchName)
+}
+declare 12 {
+    void Itk_DelClassOption(ItkClassOption *opt)
+}
+
 #
 #  Functions for maintaining the ordered option list:
 #
 
-declare 14 generic {
-    void Itk_OptListInit (ItkOptList* olist, Tcl_HashTable *options)
+declare 14 {
+    void Itk_OptListInit(ItkOptList *olist, Tcl_HashTable *options)
 }
-declare 15 generic {
-    void Itk_OptListFree (ItkOptList* olist)
+declare 15 {
+    void Itk_OptListFree(ItkOptList *olist)
 }
-declare 16 generic {
-    void Itk_OptListAdd (ItkOptList* olist, Tcl_HashEntry *entry)
+declare 16 {
+    void Itk_OptListAdd(ItkOptList *olist, Tcl_HashEntry *entry)
 }
-declare 17 generic {
-    void Itk_OptListRemove (ItkOptList* olist, Tcl_HashEntry *entry)
+declare 17 {
+    void Itk_OptListRemove(ItkOptList *olist, Tcl_HashEntry *entry)
 }
+
+

generic/itk.h

@@ -37,8 +37,6 @@
  *           Bell Labs Innovations for Lucent Technologies
  *           mmclennan@lucent.com
  *           http://www.tcltk.com/itcl
- *
- *     RCS:  $Id: itk.h,v 1.5 1999/05/24 21:10:47 redman Exp $
  * ========================================================================
  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
  * ------------------------------------------------------------------------
@@ -48,6 +46,23 @@
 #ifndef ITK_H
 #define ITK_H
 
+#if defined(BUILD_itk)
+#       define ITKAPI DLLEXPORT
+#       undef USE_ITK_STUBS
+#       undef USE_ITCL_STUBS
+#else
+#       define ITKAPI DLLIMPORT
+#endif
+
+#define ITK_MAJOR_VERSION	4
+#define ITK_MINOR_VERSION	2
+#define ITK_RELEASE_LEVEL	TCL_FINAL_RELEASE
+#define ITK_RELEASE_SERIAL	7
+
+#define ITK_VERSION		"4.2"
+#define ITK_PATCH_LEVEL		"4.2.7"
+
+
 /*
  * A special definition used to allow this header file to be included
  * in resource files so that they can get obtain version information from
@@ -55,48 +70,42 @@
  * and procedure declarations, that occur below.
  */
 
-#ifndef RESOURCE_INCLUDED
+#ifndef RC_INVOKED
 
-#include "itclInt.h"
-#include "tk.h"
+#include <tk.h>
 
+#undef TCL_STORAGE_CLASS
 #ifdef BUILD_itk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
+#   define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#   ifdef USE_ITK_STUBS
+#	define TCL_STORAGE_CLASS
+#   else
+#	define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
 #endif
 
 /*
- *  List of options in alphabetical order:
+ *  This function is contained in the itkstub static library
  */
-typedef struct ItkOptList {
-    Tcl_HashTable *options;     /* list containing the real options */
-    Tcl_HashEntry **list;       /* gives ordering of options */
-    int len;                    /* number of entries in order list */
-    int max;                    /* maximum size of order list */
-} ItkOptList;
 
-/*
- *  List of options created in the class definition:
- */
-typedef struct ItkClassOptTable {
-    Tcl_HashTable options;        /* option storage with fast lookup */
-    ItkOptList order;             /* gives ordering of options */
-} ItkClassOptTable;
-
-/*
- *  Each option created in the class definition:
- */
-typedef struct ItkClassOption {
-    ItclMember *member;           /* info about this option */
-    char *resName;                /* resource name in X11 database */
-    char *resClass;               /* resource class name in X11 database */
-    char *init;                   /* initial value for option */
-} ItkClassOption;
+#ifdef USE_ITK_STUBS
+EXTERN const char *
+	Itk_InitStubs(Tcl_Interp *interp,
+			    const char *version, int exact);
+#else
+#define Itk_InitStubs(interp, version, exact) \
+      Tcl_PkgRequire(interp, "Itk", version, exact)
+#endif
 
 #include "itkDecls.h"
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
+/*
+ * Public functions that are not accessible via the stubs table.
+ */
 
-#endif /* RESOURCE INCLUDED */
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
+
+#endif /* RC_INVOKED */
 #endif /* ITK_H */

generic/itkBase.c

@@ -0,0 +1,329 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *  This file defines the initialization and facilities common to all
+ *  mega-widgets.
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           http://www.tcltk.com/itcl
+ * ========================================================================
+ *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
+ * ------------------------------------------------------------------------
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+#include "itkInt.h"
+#include "itkUuid.h"
+
+MODULE_SCOPE const ItkStubs itkStubs;
+/*
+ * The following script is used to initialize Itcl in a safe interpreter.
+ */
+
+static char safeInitScript[] =
+"proc ::itcl::local {class name args} {\n\
+    set ptr [uplevel [list $class $name] $args]\n\
+    uplevel [list set itcl-local-$ptr $ptr]\n\
+    set cmd [uplevel namespace which -command $ptr]\n\
+    uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n\
+    return $ptr\n\
+}";
+
+/*
+ *  FORWARD DECLARATIONS
+ */
+static int Initialize (Tcl_Interp *interp);
+/*
+ * The following string is the startup script executed in new
+ * interpreters.  It looks on disk in several different directories
+ * for a script "init.tcl" that is compatible with this version
+ * of Tcl.  The init.tcl script does all of the real work of
+ * initialization.
+ */
+
+static char initScript[] = "\n\
+namespace eval ::itk {\n\
+    proc _find_init {} {\n\
+	global env tcl_library\n\
+	variable library\n\
+	variable patchLevel\n\
+	rename _find_init {}\n\
+	if {[info exists library]} {\n\
+	    lappend dirs $library\n\
+	} else {\n\
+	    set dirs {}\n\
+	    if {[info exists env(ITK_LIBRARY)]} {\n\
+		lappend dirs $env(ITK_LIBRARY)\n\
+	    }\n\
+	    lappend dirs [file join [file dirname $tcl_library] itk$patchLevel]\n\
+	    set bindir [file dirname [info nameofexecutable]]\n\
+	    lappend dirs [file join $bindir .. lib itk$patchLevel]\n\
+	    lappend dirs [file join $bindir .. library]\n\
+	    lappend dirs [file join $bindir .. .. library]\n\
+	    lappend dirs [file join $bindir .. .. itk library]\n\
+	    # On MacOSX, check the directories in the tcl_pkgPath\n\
+	    if {[string equal $::tcl_platform(platform) \"unix\"] && \
+		    [string equal $::tcl_platform(os) \"Darwin\"]} {\n\
+		foreach d $::tcl_pkgPath {\n\
+		    lappend dirs [file join $d itk$patchLevel]\n\
+		}\n\
+	    }\n\
+	}\n\
+	foreach i $dirs {\n\
+	    set library $i\n\
+	    set itkfile [file join $i itk.tcl]\n\
+	    if {![catch {uplevel #0 [list source $itkfile]} msg]} {\n\
+		return\n\
+	    }\n\
+	}\n\
+	set msg \"Can't find a usable itk.tcl in the following directories:\n\"\n\
+	append msg \"    $dirs\n\"\n\
+	append msg \"This probably means that Itcl/Itk weren't installed properly.\n\"\n\
+	append msg \"If you know where the Itk library directory was installed,\n\"\n\
+	append msg \"you can set the environment variable ITK_LIBRARY to point\n\"\n\
+	append msg \"to the library directory.\n\"\n\
+	error $msg\n\
+    }\n\
+    _find_init\n\
+}";
+
+/*
+ * ------------------------------------------------------------------------
+ *  Initialize()
+ *
+ *  Invoked whenever a new interpeter is created to install the
+ *  [incr Tk] package.
+ *
+ *  Creates the "::itk" namespace and installs access commands.
+ *
+ *  Returns TCL_OK on success, or TCL_ERROR (along with an error
+ *  message in the interpreter) if anything goes wrong.
+ * ------------------------------------------------------------------------
+ */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+
+static int
+Initialize(
+    Tcl_Interp *interp)  /* interpreter to be updated */
+{
+    Tcl_Namespace *itkNs, *parserNs;
+    void *parserInfo;
+    Tcl_CmdInfo info;
+
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
+      return TCL_ERROR;
+    }
+    if (Tk_InitStubs(interp, "8.6-", 0) == NULL) {
+	return TCL_ERROR;
+    };
+    if (Itcl_InitStubs(interp, "4.1", 0) == NULL) {
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Add the "itk_option" ensemble to the itcl class definition parser.
+     */
+    parserNs = Tcl_FindNamespace(interp, "::itcl::parser",
+	(Tcl_Namespace*)NULL, /* flags */ 0);
+
+    if (!parserNs) {
+	Tcl_AppendResult(interp,
+	    "cannot initialize [incr Tk]: [incr Tcl] has not been installed\n",
+	    "Make sure that Itcl_Init() is called before Itk_Init()",
+	    (char*)NULL);
+	return TCL_ERROR;
+    }
+    parserInfo = parserNs->clientData;
+
+    if (Itcl_CreateEnsemble(interp, "::itcl::parser::itk_option") != TCL_OK) {
+	return TCL_ERROR;
+    }
+    if (Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
+	    "define", "-switch resourceName resourceClass init ?config?",
+	    Itk_ClassOptionDefineCmd,
+	    parserInfo, Itcl_ReleaseData) != TCL_OK) {
+
+	return TCL_ERROR;
+    }
+    Itcl_PreserveData(parserInfo);
+
+    if (Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
+	    "add", "name ?name name...?",
+	    Itk_ClassOptionIllegalCmd,
+	    (void *)NULL, (Tcl_CmdDeleteProc*)NULL) != TCL_OK ||
+
+	Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
+	    "remove", "name ?name name...?",
+	    Itk_ClassOptionIllegalCmd,
+	    (void *)NULL, (Tcl_CmdDeleteProc*)NULL) != TCL_OK) {
+
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Install [incr Tk] facilities if not already installed.
+     */
+    itkNs = Tcl_FindNamespace(interp, "::itk", (Tcl_Namespace*)NULL,
+	/* flags */ 0);
+
+    if (itkNs == NULL) {
+	/*
+	 *  Create the "itk" namespace.  Export all the commands in
+	 *  the namespace so that they can be imported by a command
+	 *  such as "namespace import itk::*"
+	 */
+	itkNs = Tcl_CreateNamespace(interp, "::itk",
+	    (void *)NULL, (Tcl_NamespaceDeleteProc*)NULL);
+    }
+
+    if (!itkNs ||
+	Tcl_Export(interp, itkNs, "*", /* resetListFirst */ 1) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Setup things for itk::Archetype base class.
+     */
+    if (Itk_ArchetypeInit(interp) != TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Fix the "itcl::configbody" command to recognize mega-widget
+     *  options.
+     */
+    Tcl_CreateObjCommand(interp, "::itcl::configbody", Itk_ConfigBodyCmd,
+	(void *)NULL, (Tcl_CmdDeleteProc*)NULL);
+
+    Tcl_SetVar(interp, "::itk::version", ITK_VERSION, TCL_NAMESPACE_ONLY);
+    Tcl_SetVar(interp, "::itk::patchLevel", ITK_PATCH_LEVEL,
+	    TCL_NAMESPACE_ONLY);
+
+    /*
+     *  Signal that the package has been loaded and provide the Itk Stubs table
+     *  for dependent modules.  I know this is unlikely, but possible that
+     *  someone could be extending Itk.  Who is to say that Itk is the
+     *  end-of-the-line?
+     */
+
+    if (Tcl_GetCommandInfo(interp, "::tcl::build-info", &info)) {
+	Tcl_CreateObjCommand(interp, "::itk::build-info",
+		info.objProc, (void *)(PACKAGE_VERSION "+" STRINGIFY(ITK_VERSION_UUID)
+#if defined(__clang__) && defined(__clang_major__)
+	    ".clang-" STRINGIFY(__clang_major__)
+#if __clang_minor__ < 10
+	    "0"
+#endif
+	    STRINGIFY(__clang_minor__)
+#endif
+#if defined(__cplusplus) && !defined(__OBJC__)
+	    ".cplusplus"
+#endif
+#ifndef NDEBUG
+	    ".debug"
+#endif
+#if !defined(__clang__) && !defined(__INTEL_COMPILER) && defined(__GNUC__)
+	    ".gcc-" STRINGIFY(__GNUC__)
+#if __GNUC_MINOR__ < 10
+	    "0"
+#endif
+	    STRINGIFY(__GNUC_MINOR__)
+#endif
+#ifdef __INTEL_COMPILER
+	    ".icc-" STRINGIFY(__INTEL_COMPILER)
+#endif
+#ifdef TCL_MEM_DEBUG
+	    ".memdebug"
+#endif
+#if defined(_MSC_VER)
+	    ".msvc-" STRINGIFY(_MSC_VER)
+#endif
+#ifdef USE_NMAKE
+	    ".nmake"
+#endif
+#ifndef TCL_CFG_OPTIMIZED
+	    ".no-optimize"
+#endif
+#ifdef __OBJC__
+	    ".objective-c"
+#if defined(__cplusplus)
+	    "plusplus"
+#endif
+#endif
+#ifdef TCL_CFG_PROFILED
+	    ".profile"
+#endif
+#ifdef PURIFY
+	    ".purify"
+#endif
+#ifdef STATIC_BUILD
+	    ".static"
+#endif
+		), NULL);
+    }
+    Tcl_PkgProvideEx(interp, "Itk", ITK_PATCH_LEVEL, (void *) &itkStubs);
+    return Tcl_PkgProvideEx(interp, "itk", ITK_PATCH_LEVEL,
+	    (void *) &itkStubs);
+}
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_Init()
+ *
+ *  Invoked whenever a new interpreter is created to install the
+ *  [incr Tcl] package.  Usually invoked within Tcl_AppInit() at
+ *  the start of execution.
+ *
+ *  Creates the "::itk" namespace and installs access commands.
+ *
+ *  Returns TCL_OK on success, or TCL_ERROR (along with an error
+ *  message in the interpreter) if anything goes wrong.
+ * ------------------------------------------------------------------------
+ */
+int
+Itk_Init(
+    Tcl_Interp *interp)  /* interpreter to be updated */
+{
+    if (Initialize(interp) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    return Tcl_EvalEx(interp, initScript, -1, 0);
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_SafeInit()
+ *
+ *  Invoked whenever a new SAFE INTERPRETER is created to install
+ *  the [incr Tcl] package.
+ *
+ *  Creates the "::itk" namespace and installs access commands for
+ *  creating classes and querying info.
+ *
+ *  Returns TCL_OK on success, or TCL_ERROR (along with an error
+ *  message in the interpreter) if anything goes wrong.
+ * ------------------------------------------------------------------------
+ */
+int
+Itk_SafeInit(
+    Tcl_Interp *interp)  /* interpreter to be updated */
+{
+    if (Initialize(interp) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    return Tcl_EvalEx(interp, safeInitScript, -1, 0);
+}

generic/itkCmd.c

@@ -0,0 +1,148 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *  This file defines the initialization and facilities common to all
+ *  mega-widgets.
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           http://www.tcltk.com/itcl
+ * ========================================================================
+ *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
+ * ------------------------------------------------------------------------
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+#include "itkInt.h"
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ConfigBodyCmd()
+ *
+ *  Replacement for the usual "itcl::configbody" command.  Recognizes
+ *  mega-widget options included in a class definition.  Options are
+ *  identified by their "switch" name, but without the "-" prefix:
+ *
+ *    itcl::configbody <class>::<itkOption> <body>
+ *
+ *  Handles bodies for public variables as well:
+ *
+ *    itcl::configbody <class>::<publicVar> <body>
+ *
+ *  If an <itkOption> is found, it has priority over public variables.
+ *  If <body> has the form "@name" then it is treated as a reference
+ *  to a C handling procedure; otherwise, it is taken as a body of
+ *  Tcl statements.
+ *
+ *  Returns TCL_OK/TCL_ERROR to indicate success/failure.
+ * ------------------------------------------------------------------------
+ */
+int
+Itk_ConfigBodyCmd(
+    void *dummy,             /* unused */
+    Tcl_Interp *interp,      /* current interpreter */
+    int objc,                /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
+{
+    int result = TCL_OK;
+
+    char *token;
+    const char *head;
+    const char *tail;
+    ItclClass *iclsPtr;
+    ItclMemberCode *mcode;
+    ItkClassOptTable *optTable;
+    Tcl_HashEntry *entry;
+    ItkClassOption *opt;
+    Tcl_DString buffer;
+
+    if (objc != 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "class::option body");
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Parse the member name "namesp::namesp::class::option".
+     *  Make sure that a class name was specified, and that the
+     *  class exists.
+     */
+    token = Tcl_GetString(objv[1]);
+    Itcl_ParseNamespPath(token, &buffer, &head, &tail);
+
+    if (!head || *head == '\0') {
+	Tcl_AppendResult(interp,
+		"missing class specifier for body declaration \"", token, "\"",
+		(char*)NULL);
+	result = TCL_ERROR;
+	goto configBodyCmdDone;
+    }
+
+    iclsPtr = Itcl_FindClass(interp, head, /* autoload */ 1);
+    if (iclsPtr == NULL) {
+	result = TCL_ERROR;
+	goto configBodyCmdDone;
+    }
+
+    /*
+     *  Look first for a configuration option with that name.
+     *  If it is not found, assume the reference is for a public
+     *  variable, and use the usual "configbody" implementation
+     *  to handle it.
+     */
+    optTable = Itk_FindClassOptTable(iclsPtr);
+    opt = NULL;
+
+    if (optTable) {
+	Tcl_DString optName;
+
+	Tcl_DStringInit(&optName);
+	Tcl_DStringAppend(&optName, "-", -1);
+	Tcl_DStringAppend(&optName, tail, -1);
+	entry = Tcl_FindHashEntry(&optTable->options,
+	    Tcl_DStringValue(&optName));
+
+	if (entry) {
+	    opt = (ItkClassOption*)Tcl_GetHashValue(entry);
+	}
+	Tcl_DStringFree(&optName);
+    }
+
+    if (opt == NULL) {
+	result = Itcl_ConfigBodyCmd(dummy, interp, objc, objv);
+	goto configBodyCmdDone;
+    }
+
+    /*
+     *  Otherwise, change the implementation for this option.
+     */
+    token = Tcl_GetString(objv[2]);
+
+    if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, token,
+	&mcode) != TCL_OK) {
+
+	result = TCL_ERROR;
+	goto configBodyCmdDone;
+    }
+
+    Itcl_PreserveData((void *)mcode);
+#ifdef NOTDEF
+    Itcl_EventuallyFree((void *)mcode, (Tcl_FreeProc *)Itcl_DeleteMemberCode);
+#endif
+
+    if (opt->codePtr) {
+	Itcl_ReleaseData((void *)opt->codePtr);
+    }
+    opt->codePtr = mcode;
+
+configBodyCmdDone:
+    Tcl_DStringFree(&buffer);
+    return result;
+}

generic/itkDecls.h

@@ -1,202 +1,91 @@
-/*
- * itkDecls.h --
- *
- *	Declarations of functions in the platform independent public Tcl API.
- *
- * Copyright (c) 1998-1999 by XXXX
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS:
- */
-
-#ifndef _ITKDECLS
-#define _ITKDECLS
-
-#ifdef BUILD_itk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tk.decls script.
- */
 
 /* !BEGIN!: Do not edit below this line. */
 
+#define ITK_STUBS_EPOCH 0
+#define ITK_STUBS_REVISION 17
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Exported function declarations:
  */
 
 /* 0 */
-EXTERN int		Itk_Init _ANSI_ARGS_((Tcl_Interp * interp));
-/* Slot 1 is reserved */
-/* 2 */
-EXTERN int		Itk_ConfigBodyCmd _ANSI_ARGS_((ClientData cdata, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 3 */
-EXTERN int		Itk_UsualCmd _ANSI_ARGS_((ClientData cdata, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 4 */
-EXTERN int		Itk_ClassOptionDefineCmd _ANSI_ARGS_((
-				ClientData cdata, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 5 */
-EXTERN int		Itk_ClassOptionIllegalCmd _ANSI_ARGS_((
-				ClientData cdata, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 6 */
-EXTERN int		Itk_ConfigClassOption _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclObject * contextObj, 
-				ClientData cdata, char* newVal));
-/* 7 */
-EXTERN ItkClassOptTable* Itk_CreateClassOptTable _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclClass * cdefn));
-/* 8 */
-EXTERN ItkClassOptTable* Itk_FindClassOptTable _ANSI_ARGS_((
-				ItclClass * cdefn));
+ITKAPI int		Itk_Init(Tcl_Interp *interp);
+/* 1 */
+ITKAPI int		Itk_SafeInit(Tcl_Interp *interp);
+/* Slot 2 is reserved */
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
+/* Slot 6 is reserved */
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 /* Slot 9 is reserved */
-/* 10 */
-EXTERN int		Itk_CreateClassOption _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclClass * cdefn, 
-				char * switchName, char * resName, 
-				char * resClass, char * defVal, 
-				char * config, ItkClassOption ** optPtr));
-/* 11 */
-EXTERN ItkClassOption*	Itk_FindClassOption _ANSI_ARGS_((ItclClass * cdefn, 
-				char * switchName));
-/* 12 */
-EXTERN void		Itk_DelClassOption _ANSI_ARGS_((ItkClassOption * opt));
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
 /* 13 */
-EXTERN int		Itk_ArchetypeInit _ANSI_ARGS_((Tcl_Interp* interp));
-/* 14 */
-EXTERN void		Itk_OptListInit _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashTable * options));
-/* 15 */
-EXTERN void		Itk_OptListFree _ANSI_ARGS_((ItkOptList* olist));
-/* 16 */
-EXTERN void		Itk_OptListAdd _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashEntry * entry));
-/* 17 */
-EXTERN void		Itk_OptListRemove _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashEntry * entry));
+ITKAPI int		Itk_ArchetypeInit(Tcl_Interp *interp);
+
+typedef struct {
+    const struct ItkIntStubs *itkIntStubs;
+} ItkStubHooks;
 
 typedef struct ItkStubs {
     int magic;
-    struct ItkStubHooks *hooks;
+    int epoch;
+    int revision;
+    const ItkStubHooks *hooks;
 
-    int (*itk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 0 */
-    void *reserved1;
-    int (*itk_ConfigBodyCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 2 */
-    int (*itk_UsualCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 3 */
-    int (*itk_ClassOptionDefineCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 4 */
-    int (*itk_ClassOptionIllegalCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 5 */
-    int (*itk_ConfigClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclObject * contextObj, ClientData cdata, char* newVal)); /* 6 */
-    ItkClassOptTable* (*itk_CreateClassOptTable) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn)); /* 7 */
-    ItkClassOptTable* (*itk_FindClassOptTable) _ANSI_ARGS_((ItclClass * cdefn)); /* 8 */
-    void *reserved9;
-    int (*itk_CreateClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn, char * switchName, char * resName, char * resClass, char * defVal, char * config, ItkClassOption ** optPtr)); /* 10 */
-    ItkClassOption* (*itk_FindClassOption) _ANSI_ARGS_((ItclClass * cdefn, char * switchName)); /* 11 */
-    void (*itk_DelClassOption) _ANSI_ARGS_((ItkClassOption * opt)); /* 12 */
-    int (*itk_ArchetypeInit) _ANSI_ARGS_((Tcl_Interp* interp)); /* 13 */
-    void (*itk_OptListInit) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashTable * options)); /* 14 */
-    void (*itk_OptListFree) _ANSI_ARGS_((ItkOptList* olist)); /* 15 */
-    void (*itk_OptListAdd) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 16 */
-    void (*itk_OptListRemove) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 17 */
+    int (*itk_Init) (Tcl_Interp *interp); /* 0 */
+    int (*itk_SafeInit) (Tcl_Interp *interp); /* 1 */
+    void (*reserved2)(void);
+    void (*reserved3)(void);
+    void (*reserved4)(void);
+    void (*reserved5)(void);
+    void (*reserved6)(void);
+    void (*reserved7)(void);
+    void (*reserved8)(void);
+    void (*reserved9)(void);
+    void (*reserved10)(void);
+    void (*reserved11)(void);
+    void (*reserved12)(void);
+    int (*itk_ArchetypeInit) (Tcl_Interp *interp); /* 13 */
 } ItkStubs;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern ItkStubs *itkStubsPtr;
+extern const ItkStubs *itkStubsPtr;
+
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS)
+#if defined(USE_ITK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#ifndef Itk_Init
 #define Itk_Init \
 	(itkStubsPtr->itk_Init) /* 0 */
-#endif
-/* Slot 1 is reserved */
-#ifndef Itk_ConfigBodyCmd
-#define Itk_ConfigBodyCmd \
-	(itkStubsPtr->itk_ConfigBodyCmd) /* 2 */
-#endif
-#ifndef Itk_UsualCmd
-#define Itk_UsualCmd \
-	(itkStubsPtr->itk_UsualCmd) /* 3 */
-#endif
-#ifndef Itk_ClassOptionDefineCmd
-#define Itk_ClassOptionDefineCmd \
-	(itkStubsPtr->itk_ClassOptionDefineCmd) /* 4 */
-#endif
-#ifndef Itk_ClassOptionIllegalCmd
-#define Itk_ClassOptionIllegalCmd \
-	(itkStubsPtr->itk_ClassOptionIllegalCmd) /* 5 */
-#endif
-#ifndef Itk_ConfigClassOption
-#define Itk_ConfigClassOption \
-	(itkStubsPtr->itk_ConfigClassOption) /* 6 */
-#endif
-#ifndef Itk_CreateClassOptTable
-#define Itk_CreateClassOptTable \
-	(itkStubsPtr->itk_CreateClassOptTable) /* 7 */
-#endif
-#ifndef Itk_FindClassOptTable
-#define Itk_FindClassOptTable \
-	(itkStubsPtr->itk_FindClassOptTable) /* 8 */
-#endif
+#define Itk_SafeInit \
+	(itkStubsPtr->itk_SafeInit) /* 1 */
+/* Slot 2 is reserved */
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
+/* Slot 6 is reserved */
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 /* Slot 9 is reserved */
-#ifndef Itk_CreateClassOption
-#define Itk_CreateClassOption \
-	(itkStubsPtr->itk_CreateClassOption) /* 10 */
-#endif
-#ifndef Itk_FindClassOption
-#define Itk_FindClassOption \
-	(itkStubsPtr->itk_FindClassOption) /* 11 */
-#endif
-#ifndef Itk_DelClassOption
-#define Itk_DelClassOption \
-	(itkStubsPtr->itk_DelClassOption) /* 12 */
-#endif
-#ifndef Itk_ArchetypeInit
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
 #define Itk_ArchetypeInit \
 	(itkStubsPtr->itk_ArchetypeInit) /* 13 */
-#endif
-#ifndef Itk_OptListInit
-#define Itk_OptListInit \
-	(itkStubsPtr->itk_OptListInit) /* 14 */
-#endif
-#ifndef Itk_OptListFree
-#define Itk_OptListFree \
-	(itkStubsPtr->itk_OptListFree) /* 15 */
-#endif
-#ifndef Itk_OptListAdd
-#define Itk_OptListAdd \
-	(itkStubsPtr->itk_OptListAdd) /* 16 */
-#endif
-#ifndef Itk_OptListRemove
-#define Itk_OptListRemove \
-	(itkStubsPtr->itk_OptListRemove) /* 17 */
-#endif
 
-#endif /* defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS) */
+#endif /* defined(USE_ITK_STUBS) */
 
 /* !END!: Do not edit above this line. */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _ITKDECLS */
-

generic/itkHelpers.c

@@ -0,0 +1,195 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *  This part adds C implementations for some helxeper methods in the
+ *  base class itk::Archetype.
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           http://www.tcltk.com/itcl
+ * ========================================================================
+ *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
+ * ------------------------------------------------------------------------
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+#include <assert.h>
+#include "itkInt.h"
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ArchOptConfigError()
+ *
+ *  Simply utility which adds error information after a option
+ *  configuration fails.  Adds traceback information to the given
+ *  interpreter.
+ * ------------------------------------------------------------------------
+ */
+void
+Itk_ArchOptConfigError(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ArchInfo *info,                /* info associated with mega-widget */
+    ArchOption *archOpt)           /* configuration option that failed */
+{
+    Tcl_Obj *objPtr;
+
+    objPtr = Tcl_NewStringObj((char*)NULL, 0);
+    Tcl_IncrRefCount(objPtr);
+
+    Tcl_AppendToObj(objPtr, "\n    (while configuring option \"", -1);
+    Tcl_AppendToObj(objPtr, archOpt->switchName, -1);
+    Tcl_AppendToObj(objPtr, "\"", -1);
+
+    if (info->itclObj && info->itclObj->accessCmd) {
+	Tcl_AppendToObj(objPtr, " for widget \"", -1);
+	Tcl_GetCommandFullName(interp, info->itclObj->accessCmd, objPtr);
+	Tcl_AppendToObj(objPtr, "\")", -1);
+    }
+    Tcl_AddErrorInfo(interp, Tcl_GetString(objPtr));
+    Tcl_DecrRefCount(objPtr);
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ArchOptAccessError()
+ *
+ *  Simply utility which adds error information after an option
+ *  value access fails.  Adds traceback information to the given
+ *  interpreter.
+ * ------------------------------------------------------------------------
+ */
+void
+Itk_ArchOptAccessError(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ArchInfo *info,                /* info associated with mega-widget */
+    ArchOption *archOpt)           /* option that couldn't be accessed */
+{
+    Tcl_ResetResult(interp);
+
+    Tcl_AppendResult(interp,
+	"internal error: cannot access itk_option(", archOpt->switchName, ")",
+	(char*)NULL);
+
+    if (info->itclObj->accessCmd) {
+	Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
+	Tcl_AppendToObj(resultPtr, " in widget \"", -1);
+	Tcl_GetCommandFullName(interp, info->itclObj->accessCmd, resultPtr);
+	Tcl_AppendToObj(resultPtr, "\"", -1);
+    }
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_GetArchInfo()
+ *
+ *  Finds the extra Archetype info associated with the given object.
+ *  Returns TCL_OK and a pointer to the info if found.  Returns
+ *  TCL_ERROR along with an error message in interp->result if not.
+ * ------------------------------------------------------------------------
+ */
+int
+Itk_GetArchInfo(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ItclObject *contextObj,        /* object with desired data */
+    ArchInfo **infoPtr)            /* returns:  pointer to extra info */
+{
+    Tcl_HashTable *objsWithArchInfo;
+    Tcl_HashEntry *entry;
+
+
+    /*
+     *  If there is any problem finding the info, return an error.
+     */
+    objsWithArchInfo = ItkGetObjsWithArchInfo(interp);
+    entry = Tcl_FindHashEntry(objsWithArchInfo, (char*)contextObj);
+
+    if (!entry) {
+	Tcl_AppendResult(interp,
+	    "internal error: no Archetype information for widget",
+	    (char*)NULL);
+
+	if (contextObj->accessCmd) {
+	    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
+	    Tcl_AppendToObj(resultPtr, " \"", -1);
+	    Tcl_GetCommandFullName(interp, contextObj->accessCmd, resultPtr);
+	    Tcl_AppendToObj(resultPtr, "\"", -1);
+	}
+	return TCL_ERROR;
+    }
+
+    /*
+     *  Otherwise, return the requested info.
+     */
+    *infoPtr = (ArchInfo*)Tcl_GetHashValue(entry);
+    return TCL_OK;
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  ItkGetObjsWithArchInfo()
+ *
+ *  Returns a pointer to a hash table containing the list of registered
+ *  objects in the specified interpreter.  If the hash table does not
+ *  already exist, it is created.
+ * ------------------------------------------------------------------------
+ */
+Tcl_HashTable*
+ItkGetObjsWithArchInfo(
+    Tcl_Interp *interp)  /* interpreter handling this registration */
+{
+    Tcl_HashTable* objTable;
+
+    /*
+     *  If the registration table does not yet exist, then create it.
+     */
+    objTable = (Tcl_HashTable*)Tcl_GetAssocData(interp,
+	"itk_objsWithArchInfo", (Tcl_InterpDeleteProc**)NULL);
+
+    if (!objTable) {
+	objTable = (Tcl_HashTable*)Tcl_Alloc(sizeof(Tcl_HashTable));
+	Tcl_InitHashTable(objTable, TCL_ONE_WORD_KEYS);
+	Tcl_SetAssocData(interp, "itk_objsWithArchInfo",
+	    ItkFreeObjsWithArchInfo, (void *)objTable);
+    }
+    return objTable;
+}
+
+/*
+ * ------------------------------------------------------------------------
+ *  ItkFreeObjsWithArchInfo()
+ *
+ *  When an interpreter is deleted, this procedure is called to
+ *  free up the associated data created by ItkGetObjsWithArchInfo.
+ * ------------------------------------------------------------------------
+ */
+void
+ItkFreeObjsWithArchInfo(
+    void *clientData,       /* associated data */
+    TCL_UNUSED(Tcl_Interp *))          /* interpreter being freed */
+{
+    Tcl_HashTable *tablePtr = (Tcl_HashTable*)clientData;
+    Tcl_HashSearch place;
+    Tcl_HashEntry *entry;
+
+    entry = Tcl_FirstHashEntry(tablePtr, &place);
+    while (entry) {
+	Itk_DelArchInfo( Tcl_GetHashValue(entry) );
+	entry = Tcl_NextHashEntry(&place);
+    }
+
+    Tcl_DeleteHashTable(tablePtr);
+    Tcl_Free(tablePtr);
+}
+

generic/itkInt.h

@@ -0,0 +1,233 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           http://www.tcltk.com/itcl
+ * ========================================================================
+ *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
+ * ------------------------------------------------------------------------
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include <itclInt.h>
+#include "itk.h"
+
+#if (TCL_MAJOR_VERSION == 8)
+#undef Tcl_Free
+#undef Tcl_Realloc
+#if defined(USE_TCL_STUBS)
+#   define Tcl_Free(p) tclStubsPtr->tcl_Free((char *)(p))
+#   define Tcl_Realloc(p,m) tclStubsPtr->tcl_Realloc((char *)(p),(m))
+#else
+#   define Tcl_Free(p) Tcl_Free((char *)(p))
+#   define Tcl_Realloc(p,m) Tcl_Realloc((char *)(p),(m))
+#endif
+#endif
+
+/*
+ *  List of options in alphabetical order:
+ */
+typedef struct ItkOptList {
+    Tcl_HashTable *options;     /* list containing the real options */
+    Tcl_HashEntry **list;       /* gives ordering of options */
+    int len;                    /* number of entries in order list */
+    int max;                    /* maximum size of order list */
+} ItkOptList;
+
+/*
+ *  List of options created in the class definition:
+ */
+typedef struct ItkClassOptTable {
+    Tcl_HashTable options;        /* option storage with fast lookup */
+    ItkOptList order;             /* gives ordering of options */
+} ItkClassOptTable;
+
+/*
+ *  Each option created in the class definition:
+ */
+typedef struct ItkClassOption {
+    Tcl_Obj* namePtr;           /* member name */
+    Tcl_Obj* fullNamePtr;       /* member name with "class::" qualifier */
+    ItclClass* iclsPtr;         /* class containing this member */
+    int protection;             /* protection level */
+    int flags;                  /* flags describing member (see above) */
+    ItclMemberCode *codePtr;    /* code associated with member */
+    char *resName;                /* resource name in X11 database */
+    char *resClass;               /* resource class name in X11 database */
+    char *init;                   /* initial value for option */
+} ItkClassOption;
+
+
+/*
+ *  Info associated with each Archetype mega-widget:
+ */
+typedef struct ArchInfo {
+    ItclObject *itclObj;        /* object containing this info */
+    Tk_Window tkwin;            /* window representing this mega-widget */
+    Tcl_HashTable components;   /* list of all mega-widget components */
+    Tcl_HashTable options;      /* list of all mega-widget options */
+    ItkOptList order;           /* gives ordering of options */
+} ArchInfo;
+
+/*
+ *  Each component widget in an Archetype mega-widget:
+ */
+typedef struct ArchComponent {
+    Tcl_Obj* namePtr;           /* member name */
+    Tcl_Obj* fullNamePtr;       /* member name with "class::" qualifier */
+    ItclClass* iclsPtr;         /* class containing this member */
+    int protection;             /* protection level */
+    int flags;                  /* flags describing member (see above) */
+    ItclMemberCode *codePtr;    /* code associated with member */
+    Tcl_Command accessCmd;      /* access command for component widget */
+    Tk_Window tkwin;            /* Tk window for this component widget */
+    char *pathName;             /* Tk path name for this component widget.
+				   We can't use the tkwin pointer after
+				   the window has been destroyed so we
+				   need to save a copy for use in
+				   Itk_ArchCompDeleteCmd() */
+} ArchComponent;
+
+/*
+ *  Each option in an Archetype mega-widget:
+ */
+typedef struct ArchOption {
+    char *switchName;           /* command-line switch for this option */
+    char *resName;              /* resource name in X11 database */
+    char *resClass;             /* resource class name in X11 database */
+    char *init;                 /* initial value for option */
+    int flags;                  /* flags representing option state */
+    Itcl_List parts;            /* parts relating to this option */
+} ArchOption;
+
+/*
+ *  Flag bits for ArchOption state:
+ */
+#define ITK_ARCHOPT_INIT  0x01  /* option has been initialized */
+
+/*
+ *  Various parts of a composite option in an Archetype mega-widget:
+ */
+typedef int (Itk_ConfigOptionPartProc) (Tcl_Interp *interp,
+    ItclObject *contextObj, void *cdata, const char* newVal);
+
+typedef struct ArchOptionPart {
+    void *clientData;                 /* data associated with this part */
+    Itk_ConfigOptionPartProc *configProc;  /* update when new vals arrive */
+    Tcl_CmdDeleteProc *deleteProc;         /* clean up after clientData */
+
+    void *from;                       /* token that indicates who
+					    * contributed this option part */
+} ArchOptionPart;
+
+
+/*
+ *  Info kept by the itk::option-parser namespace and shared by
+ *  all option processing commands:
+ */
+typedef struct ArchMergeInfo {
+    Tcl_HashTable usualCode;      /* usual option handling code for the
+				   * various widget classes */
+
+    ArchInfo *archInfo;           /* internal option info for mega-widget */
+    ArchComponent *archComp;      /* component being merged into mega-widget */
+    Tcl_HashTable *optionTable;   /* table of valid configuration options
+				   * for component being merged */
+} ArchMergeInfo;
+
+/*
+ *  Used to capture component widget configuration options when a
+ *  new component is being merged into a mega-widget:
+ */
+typedef struct GenericConfigOpt {
+    char *switchName;             /* command-line switch for this option */
+    char *resName;                /* resource name in X11 database */
+    char *resClass;               /* resource class name in X11 database */
+    char *init;                   /* initial value for this option */
+    char *value;                  /* current value for this option */
+    char **storage;               /* storage for above strings */
+
+    ArchOption *integrated;       /* integrated into this mega-widget option */
+    ArchOptionPart *optPart;      /* integrated as this option part */
+} GenericConfigOpt;
+
+/*
+ *  Options that are propagated by a "configure" method:
+ */
+typedef struct ConfigCmdline {
+    Tcl_Obj *objv[4];           /* objects representing "configure" command */
+} ConfigCmdline;
+
+MODULE_SCOPE int Itk_ArchInitOptsCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchDeleteOptsCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchComponentCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchInitCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptionCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCompAccessCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchConfigureCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCgetCmd (void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+
+MODULE_SCOPE int Itk_ArchCompAddCmd(void *cdata,
+    Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCompDeleteCmd(void *cdata,
+    Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchConfigOption(Tcl_Interp *interp,
+    ArchInfo *info, char *name, char *value);
+MODULE_SCOPE int Itk_ArchOptionAddCmd(void *cdata,
+    Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptionRemoveCmd(void *cdata,
+    Tcl_Interp *interp, Tcl_Size objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_PropagatePublicVar(Tcl_Interp *interp,
+    ItclObject *contextObj, void *cdata, const char *newval);
+MODULE_SCOPE int Itk_GetArchInfo(Tcl_Interp *interp,
+    ItclObject* contextObj, ArchInfo **infoPtr);
+MODULE_SCOPE void Itk_ArchOptConfigError(Tcl_Interp *interp,
+    ArchInfo *info, ArchOption *archOpt);
+MODULE_SCOPE void Itk_ArchOptAccessError(Tcl_Interp *interp,
+    ArchInfo *info, ArchOption *archOpt);
+MODULE_SCOPE ArchOptionPart* Itk_CreateOptionPart(
+    Tcl_Interp *interp, void *cdata, Itk_ConfigOptionPartProc* cproc,
+    Tcl_CmdDeleteProc *dproc, void *from);
+MODULE_SCOPE int Itk_AddOptionPart(Tcl_Interp *interp,
+    ArchInfo *info, char *switchName, char *resName, char *resClass,
+    const char *defVal, char *currVal, ArchOptionPart *optPart,
+    ArchOption **raOpt);
+MODULE_SCOPE ArchOptionPart* Itk_FindArchOptionPart(
+    ArchInfo *info, char *switchName, void *from);
+MODULE_SCOPE void Itk_DelOptionPart(ArchOptionPart *optPart);
+MODULE_SCOPE void Itk_DelArchInfo(void *cdata);
+MODULE_SCOPE Tcl_HashTable* ItkGetObjsWithArchInfo
+    (Tcl_Interp *interp);
+MODULE_SCOPE void ItkFreeObjsWithArchInfo(void *cdata,
+    Tcl_Interp *interp);
+MODULE_SCOPE void Itk_DelMergeInfo(void *cdata);
+MODULE_SCOPE int Itk_ArchOptKeepCmd(void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptIgnoreCmd(void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptRenameCmd(void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptUsualCmd(void *cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+
+
+#include "itkIntDecls.h"

generic/itkIntDecls.h

@@ -0,0 +1,144 @@
+
+/* !BEGIN!: Do not edit below this line. */
+
+#define ITKINT_STUBS_EPOCH 0
+#define ITKINT_STUBS_REVISION 17
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* Slot 0 is reserved */
+/* Slot 1 is reserved */
+/* 2 */
+ITKAPI int		Itk_ConfigBodyCmd(void *cdata, Tcl_Interp *interp,
+				int objc, Tcl_Obj *const objv[]);
+/* 3 */
+ITKAPI int		Itk_UsualCmd(void *cdata, Tcl_Interp *interp,
+				int objc, Tcl_Obj *const objv[]);
+/* 4 */
+ITKAPI int		Itk_ClassOptionDefineCmd(void *cdata,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 5 */
+ITKAPI int		Itk_ClassOptionIllegalCmd(void *cdata,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 6 */
+ITKAPI int		Itk_ConfigClassOption(Tcl_Interp *interp,
+				ItclObject *contextObj, void *cdata,
+				const char *newVal);
+/* 7 */
+ITKAPI ItkClassOptTable* Itk_CreateClassOptTable(Tcl_Interp *interp,
+				ItclClass *cdefn);
+/* 8 */
+ITKAPI ItkClassOptTable* Itk_FindClassOptTable(ItclClass *cdefn);
+/* Slot 9 is reserved */
+/* 10 */
+ITKAPI int		Itk_CreateClassOption(Tcl_Interp *interp,
+				ItclClass *cdefn, const char *switchName,
+				const char *resName, const char *resClass,
+				const char *defVal, const char *config,
+				ItkClassOption **optPtr);
+/* 11 */
+ITKAPI ItkClassOption*	Itk_FindClassOption(ItclClass *cdefn,
+				const char *switchName);
+/* 12 */
+ITKAPI void		Itk_DelClassOption(ItkClassOption *opt);
+/* Slot 13 is reserved */
+/* 14 */
+ITKAPI void		Itk_OptListInit(ItkOptList *olist,
+				Tcl_HashTable *options);
+/* 15 */
+ITKAPI void		Itk_OptListFree(ItkOptList *olist);
+/* 16 */
+ITKAPI void		Itk_OptListAdd(ItkOptList *olist,
+				Tcl_HashEntry *entry);
+/* 17 */
+ITKAPI void		Itk_OptListRemove(ItkOptList *olist,
+				Tcl_HashEntry *entry);
+
+typedef struct ItkIntStubs {
+    int magic;
+    int epoch;
+    int revision;
+    void *hooks;
+
+    void (*reserved0)(void);
+    void (*reserved1)(void);
+    int (*itk_ConfigBodyCmd) (void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 2 */
+    int (*itk_UsualCmd) (void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 3 */
+    int (*itk_ClassOptionDefineCmd) (void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 4 */
+    int (*itk_ClassOptionIllegalCmd) (void *cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 5 */
+    int (*itk_ConfigClassOption) (Tcl_Interp *interp, ItclObject *contextObj, void *cdata, const char *newVal); /* 6 */
+    ItkClassOptTable* (*itk_CreateClassOptTable) (Tcl_Interp *interp, ItclClass *cdefn); /* 7 */
+    ItkClassOptTable* (*itk_FindClassOptTable) (ItclClass *cdefn); /* 8 */
+    void (*reserved9)(void);
+    int (*itk_CreateClassOption) (Tcl_Interp *interp, ItclClass *cdefn, const char *switchName, const char *resName, const char *resClass, const char *defVal, const char *config, ItkClassOption **optPtr); /* 10 */
+    ItkClassOption* (*itk_FindClassOption) (ItclClass *cdefn, const char *switchName); /* 11 */
+    void (*itk_DelClassOption) (ItkClassOption *opt); /* 12 */
+    void (*reserved13)(void);
+    void (*itk_OptListInit) (ItkOptList *olist, Tcl_HashTable *options); /* 14 */
+    void (*itk_OptListFree) (ItkOptList *olist); /* 15 */
+    void (*itk_OptListAdd) (ItkOptList *olist, Tcl_HashEntry *entry); /* 16 */
+    void (*itk_OptListRemove) (ItkOptList *olist, Tcl_HashEntry *entry); /* 17 */
+} ItkIntStubs;
+
+extern const ItkIntStubs *itkIntStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_ITK_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+/* Slot 0 is reserved */
+/* Slot 1 is reserved */
+#define Itk_ConfigBodyCmd \
+	(itkIntStubsPtr->itk_ConfigBodyCmd) /* 2 */
+#define Itk_UsualCmd \
+	(itkIntStubsPtr->itk_UsualCmd) /* 3 */
+#define Itk_ClassOptionDefineCmd \
+	(itkIntStubsPtr->itk_ClassOptionDefineCmd) /* 4 */
+#define Itk_ClassOptionIllegalCmd \
+	(itkIntStubsPtr->itk_ClassOptionIllegalCmd) /* 5 */
+#define Itk_ConfigClassOption \
+	(itkIntStubsPtr->itk_ConfigClassOption) /* 6 */
+#define Itk_CreateClassOptTable \
+	(itkIntStubsPtr->itk_CreateClassOptTable) /* 7 */
+#define Itk_FindClassOptTable \
+	(itkIntStubsPtr->itk_FindClassOptTable) /* 8 */
+/* Slot 9 is reserved */
+#define Itk_CreateClassOption \
+	(itkIntStubsPtr->itk_CreateClassOption) /* 10 */
+#define Itk_FindClassOption \
+	(itkIntStubsPtr->itk_FindClassOption) /* 11 */
+#define Itk_DelClassOption \
+	(itkIntStubsPtr->itk_DelClassOption) /* 12 */
+/* Slot 13 is reserved */
+#define Itk_OptListInit \
+	(itkIntStubsPtr->itk_OptListInit) /* 14 */
+#define Itk_OptListFree \
+	(itkIntStubsPtr->itk_OptListFree) /* 15 */
+#define Itk_OptListAdd \
+	(itkIntStubsPtr->itk_OptListAdd) /* 16 */
+#define Itk_OptListRemove \
+	(itkIntStubsPtr->itk_OptListRemove) /* 17 */
+
+#endif /* defined(USE_ITK_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+struct ItkStubAPI {
+    ItkStubs *stubsPtr;
+    ItkIntStubs *intStubsPtr;
+};
+

generic/itkOption.c

@@ -15,25 +15,23 @@
  *           Bell Labs Innovations for Lucent Technologies
  *           mmclennan@lucent.com
  *           http://www.tcltk.com/itcl
- *
- *     RCS:  $Id: itk_option.c,v 1.1 1998/07/27 18:45:25 stanton Exp $
  * ========================================================================
  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
  * ------------------------------------------------------------------------
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
-#include "itk.h"
+#include "itkInt.h"
 
 /*
  *  FORWARD DECLARATIONS
  */
-static char* ItkTraceClassDestroy _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, char *name1, char *name2, int flags));
-static Tcl_HashTable* ItkGetClassesWithOptInfo _ANSI_ARGS_((
-    Tcl_Interp *interp));
-static void ItkFreeClassesWithOptInfo _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp));
+static char* ItkTraceClassDestroy (void *cdata,
+    Tcl_Interp *interp, const char *name1, const char *name2, int flags);
+static Tcl_HashTable* ItkGetClassesWithOptInfo (
+    Tcl_Interp *interp);
+static void ItkFreeClassesWithOptInfo (void *cdata,
+    Tcl_Interp *interp);
 
 
 /*
@@ -55,65 +53,74 @@ static void ItkFreeClassesWithOptInfo _ANSI_ARGS_((ClientData cdata,
  *  Returns TCL_OK/TCL_ERROR to indicate success/failure.
  * ------------------------------------------------------------------------
  */
-/* ARGSUSED */
 int
-Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
-    ClientData clientData;   /* class parser info */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
+Itk_ClassOptionDefineCmd(
+    void *clientData,        /* class parser info */
+    Tcl_Interp *interp,      /* current interpreter */
+    int objc,                /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
 {
     ItclObjectInfo *info = (ItclObjectInfo*)clientData;
-    ItclClass *cdefn = (ItclClass*)Itcl_PeekStack(&info->cdefnStack);
+    ItclClass *iclsPtr = (ItclClass*)Itcl_PeekStack(&info->clsStack);
 
     int newEntry;
-    char *switchName, *resName, *resClass, *init, *config;
+    const char *switchName;
+    const char *resName;
+    const char *resClass;
+    const char *init;
+    const char *config;
     ItkClassOptTable *optTable;
     Tcl_HashEntry *entry;
     ItkClassOption *opt;
 
+    ItclShowArgs(1, "Itk_ClassOptionDefineCmd", objc, objv);
     /*
      *  Make sure that the arguments look right.  The option switch
      *  name must start with a '-'.
      */
     if (objc < 5 || objc > 6) {
-        Tcl_WrongNumArgs(interp, 1, objv,
-            "-switch resourceName resourceClass init ?config?");
-        return TCL_ERROR;
+	Tcl_WrongNumArgs(interp, 1, objv,
+		"-switch resourceName resourceClass init ?config?");
+	return TCL_ERROR;
     }
 
-    switchName = Tcl_GetStringFromObj(objv[1], (int*)NULL);
+    switchName = Tcl_GetString(objv[1]);
     if (*switchName != '-') {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "bad option name \"", switchName, "\": should be -", switchName,
-            (char*)NULL);
-        return TCL_ERROR;
+	Tcl_AppendResult(interp,
+		"bad option name \"", switchName, "\": should be -",
+		switchName, (char*)NULL);
+	return TCL_ERROR;
     }
     if (strstr(switchName, ".")) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "bad option name \"", switchName, "\": illegal character \".\"",
-            (char*)NULL);
-        return TCL_ERROR;
+	Tcl_AppendResult(interp,
+		"bad option name \"", switchName,
+		"\": illegal character \".\"", (char*)NULL);
+	return TCL_ERROR;
     }
 
-    resName = Tcl_GetStringFromObj(objv[2], (int*)NULL);
+    resName = Tcl_GetString(objv[2]);
     if (!islower((int)*resName)) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "bad resource name \"", resName,
-            "\": should start with a lower case letter",
-            (char*)NULL);
-        return TCL_ERROR;
+	Tcl_AppendResult(interp,
+		"bad resource name \"", resName,
+		"\": should start with a lower case letter",
+		(char*)NULL);
+	return TCL_ERROR;
     }
 
-    resClass = Tcl_GetStringFromObj(objv[3], (int*)NULL);
+    resClass = Tcl_GetString(objv[3]);
     if (!isupper((int)*resClass)) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "bad resource class \"", resClass,
-            "\": should start with an upper case letter",
-            (char*)NULL);
-        return TCL_ERROR;
+	Tcl_AppendResult(interp,
+	       "bad resource class \"", resClass,
+	       "\": should start with an upper case letter",
+	       (char*)NULL);
+	return TCL_ERROR;
     }
 
+    if (iclsPtr == NULL) {
+	Tcl_AppendResult(interp, "can only handle options on class level",
+		NULL);
+	return TCL_ERROR;
+    }
     /*
      *  Make sure that this option has not already been defined in
      *  the context of this class.  Options can be redefined in
@@ -122,35 +129,35 @@ Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
      *  which option is being referenced if the configuration code
      *  is redefined by a subsequent "body" command.
      */
-    optTable = Itk_CreateClassOptTable(interp, cdefn);
+    optTable = Itk_CreateClassOptTable(interp, iclsPtr);
     entry = Tcl_CreateHashEntry(&optTable->options, switchName, &newEntry);
 
     if (!newEntry) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "option \"", switchName, "\" already defined in class \"",
-            cdefn->fullname, "\"",
-            (char*)NULL);
-        return TCL_ERROR;
+	Tcl_AppendResult(interp,
+		"option \"", switchName, "\" already defined in class \"",
+		Tcl_GetString(iclsPtr->fullNamePtr), "\"",
+		(char*)NULL);
+	return TCL_ERROR;
     }
 
     /*
      *  Create a new option record and add it to the table for this
      *  class.
      */
-    init = Tcl_GetStringFromObj(objv[4], (int*)NULL);
+    init = Tcl_GetString(objv[4]);
 
     if (objc == 6) {
-        config = Tcl_GetStringFromObj(objv[5], (int*)NULL);
+	config = Tcl_GetString(objv[5]);
     } else {
-        config = NULL;
+	config = NULL;
     }
 
-    if (Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
-        init, config, &opt) != TCL_OK) {
-        return TCL_ERROR;
+    if (Itk_CreateClassOption(interp, iclsPtr, switchName, resName, resClass,
+	    init, config, &opt) != TCL_OK) {
+	return TCL_ERROR;
     }
 
-    Tcl_SetHashValue(entry, (ClientData)opt);
+    Tcl_SetHashValue(entry, (void *)opt);
     Itk_OptListAdd(&optTable->order, entry);
     return TCL_OK;
 }
@@ -166,20 +173,19 @@ Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
  *  been created.  Returns TCL_ERROR along with an error message.
  * ------------------------------------------------------------------------
  */
-/* ARGSUSED */
 int
-Itk_ClassOptionIllegalCmd(clientData, interp, objc, objv)
-    ClientData clientData;   /* class parser info */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
+Itk_ClassOptionIllegalCmd(
+    TCL_UNUSED(void *),      /* class parser info */
+    Tcl_Interp *interp,      /* current interpreter */
+    TCL_UNUSED(int),         /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
 {
-    char *op = Tcl_GetStringFromObj(objv[0], (int*)NULL);
+    char *op = Tcl_GetString(objv[0]);
 
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-        "can only ", op, " options for a specific widget\n",
-        "(move this command into the constructor)",
-        (char*)NULL);
+    Tcl_AppendResult(interp,
+	    "can only ", op, " options for a specific widget\n",
+	    "(move this command into the constructor)",
+	    (char*)NULL);
 
     return TCL_ERROR;
 }
@@ -198,26 +204,81 @@ Itk_ClassOptionIllegalCmd(clientData, interp, objc, objv)
  *  message in the interpreter) if anything goes wrong.
  * ------------------------------------------------------------------------
  */
-/* ARGSUSED */
 int
-Itk_ConfigClassOption(interp, contextObj, cdata, newval)
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    ItclObject *contextObj;    /* object being configured */
-    ClientData cdata;          /* class option */
-    char *newval;              /* new value for this option */
+Itk_ConfigClassOption(
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    ItclObject *contextObj,    /* object being configured */
+    void *cdata,               /* class option */
+    TCL_UNUSED(const char *))  /* new value for this option */
 {
     ItkClassOption *opt = (ItkClassOption*)cdata;
     int result = TCL_OK;
     ItclMemberCode *mcode;
+    Tcl_CallFrame frame;
 
     /*
      *  If the option has any config code, execute it now.
      *  Make sure that the namespace context is set up correctly.
      */
-    mcode = opt->member->code;
-    if (mcode && mcode->procPtr->bodyPtr) {
-        result = Itcl_EvalMemberCode(interp, (ItclMemberFunc*)NULL,
-            opt->member, contextObj, 0, (Tcl_Obj**)NULL);
+    mcode = opt->codePtr;
+    if (mcode && mcode->bodyPtr) {
+
+	Itcl_PushCallFrame(interp, &frame, opt->iclsPtr->nsPtr, 1);
+	Itcl_SetContext(interp, contextObj);
+
+	result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
+
+	Itcl_UnsetContext(interp);
+	Itcl_PopCallFrame(interp);
+
+	/*
+	 * Here we engage in some ugly hackery workaround until
+	 * someone has time to come back and implement this
+	 * properly.
+	 *
+	 * In Itcl/Itk 3, the same machinery was used to implement
+	 * method invocation and configbody invocation, and the
+	 * code here looked like:
+	 *
+
+	result = Itcl_EvalMemberCode(interp, (ItclMemberFunc*)NULL,
+	    opt->member, contextObj, 0, (Tcl_Obj**)NULL);
+
+	 *
+	 * In Itcl 4, Itcl methods have become (a particular variant)
+	 * of TclOO methods.  It's not clear whether config bodies
+	 * should also do that, or what?
+	 *
+	 * Instead the existing solution above has been to just "eval"
+	 * the configbody body script in a suitable context, which
+	 * works very nearly correctly.  The trouble is that unlike
+	 * method invocation, we've not pushed a proper frame, nor
+	 * have we unwound a return level, so when the "eval" returns
+	 * TCL_RETURN we've not been handling that right.  You will
+	 * find some configbody bodies out there that expect to be
+	 * able to use [return] for early exit.  Iwidgets test
+	 * Extbutton-2.8 is an example.
+	 *
+	 * As a cheap workaround, we put in explicit special treatment
+	 * for (result == TCL_RETURN) here.  This is essentially a
+	 * reproduction of the Tcl internal routine TclUpdateReturnInfo()
+	 * but without the benefit of internals access.
+	 */
+
+	if (result == TCL_RETURN) {
+	    Tcl_Obj *opts = Tcl_GetReturnOptions(interp, TCL_RETURN);
+	    Tcl_Obj *levelKey = Tcl_NewStringObj("-level", -1);
+	    Tcl_Obj *levelObj;
+	    int level;
+
+	    Tcl_DictObjGet(NULL, opts, levelKey, &levelObj);
+	    Tcl_GetIntFromObj(NULL, levelObj, &level);
+
+	    Tcl_DictObjPut(NULL, opts, levelKey, Tcl_NewIntObj(--level));
+	    result = Tcl_SetReturnOptions(interp, opts);
+
+	    Tcl_DecrRefCount(levelKey);
+	}
     }
     return result;
 }
@@ -242,9 +303,9 @@ Itk_ConfigClassOption(interp, contextObj, cdata, newval)
  * ------------------------------------------------------------------------
  */
 ItkClassOptTable*
-Itk_CreateClassOptTable(interp, cdefn)
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    ItclClass *cdefn;          /* class definition */
+Itk_CreateClassOptTable(
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    ItclClass *iclsPtr)        /* class definition */
 {
     int newEntry, result;
     Tcl_HashTable *itkClasses;
@@ -263,26 +324,25 @@ Itk_CreateClassOptTable(interp, cdefn)
      */
     itkClasses = ItkGetClassesWithOptInfo(interp);
 
-    entry = Tcl_CreateHashEntry(itkClasses, (char*)cdefn, &newEntry);
+    entry = Tcl_CreateHashEntry(itkClasses, (char*)iclsPtr, &newEntry);
     if (newEntry) {
-        optTable = (ItkClassOptTable*)ckalloc(sizeof(ItkClassOptTable));
-        Tcl_InitHashTable(&optTable->options, TCL_STRING_KEYS);
-        Itk_OptListInit(&optTable->order, &optTable->options);
+	optTable = (ItkClassOptTable*)Tcl_Alloc(sizeof(ItkClassOptTable));
+	Tcl_InitHashTable(&optTable->options, TCL_STRING_KEYS);
+	Itk_OptListInit(&optTable->order, &optTable->options);
 
-        Tcl_SetHashValue(entry, (ClientData)optTable);
+	Tcl_SetHashValue(entry, (void *)optTable);
 
-        result = Tcl_PushCallFrame(interp, &frame,
-             cdefn->namesp, /* isProcCallFrame */ 0);
+	result = Itcl_PushCallFrame(interp, &frame,
+	     iclsPtr->nsPtr, /* isProcCallFrame */ 0);
 
-        if (result == TCL_OK) {
-            Tcl_TraceVar(interp, "_itk_option_data",
-                (TCL_TRACE_UNSETS | TCL_NAMESPACE_ONLY),
-                ItkTraceClassDestroy, (ClientData)cdefn);
-            Tcl_PopCallFrame(interp);
-        }
-    }
-    else {
-        optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
+	if (result == TCL_OK) {
+	    Tcl_TraceVar(interp, "_itk_option_data",
+		    (TCL_TRACE_UNSETS | TCL_NAMESPACE_ONLY),
+		    ItkTraceClassDestroy, (void *)iclsPtr);
+	    Itcl_PopCallFrame(interp);
+	}
+    } else {
+	optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
     }
     return optTable;
 }
@@ -303,8 +363,8 @@ Itk_CreateClassOptTable(interp, cdefn)
  * ------------------------------------------------------------------------
  */
 ItkClassOptTable*
-Itk_FindClassOptTable(cdefn)
-    ItclClass *cdefn;          /* class definition */
+Itk_FindClassOptTable(
+    ItclClass *iclsPtr)          /* class definition */
 {
     Tcl_HashTable *itkClasses;
     Tcl_HashEntry *entry;
@@ -312,10 +372,10 @@ Itk_FindClassOptTable(cdefn)
     /*
      *  Look for the specified class definition in the table.
      */
-    itkClasses = ItkGetClassesWithOptInfo(cdefn->interp);
-    entry = Tcl_FindHashEntry(itkClasses, (char*)cdefn);
+    itkClasses = ItkGetClassesWithOptInfo(iclsPtr->interp);
+    entry = Tcl_FindHashEntry(itkClasses, (char*)iclsPtr);
     if (entry) {
-        return (ItkClassOptTable*)Tcl_GetHashValue(entry);
+	return (ItkClassOptTable*)Tcl_GetHashValue(entry);
     }
     return NULL;
 }
@@ -335,16 +395,15 @@ Itk_FindClassOptTable(cdefn)
  *  error that is encountered.
  * ------------------------------------------------------------------------
  */
-/* ARGSUSED */
 static char*
-ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
-    ClientData cdata;          /* class definition data */
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    char *name1;               /* name of variable involved in trace */
-    char *name2;               /* name of array element within variable */
-    int flags;                 /* flags describing trace */
+ItkTraceClassDestroy(
+    void *cdata,               /* class definition data */
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    TCL_UNUSED(const char *),  /* name of variable involved in trace */
+    TCL_UNUSED(const char *),  /* name of array element within variable */
+    TCL_UNUSED(int))           /* flags describing trace */
 {
-    ItclClass *cdefn = (ItclClass*)cdata;
+    ItclClass *iclsPtr = (ItclClass*)cdata;
 
     Tcl_HashTable *itkClasses;
     Tcl_HashEntry *entry;
@@ -357,21 +416,21 @@ ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
      *  If it is found, delete all the option records and tear
      *  down the table.
      */
-    itkClasses = ItkGetClassesWithOptInfo(cdefn->interp);
-    entry = Tcl_FindHashEntry(itkClasses, (char*)cdefn);
+    itkClasses = ItkGetClassesWithOptInfo(interp);
+    entry = Tcl_FindHashEntry(itkClasses, (char*)iclsPtr);
     if (entry) {
-        optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
-        Tcl_DeleteHashEntry(entry);
+	optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
+	Tcl_DeleteHashEntry(entry);
 
-        entry = Tcl_FirstHashEntry(&optTable->options, &place);
-        while (entry) {
-            opt = (ItkClassOption*)Tcl_GetHashValue(entry);
-            Itk_DelClassOption(opt);
-            entry = Tcl_NextHashEntry(&place);
-        }
-        Tcl_DeleteHashTable(&optTable->options);
-        Itk_OptListFree(&optTable->order);
-        ckfree((char*)optTable);
+	entry = Tcl_FirstHashEntry(&optTable->options, &place);
+	while (entry) {
+	    opt = (ItkClassOption*)Tcl_GetHashValue(entry);
+	    Itk_DelClassOption(opt);
+	    entry = Tcl_NextHashEntry(&place);
+	}
+	Tcl_DeleteHashTable(&optTable->options);
+	Itk_OptListFree(&optTable->order);
+	Tcl_Free(optTable);
     }
     return NULL;
 }
@@ -392,17 +451,15 @@ ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
  * ------------------------------------------------------------------------
  */
 int
-Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
-    defVal, config, optPtr)
-
-    Tcl_Interp *interp;            /* interpreter managing the class */
-    ItclClass *cdefn;              /* class containing this option */
-    char *switchName;              /* name of command-line switch */
-    char *resName;                 /* resource name in X11 database */
-    char *resClass;                /* resource class name in X11 database */
-    char *defVal;                  /* last-resort default value */
-    char *config;                  /* configuration code */
-    ItkClassOption **optPtr;       /* returns: option record */
+Itk_CreateClassOption(
+    Tcl_Interp *interp,            /* interpreter managing the class */
+    ItclClass *iclsPtr,            /* class containing this option */
+    const char *switchName,        /* name of command-line switch */
+    const char *resName,           /* resource name in X11 database */
+    const char *resClass,          /* resource class name in X11 database */
+    const char *defVal,            /* last-resort default value */
+    const char *config,            /* configuration code */
+    ItkClassOption **optPtr)       /* returns: option record */
 {
     ItkClassOption *opt;
     ItclMemberCode *mcode;
@@ -412,32 +469,42 @@ Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
      *  an implementation for it.
      */
     if (config) {
-        if (Itcl_CreateMemberCode(interp, cdefn, (char*)NULL, config,
-            &mcode) != TCL_OK) {
+	if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, config,
+	    &mcode) != TCL_OK) {
 
-            return TCL_ERROR;
-        }
-        Itcl_PreserveData((ClientData)mcode);
-        Itcl_EventuallyFree((ClientData)mcode, Itcl_DeleteMemberCode);
-    }
-    else {
-        mcode = NULL;
+	    return TCL_ERROR;
+	}
+	Itcl_PreserveData((void *)mcode);
+#ifdef NOTDEF
+	Itcl_EventuallyFree((void *)mcode, (Tcl_FreeProc *)Itcl_DeleteMemberCode);
+#endif
+    } else {
+	mcode = NULL;
     }
 
     /*
      *  Create the record to represent this option.
      */
-    opt = (ItkClassOption*)ckalloc(sizeof(ItkClassOption));
-    opt->member = Itcl_CreateMember(interp, cdefn, switchName);
-    opt->member->code = mcode;
+    opt = (ItkClassOption*)Tcl_Alloc(sizeof(ItkClassOption));
+    memset(opt, 0, sizeof(ItkClassOption));
+    opt->iclsPtr      = iclsPtr;
+    opt->flags        = 0;
+    opt->protection   = Itcl_Protection(interp, 0);
+    opt->namePtr      = Tcl_NewStringObj(switchName, -1);
+    Tcl_IncrRefCount(opt->namePtr);
+    opt->fullNamePtr = Tcl_NewStringObj(Tcl_GetString(iclsPtr->fullNamePtr), -1);
+    Tcl_AppendToObj(opt->fullNamePtr, "::", 2);
+    Tcl_AppendToObj(opt->fullNamePtr, switchName, -1);
+    Tcl_IncrRefCount(opt->fullNamePtr);
+    opt->codePtr = mcode;
 
-    opt->resName = (char*)ckalloc((unsigned)(strlen(resName)+1));
+    opt->resName = (char*)Tcl_Alloc((strlen(resName)+1));
     strcpy(opt->resName, resName);
 
-    opt->resClass = (char*)ckalloc((unsigned)(strlen(resClass)+1));
+    opt->resClass = (char*)Tcl_Alloc((strlen(resClass)+1));
     strcpy(opt->resClass, resClass);
 
-    opt->init = (char*)ckalloc((unsigned)(strlen(defVal)+1));
+    opt->init = (char*)Tcl_Alloc((strlen(defVal)+1));
     strcpy(opt->init, defVal);
 
     *optPtr = opt;
@@ -459,9 +526,9 @@ Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
  * ------------------------------------------------------------------------
  */
 ItkClassOption*
-Itk_FindClassOption(cdefn, switchName)
-    ItclClass *cdefn;              /* class containing this option */
-    char *switchName;              /* name of command-line switch */
+Itk_FindClassOption(
+    ItclClass *iclsPtr,            /* class containing this option */
+    const char *switchName)        /* name of command-line switch */
 {
     ItkClassOption *opt = NULL;
 
@@ -474,21 +541,21 @@ Itk_FindClassOption(cdefn, switchName)
      */
     Tcl_DStringInit(&buffer);
     if (*switchName != '-') {
-        Tcl_DStringAppend(&buffer, "-", -1);
-        Tcl_DStringAppend(&buffer, switchName, -1);
-        switchName = Tcl_DStringValue(&buffer);
+	Tcl_DStringAppend(&buffer, "-", -1);
+	Tcl_DStringAppend(&buffer, switchName, -1);
+	switchName = Tcl_DStringValue(&buffer);
     }
 
     /*
      *  Look for the option table for the specified class, and check
      *  for the requested switch.
      */
-    optTable = Itk_FindClassOptTable(cdefn);
+    optTable = Itk_FindClassOptTable(iclsPtr);
     if (optTable) {
-        entry = Tcl_FindHashEntry(&optTable->options, switchName);
-        if (entry) {
-            opt = (ItkClassOption*)Tcl_GetHashValue(entry);
-        }
+	entry = Tcl_FindHashEntry(&optTable->options, switchName);
+	if (entry) {
+	    opt = (ItkClassOption*)Tcl_GetHashValue(entry);
+	}
     }
     Tcl_DStringFree(&buffer);
     return opt;
@@ -503,15 +570,17 @@ Itk_FindClassOption(cdefn, switchName)
  * ------------------------------------------------------------------------
  */
 void
-Itk_DelClassOption(opt)
-    ItkClassOption *opt;  /* pointer to option data */
+Itk_DelClassOption(
+    ItkClassOption *opt)  /* pointer to option data */
 {
+#ifdef NOTDEF
     Itcl_DeleteMember(opt->member);
-    ckfree(opt->resName);
-    ckfree(opt->resClass);
-    ckfree(opt->init);
+#endif
+    Tcl_Free(opt->resName);
+    Tcl_Free(opt->resClass);
+    Tcl_Free(opt->init);
 
-    ckfree((char*)opt);
+    Tcl_Free(opt);
 }
 
 
@@ -525,8 +594,8 @@ Itk_DelClassOption(opt)
  * ------------------------------------------------------------------------
  */
 static Tcl_HashTable*
-ItkGetClassesWithOptInfo(interp)
-    Tcl_Interp *interp;  /* interpreter handling this registration */
+ItkGetClassesWithOptInfo(
+    Tcl_Interp *interp)  /* interpreter handling this registration */
 {
     Tcl_HashTable* classesTable;
 
@@ -534,13 +603,13 @@ ItkGetClassesWithOptInfo(interp)
      *  If the registration table does not yet exist, then create it.
      */
     classesTable = (Tcl_HashTable*)Tcl_GetAssocData(interp,
-        "itk_classesWithOptInfo", (Tcl_InterpDeleteProc**)NULL);
+	"itk_classesWithOptInfo", (Tcl_InterpDeleteProc**)NULL);
 
     if (!classesTable) {
-        classesTable = (Tcl_HashTable*)ckalloc(sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(classesTable, TCL_ONE_WORD_KEYS);
-        Tcl_SetAssocData(interp, "itk_classesWithOptInfo",
-            ItkFreeClassesWithOptInfo, (ClientData)classesTable);
+	classesTable = (Tcl_HashTable*)Tcl_Alloc(sizeof(Tcl_HashTable));
+	Tcl_InitHashTable(classesTable, TCL_ONE_WORD_KEYS);
+	Tcl_SetAssocData(interp, "itk_classesWithOptInfo",
+	    ItkFreeClassesWithOptInfo, (void *)classesTable);
     }
     return classesTable;
 }
@@ -554,33 +623,35 @@ ItkGetClassesWithOptInfo(interp)
  * ------------------------------------------------------------------------
  */
 static void
-ItkFreeClassesWithOptInfo(clientData, interp)
-    ClientData clientData;       /* associated data */
-    Tcl_Interp *interp;          /* interpreter being freed */
+ItkFreeClassesWithOptInfo(
+    void *clientData,         /* associated data */
+    TCL_UNUSED(Tcl_Interp *)) /* interpreter being freed */
 {
     Tcl_HashTable *tablePtr = (Tcl_HashTable*)clientData;
-    Tcl_HashSearch place, place2;
-    Tcl_HashEntry *entry, *entry2;
+    Tcl_HashSearch place;
+    Tcl_HashSearch place2;
+    Tcl_HashEntry *entry;
+    Tcl_HashEntry *entry2;
     ItkClassOptTable *optTable;
     ItkClassOption *opt;
 
     entry = Tcl_FirstHashEntry(tablePtr, &place);
     while (entry) {
-        optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
+	optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
 
-        entry2 = Tcl_FirstHashEntry(&optTable->options, &place2);
-        while (entry2) {
-            opt = (ItkClassOption*)Tcl_GetHashValue(entry2);
-            Itk_DelClassOption(opt);
-            entry2 = Tcl_NextHashEntry(&place2);
-        }
-        Tcl_DeleteHashTable(&optTable->options);
-        Itk_OptListFree(&optTable->order);
-        ckfree((char*)optTable);
+	entry2 = Tcl_FirstHashEntry(&optTable->options, &place2);
+	while (entry2) {
+	    opt = (ItkClassOption*)Tcl_GetHashValue(entry2);
+	    Itk_DelClassOption(opt);
+	    entry2 = Tcl_NextHashEntry(&place2);
+	}
+	Tcl_DeleteHashTable(&optTable->options);
+	Itk_OptListFree(&optTable->order);
+	Tcl_Free(optTable);
 
-        entry = Tcl_NextHashEntry(&place);
+	entry = Tcl_NextHashEntry(&place);
     }
 
     Tcl_DeleteHashTable(tablePtr);
-    ckfree((char*)tablePtr);
+    Tcl_Free(tablePtr);
 }

generic/itkStubInit.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * tkStubInit.c --
  *
  *	This file contains the initializers for the Itk stub vectors.
@@ -7,11 +7,9 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS:
  */
 
-#include "itk.h"
+#include "itkInt.h"
 
 /*
  * Remove macros that will interfere with the definitions below.
@@ -23,13 +21,17 @@
  * below should be made in the generic/itk.decls script.
  */
 
+MODULE_SCOPE const ItkStubs itkStubs;
+
 /* !BEGIN!: Do not edit below this line. */
 
-ItkStubs itkStubs = {
+static const ItkIntStubs itkIntStubs = {
     TCL_STUB_MAGIC,
-    NULL,
-    Itk_Init, /* 0 */
-    NULL, /* 1 */
+    ITKINT_STUBS_EPOCH,
+    ITKINT_STUBS_REVISION,
+    0,
+    0, /* 0 */
+    0, /* 1 */
     Itk_ConfigBodyCmd, /* 2 */
     Itk_UsualCmd, /* 3 */
     Itk_ClassOptionDefineCmd, /* 4 */
@@ -37,15 +39,40 @@ ItkStubs itkStubs = {
     Itk_ConfigClassOption, /* 6 */
     Itk_CreateClassOptTable, /* 7 */
     Itk_FindClassOptTable, /* 8 */
-    NULL, /* 9 */
+    0, /* 9 */
     Itk_CreateClassOption, /* 10 */
     Itk_FindClassOption, /* 11 */
     Itk_DelClassOption, /* 12 */
-    Itk_ArchetypeInit, /* 13 */
+    0, /* 13 */
     Itk_OptListInit, /* 14 */
     Itk_OptListFree, /* 15 */
     Itk_OptListAdd, /* 16 */
     Itk_OptListRemove, /* 17 */
 };
 
+static const ItkStubHooks itkStubHooks = {
+    &itkIntStubs
+};
+
+const ItkStubs itkStubs = {
+    TCL_STUB_MAGIC,
+    ITK_STUBS_EPOCH,
+    ITK_STUBS_REVISION,
+    &itkStubHooks,
+    Itk_Init, /* 0 */
+    Itk_SafeInit, /* 1 */
+    0, /* 2 */
+    0, /* 3 */
+    0, /* 4 */
+    0, /* 5 */
+    0, /* 6 */
+    0, /* 7 */
+    0, /* 8 */
+    0, /* 9 */
+    0, /* 10 */
+    0, /* 11 */
+    0, /* 12 */
+    Itk_ArchetypeInit, /* 13 */
+};
+
 /* !END!: Do not edit above this line. */

generic/itkStubLib.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * itkStubLib.c --
  *
  *	Stub object that will be statically linked into extensions that wish
@@ -9,8 +9,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: 
  */
 
 /*
@@ -25,23 +23,14 @@
 #endif
 #undef USE_TCL_STUB_PROCS
 
-#ifndef USE_ITCL_STUBS
-#define USE_ITCL_STUBS
+#ifndef USE_ITK_STUBS
+#define USE_ITK_STUBS 1
 #endif
-#undef USE_ITCL_STUB_PROCS
+#undef USE_ITK_STUB_PROCS
+#undef BUILD_itk
 
 #include "itk.h"
 
-/*
- * Ensure that Itcl_InitStubs is built as an exported symbol.  The other stub
- * functions should be built as non-exported symbols.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-ItkStubs *itkStubsPtr;
-
 
 /*
  *----------------------------------------------------------------------
@@ -61,21 +50,20 @@ ItkStubs *itkStubsPtr;
  *----------------------------------------------------------------------
  */
 
-char *
-Itk_InitStubs (interp, version, exact)
-    Tcl_Interp *interp;
-    char *version;
-    int exact;
+const char *
+Itk_InitStubs (
+    Tcl_Interp *interp,
+    const char *version,
+    int exact)
 {
-    char *actualVersion;
-    
-    actualVersion = Tcl_PkgRequireEx(interp, "Itk", version, exact,
-        (ClientData *) &itkStubsPtr);
+    const char *actualVersion;
 
+    actualVersion = Tcl_PkgRequireEx(interp, "itk", (const char *)version,
+	    exact, &itkStubsPtr);
     if (actualVersion == NULL) {
 	itkStubsPtr = NULL;
 	return NULL;
     }
-    
+
     return actualVersion;
 }

generic/itkUtil.c

@@ -15,15 +15,13 @@
  *           Bell Labs Innovations for Lucent Technologies
  *           mmclennan@lucent.com
  *           http://www.tcltk.com/itcl
- *
- *     RCS:  $Id: itk_util.c,v 1.1 1998/07/27 18:45:25 stanton Exp $
  * ========================================================================
  *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
  * ------------------------------------------------------------------------
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
-#include "itk.h"
+#include "itkInt.h"
 
 
 /*
@@ -35,15 +33,15 @@
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListInit(olist, options)
-    ItkOptList *olist;       /* list to be initialized */
-    Tcl_HashTable *options;  /* table containing the real option entries */
+Itk_OptListInit(
+    ItkOptList *olist,       /* list to be initialized */
+    Tcl_HashTable *options)  /* table containing the real option entries */
 {
     olist->options = options;
     olist->len = 0;
     olist->max = 10;
-    olist->list = (Tcl_HashEntry**)ckalloc(
-        (unsigned)(olist->max*sizeof(Tcl_HashEntry*))
+    olist->list = (Tcl_HashEntry**)Tcl_Alloc(
+	((size_t)olist->max*sizeof(Tcl_HashEntry*))
     );
 }
 
@@ -58,10 +56,10 @@ Itk_OptListInit(olist, options)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListFree(olist)
-    ItkOptList *olist;     /* list to be freed */
+Itk_OptListFree(
+    ItkOptList *olist)     /* list to be freed */
 {
-    ckfree((char*)olist->list);
+    Tcl_Free(olist->list);
     olist->len = olist->max = 0;
 }
 
@@ -76,26 +74,32 @@ Itk_OptListFree(olist)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListAdd(olist, entry)
-    ItkOptList *olist;     /* ordered list */
-    Tcl_HashEntry *entry;  /* entry to be added to the list */
+Itk_OptListAdd(
+    ItkOptList *olist,     /* ordered list */
+    Tcl_HashEntry *entry)  /* entry to be added to the list */
 {
-    int i, first, last, cmp, pos, size;
+    int i;
+    int first;
+    int last;
+    int cmp;
+    int pos;
+    size_t size;
     Tcl_HashEntry** newOrder;
-    char *swname, *optname;
+    const char *swname;
+    const char *optname;
 
     /*
      *  Make sure that the option list is big enough.  Resize
      *  if needed.
      */
     if (olist->len >= olist->max) {
-        size = olist->max*sizeof(Tcl_HashEntry*);
-        newOrder = (Tcl_HashEntry**)ckalloc((unsigned)2*size);
-        memcpy((VOID*)newOrder, (VOID*)olist->list, (size_t)size);
-        ckfree((char*)olist->list);
+	size = (size_t)olist->max*sizeof(Tcl_HashEntry*);
+	newOrder = (Tcl_HashEntry**)Tcl_Alloc(2*size);
+	memcpy((void*)newOrder, (void*)olist->list, size);
+	Tcl_Free(olist->list);
 
-        olist->list = newOrder;
-        olist->max *= 2;
+	olist->list = newOrder;
+	olist->max *= 2;
     }
 
     /*
@@ -103,41 +107,42 @@ Itk_OptListAdd(olist, entry)
      */
     first = 0;
     last  = olist->len-1;
-    swname = Tcl_GetHashKey(olist->options, entry) + 1;
+    swname = ((const char *)Tcl_GetHashKey(olist->options, entry)) + 1;
 
     while (last >= first) {
-        pos = (first+last)/2;
-        optname = Tcl_GetHashKey(olist->options, olist->list[pos]) + 1;
-        if (*swname == *optname) {
-            cmp = strcmp(swname, optname);
-            if (cmp == 0) {
-                break;    /* found it! */
-            }
-        }
-        else if (*swname < *optname) {
-            cmp = -1;
-        }
-        else {
-            cmp = 1;
-        }
+	pos = (first+last)/2;
+	optname = ((const char *)Tcl_GetHashKey(olist->options,
+		olist->list[pos])) + 1;
+	if (*swname == *optname) {
+	    cmp = strcmp(swname, optname);
+	    if (cmp == 0) {
+		break;    /* found it! */
+	    }
+	}
+	else if (*swname < *optname) {
+	    cmp = -1;
+	}
+	else {
+	    cmp = 1;
+	}
 
-        if (cmp > 0)
-            first = pos+1;
-        else
-            last = pos-1;
+	if (cmp > 0)
+	    first = pos+1;
+	else
+	    last = pos-1;
     }
 
     /*
      *  If a matching entry was not found, then insert one.
      */
     if (last < first) {
-        pos = first;
+	pos = first;
 
-        for (i=olist->len; i > pos; i--) {
-            olist->list[i] = olist->list[i-1];
-        }
-        olist->list[pos] = entry;
-        olist->len++;
+	for (i=olist->len; i > pos; i--) {
+	    olist->list[i] = olist->list[i-1];
+	}
+	olist->list[pos] = entry;
+	olist->len++;
     }
 }
 
@@ -154,47 +159,52 @@ Itk_OptListAdd(olist, entry)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListRemove(olist, entry)
-    ItkOptList *olist;     /* ordered list */
-    Tcl_HashEntry *entry;  /* entry to be removed from the list */
+Itk_OptListRemove(
+    ItkOptList *olist,     /* ordered list */
+    Tcl_HashEntry *entry)  /* entry to be removed from the list */
 {
     int pos = 0;
-    int i, first, last, cmp;
-    char *swname, *optname;
+    int i;
+    int first;
+    int last;
+    int cmp;
+    const char *swname;
+    const char *optname;
 
     first = 0;
     last  = olist->len-1;
-    swname = Tcl_GetHashKey(olist->options, entry) + 1;
+    swname = ((const char *)Tcl_GetHashKey(olist->options, entry)) + 1;
 
     while (last >= first) {
-        pos = (first+last)/2;
-        optname = Tcl_GetHashKey(olist->options, olist->list[pos]) + 1;
-        if (*swname == *optname) {
-            cmp = strcmp(swname, optname);
-            if (cmp == 0) {
-                break;    /* found it! */
-            }
-        }
-        else if (*swname < *optname) {
-            cmp = -1;
-        }
-        else {
-            cmp = 1;
-        }
+	pos = (first+last)/2;
+	optname = ((const char *)Tcl_GetHashKey(olist->options,
+		olist->list[pos])) + 1;
+	if (*swname == *optname) {
+	    cmp = strcmp(swname, optname);
+	    if (cmp == 0) {
+		break;    /* found it! */
+	    }
+	}
+	else if (*swname < *optname) {
+	    cmp = -1;
+	}
+	else {
+	    cmp = 1;
+	}
 
-        if (cmp > 0)
-            first = pos+1;
-        else
-            last = pos-1;
+	if (cmp > 0)
+	    first = pos+1;
+	else
+	    last = pos-1;
     }
 
     /*
      *  If a matching entry was found, then remove it.
      */
     if (last >= first) {
-        olist->len--;
-        for (i=pos; i < olist->len; i++) {
-            olist->list[i] = olist->list[i+1];
-        }
+	olist->len--;
+	for (i=pos; i < olist->len; i++) {
+	    olist->list[i] = olist->list[i+1];
+	}
     }
 }

generic/itk_cmds.c

@@ -1,355 +0,0 @@
-/*
- * ------------------------------------------------------------------------
- *      PACKAGE:  [incr Tk]
- *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
- *
- *  [incr Tk] provides a framework for building composite "mega-widgets"
- *  using [incr Tcl] classes.  It defines a set of base classes that are
- *  specialized to create all other widgets.
- *
- *  This file defines the initialization and facilities common to all
- *  mega-widgets.
- *
- * ========================================================================
- *  AUTHOR:  Michael J. McLennan
- *           Bell Labs Innovations for Lucent Technologies
- *           mmclennan@lucent.com
- *           http://www.tcltk.com/itcl
- *
- *     RCS:  $Id: itk_cmds.c,v 1.6 1999/05/25 01:35:20 redman Exp $
- * ========================================================================
- *           Copyright (c) 1993-1998  Lucent Technologies, Inc.
- * ------------------------------------------------------------------------
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-#include "itk.h"
-
-/*
- *  FORWARD DECLARATIONS
- */
-static int Initialize _ANSI_ARGS_((Tcl_Interp *interp));
-
-/*
- * The following string is the startup script executed in new
- * interpreters.  It looks on disk in several different directories
- * for a script "init.tcl" that is compatible with this version
- * of Tcl.  The init.tcl script does all of the real work of
- * initialization.
- */
-
-static char initScript[] = "\n\
-namespace eval ::itk {\n\
-    proc _find_init {} {\n\
-        global env tcl_library\n\
-        variable library\n\
-        variable version\n\
-        rename _find_init {}\n\
-        if {[info exists library]} {\n\
-            lappend dirs $library\n\
-        } else {\n\
-            if {[catch {uplevel #0 source -rsrc itk}] == 0} {\n\
-                return\n\
-            }\n\
-            set dirs {}\n\
-            if {[info exists env(ITK_LIBRARY)]} {\n\
-                lappend dirs $env(ITK_LIBRARY)\n\
-            }\n\
-            lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
-            set bindir [file dirname [info nameofexecutable]]\n\
-            lappend dirs [file join $bindir .. lib itk$version]\n\
-            lappend dirs [file join $bindir .. library]\n\
-            lappend dirs [file join $bindir .. .. library]\n\
-            lappend dirs [file join $bindir .. .. itk library]\n\
-        }\n\
-        foreach i $dirs {\n\
-            set library $i\n\
-            set itkfile [file join $i itk.tcl]\n\
-            if {![catch {uplevel #0 [list source $itkfile]} msg]} {\n\
-                return\n\
-            }\n\
-        }\n\
-        set msg \"Can't find a usable itk.tcl in the following directories:\n\"\n\
-        append msg \"    $dirs\n\"\n\
-        append msg \"This probably means that Itcl/Itk weren't installed properly.\n\"\n\
-        append msg \"If you know where the Itk library directory was installed,\n\"\n\
-        append msg \"you can set the environment variable ITK_LIBRARY to point\n\"\n\
-        append msg \"to the library directory.\n\"\n\
-        error $msg\n\
-    }\n\
-    _find_init\n\
-}";
-
-extern ItkStubs itkStubs;
-ItclStubs *itclStubsPtr;
-ItclIntStubs *itclIntStubsPtr;
-
-
-/*
- * ------------------------------------------------------------------------
- *  Initialize()
- *
- *  Invoked whenever a new interpeter is created to install the
- *  [incr Tk] package.
- *
- *  Creates the "::itk" namespace and installs access commands.
- *
- *  Returns TCL_OK on success, or TCL_ERROR (along with an error
- *  message in the interpreter) if anything goes wrong.
- * ------------------------------------------------------------------------
- */
-static int
-Initialize(interp)
-    Tcl_Interp *interp;  /* interpreter to be updated */
-{
-    Tcl_Namespace *itkNs, *parserNs;
-    ClientData parserInfo;
-
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
-	return TCL_ERROR;
-    };
-    if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
-	return TCL_ERROR;
-    };
-    if (Tcl_PkgRequireEx(interp, "Itcl", ITCL_VERSION, 0,
-            (ClientData *) &itclStubsPtr) == NULL) {
-	return TCL_ERROR;
-    }
-
-    itclIntStubsPtr = itclStubsPtr->hooks->itclIntStubs;
-
-
-    /*
-     *  Add the "itk_option" ensemble to the itcl class definition parser.
-     */
-    parserNs = Tcl_FindNamespace(interp, "::itcl::parser",
-        (Tcl_Namespace*)NULL, /* flags */ 0);
-
-    if (!parserNs) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "cannot initialize [incr Tk]: [incr Tcl] has not been installed\n",
-            "Make sure that Itcl_Init() is called before Itk_Init()",
-            (char*)NULL);
-        return TCL_ERROR;
-    }
-    parserInfo = parserNs->clientData;
-
-    if (Itcl_CreateEnsemble(interp, "::itcl::parser::itk_option") != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
-            "define", "-switch resourceName resourceClass init ?config?",
-            Itk_ClassOptionDefineCmd,
-            parserInfo, Itcl_ReleaseData) != TCL_OK) {
-
-        return TCL_ERROR;
-    }
-    Itcl_PreserveData(parserInfo);
-
-    if (Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
-            "add", "name ?name name...?",
-            Itk_ClassOptionIllegalCmd,
-            (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL) != TCL_OK ||
-
-        Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option",
-            "remove", "name ?name name...?",
-            Itk_ClassOptionIllegalCmd,
-            (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL) != TCL_OK) {
-
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Install [incr Tk] facilities if not already installed.
-     */
-    itkNs = Tcl_FindNamespace(interp, "::itk", (Tcl_Namespace*)NULL,
-        /* flags */ 0);
-
-    if (itkNs == NULL) {
-	/*
-	 *  Create the "itk" namespace.  Export all the commands in
-	 *  the namespace so that they can be imported by a command
-	 *  such as "namespace import itk::*"
-	 */
-	itkNs = Tcl_CreateNamespace(interp, "::itk",
-	    (ClientData)NULL, (Tcl_NamespaceDeleteProc*)NULL);
-    }
-
-    if (!itkNs ||
-        Tcl_Export(interp, itkNs, "*", /* resetListFirst */ 1) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Setup things for itk::Archetype base class.
-     */
-    if (Itk_ArchetypeInit(interp) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Fix the "itcl::configbody" command to recognize mega-widget
-     *  options.
-     */
-    Tcl_CreateObjCommand(interp, "::itcl::configbody", Itk_ConfigBodyCmd,
-        (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
-
-    Tcl_SetVar(interp, "::itk::version", ITCL_VERSION, 0);
-    Tcl_SetVar(interp, "::itk::patchLevel", ITCL_PATCH_LEVEL, 0);
-
-    /*
-     *  Signal that the package has been loaded.
-     */
-    if (Tcl_PkgProvideEx(interp, "Itk", ITCL_VERSION,
-            (ClientData) &itkStubs) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- * ------------------------------------------------------------------------
- *  Itk_Init()
- *
- *  Invoked whenever a new interpeter is created to install the
- *  [incr Tcl] package.  Usually invoked within Tcl_AppInit() at
- *  the start of execution.
- *
- *  Creates the "::itk" namespace and installs access commands.
- *
- *  Returns TCL_OK on success, or TCL_ERROR (along with an error
- *  message in the interpreter) if anything goes wrong.
- * ------------------------------------------------------------------------
- */
-int
-Itk_Init(interp)
-    Tcl_Interp *interp;  /* interpreter to be updated */
-{
-    if (Initialize(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    return Tcl_Eval(interp, initScript);
-    return TCL_OK;
-}
-
-
-/*
- * ------------------------------------------------------------------------
- *  Itk_ConfigBodyCmd()
- *
- *  Replacement for the usual "itcl::configbody" command.  Recognizes
- *  mega-widget options included in a class definition.  Options are
- *  identified by their "switch" name, but without the "-" prefix:
- *
- *    itcl::configbody <class>::<itkOption> <body>
- *
- *  Handles bodies for public variables as well:
- *
- *    itcl::configbody <class>::<publicVar> <body>
- *
- *  If an <itkOption> is found, it has priority over public variables.
- *  If <body> has the form "@name" then it is treated as a reference
- *  to a C handling procedure; otherwise, it is taken as a body of
- *  Tcl statements.
- *
- *  Returns TCL_OK/TCL_ERROR to indicate success/failure.
- * ------------------------------------------------------------------------
- */
-/* ARGSUSED */
-int
-Itk_ConfigBodyCmd(dummy, interp, objc, objv)
-    ClientData dummy;        /* unused */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
-{
-    int result = TCL_OK;
-
-    char *token, *head, *tail;
-    ItclClass *cdefn;
-    ItclMemberCode *mcode;
-    ItkClassOptTable *optTable;
-    Tcl_HashEntry *entry;
-    ItkClassOption *opt;
-    Tcl_DString buffer;
-
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 1, objv, "class::option body");
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Parse the member name "namesp::namesp::class::option".
-     *  Make sure that a class name was specified, and that the
-     *  class exists.
-     */
-    token = Tcl_GetStringFromObj(objv[1], (int*)NULL);
-    Itcl_ParseNamespPath(token, &buffer, &head, &tail);
-
-    if (!head || *head == '\0') {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-            "missing class specifier for body declaration \"", token, "\"",
-            (char*)NULL);
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    cdefn = Itcl_FindClass(interp, head, /* autoload */ 1);
-    if (cdefn == NULL) {
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    /*
-     *  Look first for a configuration option with that name.
-     *  If it is not found, assume the reference is for a public
-     *  variable, and use the usual "configbody" implementation
-     *  to handle it.
-     */
-    optTable = Itk_FindClassOptTable(cdefn);
-    opt = NULL;
-
-    if (optTable) {
-        Tcl_DString optName;
-
-        Tcl_DStringInit(&optName);
-        Tcl_DStringAppend(&optName, "-", -1);
-        Tcl_DStringAppend(&optName, tail, -1);
-        entry = Tcl_FindHashEntry(&optTable->options,
-            Tcl_DStringValue(&optName));
-
-        if (entry) {
-            opt = (ItkClassOption*)Tcl_GetHashValue(entry);
-        }
-        Tcl_DStringFree(&optName);
-    }
-
-    if (opt == NULL) {
-        result = Itcl_ConfigBodyCmd(dummy, interp, objc, objv);
-        goto configBodyCmdDone;
-    }
-
-    /*
-     *  Otherwise, change the implementation for this option.
-     */
-    token = Tcl_GetStringFromObj(objv[2], (int*)NULL);
-
-    if (Itcl_CreateMemberCode(interp, cdefn, (char*)NULL, token,
-        &mcode) != TCL_OK) {
-
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    Itcl_PreserveData((ClientData)mcode);
-    Itcl_EventuallyFree((ClientData)mcode, Itcl_DeleteMemberCode);
-
-    if (opt->member->code) {
-        Itcl_ReleaseData((ClientData)opt->member->code);
-    }
-    opt->member->code = mcode;
-
-configBodyCmdDone:
-    Tcl_DStringFree(&buffer);
-    return result;
-}

itkConfig.sh.in

@@ -1,5 +1,5 @@
 # itkConfig.sh --
-# 
+#
 # This shell script (for sh) is generated automatically by Itk's
 # configure script.  It will create shell variables for most of
 # the configuration options discovered by the configure script.
@@ -13,30 +13,28 @@
 
 # Itcl's version number.
 ITCL_VERSION='@ITCL_VERSION@'
-ITCL_MAJOR_VERSION='@ITCL_MAJOR_VERSION@'
-ITCL_MINOR_VERSION='@ITCL_MINOR_VERSION@'
 
 # The name of the Itk library (may be either a .a file or a shared library):
-ITK_LIB_FILE=@ITK_LIB_FILE@
+ITK_LIB_FILE=@itk_LIB_FILE@
 
 # String to pass to linker to pick up the Itk library from its
 # build directory.
-ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
+ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk library from its
 # installed directory.
-ITK_LIB_SPEC='@ITK_LIB_SPEC@'
+ITK_LIB_SPEC='@itk_LIB_SPEC@'
 
 # The name of the Itk stub library (a .a file):
-ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@
+ITK_STUB_LIB_FILE=@itk_STUB_LIB_FILE@
 
 # String to pass to linker to pick up the Itk stub library from its
 # build directory.
-ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@'
+ITK_BUILD_STUB_LIB_SPEC='@itk_BUILD_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk stub library from its
 # installed directory.
-ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
+ITK_STUB_LIB_SPEC='@itk_STUB_LIB_SPEC@'
 
 # Location of the top-level source directories from which [incr Tk]
 # was built.  This is the directory that contains a README file as well
@@ -44,4 +42,4 @@ ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
 # compiled in a different place than the directory containing the source
 # files, this points to the location of the sources, not the location
 # where [incr Tk] was compiled.
-ITK_SRC_DIR='@ITK_SRC_DIR@'
+ITK_SRC_DIR='@itk_SRC_DIR@'

library/Archetype.itk

@@ -45,8 +45,6 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: Archetype.itk,v 1.1 1998/07/27 18:45:26 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
@@ -56,32 +54,27 @@
 itcl::class itk::Archetype {
 
     constructor {args} {
-        _initOptionInfo
-        eval itk_initialize $args
+	::itcl::builtin::Archetype init
+	eval itk_initialize $args
     }
 
     destructor {
-        _deleteOptionInfo
+	::itcl::builtin::Archetype delete
     }
 
     method cget {option} @Archetype-cget
-    method configure {{option ""} args} \
-        @Archetype-configure
-    method config {{option ""} args} {
-        eval configure $option $args
-    }
 
-    method component {{name ""} args} \
-        @Archetype-component
+    method configure {{option ""} args} @Archetype-configure
 
-    protected method itk_component {option args} \
-        @Archetype-itk_component
+    method config {{option ""} args} @Archetype-configure
 
-    protected method itk_option {option args} \
-        @Archetype-itk_option
+    method component {{name ""} args} @Archetype-component
 
-    protected method itk_initialize {args} \
-        @Archetype-itk_initialize
+    protected method itk_component {option args} @Archetype-itk_component
+
+    protected method itk_option {option args} @Archetype-itk_option
+
+    protected method itk_initialize {args} @Archetype-itk_initialize
 
     protected variable itk_option
     protected variable itk_component

library/Toplevel.itk

@@ -23,8 +23,6 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: Toplevel.itk,v 1.1 1998/07/27 18:45:27 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
@@ -35,38 +33,49 @@ itcl::class itk::Toplevel {
     inherit itk::Archetype
 
     constructor {args} {
-        #
-        #  Create a toplevel window with the same name as this object
-        #
-        set itk_hull [namespace tail $this]
-        set itk_interior $itk_hull
+	#
+	#  Create a toplevel window with the same name as this object
+	#
+	set itk_hull [namespace tail $this]
+	set itk_interior $itk_hull
 
-        itk_component add hull {
-            toplevel $itk_hull -class [namespace tail [info class]]
-        } {
-            keep -background -cursor -takefocus
-        }
-        bind itk-delete-$itk_hull <Destroy> "itcl::delete object $this"
+	itk_component add hull {
+	    toplevel $itk_hull -class [namespace tail [info class]]
+	} {
+	    keep -menu -background -cursor -takefocus
+	}
+	bind itk-delete-$itk_hull <Destroy> [list itcl::delete object $this]
 
-        set tags [bindtags $itk_hull]
-        bindtags $itk_hull [linsert $tags 0 itk-delete-$itk_hull]
+	set tags [bindtags $itk_hull]
+	bindtags $itk_hull [linsert $tags 0 itk-delete-$itk_hull]
 
-        eval itk_initialize $args
+	eval itk_initialize $args
     }
 
     destructor {
-        if {[winfo exists $itk_hull]} {
-            set tags [bindtags $itk_hull]
-            set i [lsearch $tags itk-delete-$itk_hull]
-            if {$i >= 0} {
-                bindtags $itk_hull [lreplace $tags $i $i]
-            }
-            destroy $itk_hull
-        }
+	if {[winfo exists $itk_hull]} {
+	    set tags [bindtags $itk_hull]
+	    set i [lsearch $tags itk-delete-$itk_hull]
+	    if {$i >= 0} {
+		bindtags $itk_hull [lreplace $tags $i $i]
+	    }
+	    destroy $itk_hull
+	}
+	itk_component delete hull
+
+	set components [component]
+	foreach component $components {
+	    set path($component) [component $component]
+	}
+	foreach component $components {
+	    if {[winfo exists $path($component)]} {
+		destroy $path($component)
+	    }
+	}
     }
 
     itk_option define -title title Title "" {
-        wm title $itk_hull $itk_option(-title)
+	wm title $itk_hull $itk_option(-title)
     }
 
     private variable itk_hull ""

library/Widget.itk

@@ -21,8 +21,6 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: Widget.itk,v 1.1 1998/07/27 18:45:28 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
@@ -36,34 +34,45 @@ itcl::class itk::Widget {
     #  CONSTRUCTOR
     # ------------------------------------------------------------------
     constructor {args} {
-        #
-        #  Create a window with the same name as this object
-        #
-        set itk_hull [namespace tail $this]
-        set itk_interior $itk_hull
+	#
+	#  Create a window with the same name as this object
+	#
+	set itk_hull [namespace tail $this]
+	set itk_interior $itk_hull
 
-        itk_component add hull {
-            frame $itk_hull -class [namespace tail [info class]]
-        } {
-            keep -background -cursor
-        }
-        bind itk-delete-$itk_hull <Destroy> "itcl::delete object $this"
+	itk_component add hull {
+	    frame $itk_hull -class [namespace tail [info class]]
+	} {
+	    keep -background -cursor
+	}
+	bind itk-delete-$itk_hull <Destroy> [list itcl::delete object $this]
 
-        set tags [bindtags $itk_hull]
-        bindtags $itk_hull [linsert $tags 0 itk-delete-$itk_hull]
+	set tags [bindtags $itk_hull]
+	bindtags $itk_hull [linsert $tags 0 itk-delete-$itk_hull]
 
-        eval itk_initialize $args
+	eval itk_initialize $args
     }
 
     destructor {
-        if {[winfo exists $itk_hull]} {
-            set tags [bindtags $itk_hull]
-            set i [lsearch $tags itk-delete-$itk_hull]
-            if {$i >= 0} {
-                bindtags $itk_hull [lreplace $tags $i $i]
-            }
-            destroy $itk_hull
-        }
+	if {[winfo exists $itk_hull]} {
+	    set tags [bindtags $itk_hull]
+	    set i [lsearch $tags itk-delete-$itk_hull]
+	    if {$i >= 0} {
+		bindtags $itk_hull [lreplace $tags $i $i]
+	    }
+	    destroy $itk_hull
+	}
+	itk_component delete hull
+
+	set components [component]
+	foreach component $components {
+	    set path($component) [component $component]
+	}
+	foreach component $components {
+	    if {[winfo exists $path($component)]} {
+		destroy $path($component)
+	    }
+	}
     }
 
     private variable itk_hull ""

library/itk.tcl

@@ -8,21 +8,37 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: itk.tcl,v 1.1 1998/07/27 18:45:28 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
+package require -exact Itk 4.2.7
 #
 # Provide transparent access to all [incr Tk] commands
 #
-if {$tcl_platform(os) == "MacOS"} {
-    source -rsrc itk:tclIndex
-} else {
-    lappend auto_path ${itk::library}
+lappend auto_path ${itk::library}
+
+# ----------------------------------------------------------------------
+#  USAGE:  itk::remove_destroy_hook <widget>
+#
+#  Used internally via "itk_component delete" when disconnecting a
+#  component <widget> from the mega-widget that contains it.
+#  Each component has a special binding for the <Destroy> event
+#  that causes it to disconnect itself from its parent when destroyed.
+#  This procedure removes the binding from the binding tag list and
+#  deletes the binding.  It is much easier to implement this in
+#  Tcl than C.
+# ----------------------------------------------------------------------
+proc ::itk::remove_destroy_hook {widget} {
+    if {![winfo exists $widget]} {return}
+    set tags [bindtags $widget]
+    set i [lsearch $tags "itk-destroy-$widget"]
+    if {$i >= 0} {
+	bindtags $widget [lreplace $tags $i $i]
+    }
+    bind itk-destroy-$widget <Destroy> {}
 }
 
 #

license.terms

@@ -27,7 +27,7 @@ MODIFICATIONS.
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
@@ -35,4 +35,4 @@ Government shall have only "Restricted Rights" as defined in Clause
 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
-terms specified in this license. 
+terms specified in this license.

mac/MW_ItkHeader.pch

@@ -1,73 +0,0 @@
-/*
- * MW_ItkHeader.pch --
- *
- *  This file is the source for a pre-compilied header that gets used
- *  for all files in the Tk projects.  This make compilies go a bit
- *  faster.  This file is only intended to be used in the MetroWerks
- *  CodeWarrior environment.  It essentially acts as a place to set 
- *  compiler flags.  See MetroWerks documention for more details.
- *
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) MW_TkHeader.pch 1.16 96/09/04 17:01:00
- */
-
-/*
- * Support for automatically naming the precompiled header file ...
- */
-#if __POWERPC__
-#pragma precompile_target "MW_ItkHeaderPPC"
-#include "MW_TkHeaderPPC"
-#elif __CFM68K__
-#pragma precompile_target "MW_ItkHeaderCFM68K"
-#include "MW_TkHeaderCFM68K"
-#else
-#pragma precompile_target "MW_ItkHeader68K"
-#include "MW_TkHeader68K"
-#endif
-
-/*
- * Macintosh Tcl must be compiled with certain compiler options to
- * ensure that it will work correctly.  The following pragmas are 
- * used to ensure that those options are set correctly.  An error
- * will occur at compile time if they are not set correctly.
- */
-
-#if !__option(enumsalwaysint)
-#error Tcl requires the Metrowerks setting "Enums always ints".
-#endif
-
-#if !defined(__POWERPC__)
-#if !__option(far_data)
-#error Tcl requires the Metrowerks setting "Far data".
-#endif
-#endif
-
-#if !defined(__POWERPC__)
-#if !__option(fourbyteints)
-#error Tcl requires the Metrowerks setting "4 byte ints".
-#endif
-#endif
-
-#if !defined(__POWERPC__)
-#if !__option(IEEEdoubles)
-#error Tcl requires the Metrowerks setting "8 byte doubles".
-#endif
-#endif
-
-#include <tcl.h>
-#include <tk.h>
-#include <itcl.h>
-
-/*
- * Place any includes below that will are needed by the majority of the
- * and is OK to be in any file in the system.  The pragma's are used
- * to control what functions are exported in the Tcl shared library.
- */
-
-#pragma export on
-#include "itk.h"
-#pragma export reset

mac/itkMacLibrary.r

@@ -1,94 +0,0 @@
-/*
- * tkMacLibrary.r --
- *
- *	This file creates resources for use in most Tk applications.
- *	This is designed to be an example of using the Tcl/Tk 
- *	libraries in a Macintosh Application.
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tkMacLibrary.r 1.5 96/10/03 17:54:21
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-#include <AEUserTermTypes.r>
-
-/*
- * The folowing include and defines help construct
- * the version string for Tcl.
- */
-
-#define RESOURCE_INCLUDED
-#include <tcl.h>
-#include <tk.h>
-#include "itcl.h"
-#include "itk.h"
-
-#if (TK_RELEASE_LEVEL == 0)
-#   define RELEASE_LEVEL alpha
-#elif (TK_RELEASE_LEVEL == 1)
-#   define RELEASE_LEVEL beta
-#elif (TK_RELEASE_LEVEL == 2)
-#   define RELEASE_LEVEL final
-#endif
-
-#if (TK_RELEASE_LEVEL == 2)
-#   define MINOR_VERSION (ITCL_MINOR_VERSION * 16) + TK_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION ITCL_MINOR_VERSION * 16
-#endif
-
-#define RELEASE_CODE 0x00
-
-#define ITCL_LIBRARY_RESOURCES 3000
-#define ITK_LIBRARY_RESOURCES 3500
-
-resource 'vers' (1) {
-	ITCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	ITK_PATCH_LEVEL,
-	ITK_PATCH_LEVEL ", by Michael McLennan © 1993-1998" "\n" "Lucent Technologies, Inc."
-};
-
-resource 'vers' (2) {
-	ITCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	ITK_PATCH_LEVEL,
-	"ItkWish " ITK_PATCH_LEVEL " © 1993-1998"
-};
-
-
-#define ITCL_LIBRARY_RESOURCES 2000
-#define ITK_LIBRARY_RESOURCES 3500
-/*
- * The -16397 string will be displayed by Finder when a user
- * tries to open the shared library. The string should
- * give the user a little detail about the library's capabilities
- * and enough information to install the library in the correct location.  
- * A similar string should be placed in all shared libraries.
- */
-resource 'STR ' (-16397, purgeable) {
-	"Itk Library\n\n"
-	"This is the library needed to run add Itcl to the Tcl/Tk shell. "
-	"To work properly, it should be placed in the ŒTool Command Language¹ folder "
-	"within the Extensions folder."
-};
-
-
-/* 
- * We now load the Tk library into the resource fork of the library.
- */
-
-#include "itkMacTclCode.r"
-
-read 'TEXT' (ITK_LIBRARY_RESOURCES+12, "itk:tclIndex", purgeable) 
-	"::mac:tclIndex";
-data 'TEXT' (ITK_LIBRARY_RESOURCES+13,"pkgIndex",purgeable, preload) {
-	"# Tcl package index file, version 1.0\n"
-	"package ifneeded Itk 3.1 [list package require Itcl 3.1 \; load [file join $dir itk31[info sharedlibextension]] Itk \; source -rsrc itk:tclIndex]\n"
-};
-

mac/itkMacTclCode.r

@@ -1,29 +0,0 @@
-/*
- *  itkMacTclCode.r
- *
- *  This file includes the Itk code that is needed to startup Itk.
- *  It is to be included either in the resource fork of the shared library, or in the
- *  resource fork of the application for a statically bound application.
- *
- *  Jim Ingham
- *  Lucent Technologies 1996
- *
- */
- 
-
-#define ITK_LIBRARY_RESOURCES 3500
-
-/* 
- * We now load the Itk library into the resource fork of the application.
- */
-
-read 'TEXT' (ITK_LIBRARY_RESOURCES+1, "itk", purgeable) 
-	"::library:itk.tcl";
-read 'TEXT' (ITK_LIBRARY_RESOURCES+3, "Itk_Archetype", purgeable) 
-	"::library:Archetype.itk";
-read 'TEXT' (ITK_LIBRARY_RESOURCES+4, "Itk_Widget", purgeable) 
-	"::library:Widget.itk";
-read 'TEXT' (ITK_LIBRARY_RESOURCES+5, "Itk_Toplevel", purgeable) 
-	"::library:Toplevel.itk";
-
-

mac/itkStaticApplication.r

@@ -1,29 +0,0 @@
-/*
- * itkStaticApplication.r --
- *
- *	This file creates resources which bind in the static version of the
- *  pkgIndex tclIndex and itk's Tcl code files.
- *
- * Jim Ingham for Itcl 2.2
- * 
- * Copyright (c) 1996 Lucent Technologies
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) itkStaticApplication.r 1.5 96/10/03 17:54:21
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-#define ITK_LIBRARY_RESOURCES 3500
-
-#include "itkMacTclCode.r"
-
-data 'TEXT' (ITK_LIBRARY_RESOURCES+6,"itk:pkgIndex",purgeable, preload) {
-	"# Tcl package index file, version 1.0\n"
-	"package ifneeded Itk 2.2 {load {} Itk}\n"
-};
-read 'TEXT' (ITK_LIBRARY_RESOURCES+2, "Itk:tclIndex", purgeable) 
-	"::mac:tclIndex";

mac/pkgIndex.tcl

@@ -1,3 +0,0 @@
-# Tcl package index file, version 1.0
-
-package ifneeded Itk 3.1 [list load [file join $dir itk31[info sharedlibextension]] Itk]

mac/tclIndex

@@ -1,11 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(::itk::Archetype) [list source -rsrc Itk_Archetype]
-set auto_index(::itk::Toplevel) [list source -rsrc Itk_Toplevel]
-set auto_index(::itk::Widget) [list source -rsrc Itk_Widget]

mac/tkMacAppInit.c

@@ -1,418 +0,0 @@
-/* 
- * tkMacAppInit.c --
- *
- *	Provides a version of the Tcl_AppInit procedure for the example shell.
- *
- * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tkMacAppInit.c 1.35 97/07/28 11:18:55
- */
-
-#include <Gestalt.h>
-#include <ToolUtils.h>
-#include <Fonts.h>
-#include <Dialogs.h>
-#include <SegLoad.h>
-#include <Traps.h>
-#include <Appearance.h>
-
-#include "tk.h"
-#include "tkInt.h"
-#include "tkMacInt.h"
-#include "tclMac.h"
-
-#include "itk.h"
-
-/* include tclInt.h for access to namespace API */
-#include "tclInt.h"
-
-#ifdef TK_TEST
-EXTERN int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TK_TEST */
-
-#ifdef TCL_TEST
-EXTERN int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TCL_TEST */
-
-Tcl_Interp *gStdoutInterp = NULL;
-
-int 	TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr));
-
-/*
- * Prototypes for functions the ANSI library needs to link against.
- */
-short			InstallConsole _ANSI_ARGS_((short fd));
-void			RemoveConsole _ANSI_ARGS_((void));
-long			WriteCharsToConsole _ANSI_ARGS_((char *buff, long n));
-long			ReadCharsFromConsole _ANSI_ARGS_((char *buff, long n));
-extern char *		__ttyname _ANSI_ARGS_((long fildes));
-short			SIOUXHandleOneEvent _ANSI_ARGS_((EventRecord *event));
-
-/*
- * Prototypes for functions from the tkConsole.c file.
- */
- 
-EXTERN void		TkConsoleCreate _ANSI_ARGS_((void));
-EXTERN int		TkConsoleInit _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void		TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
-			    int devId, char *buffer, long size));
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-static int		MacintoshInit _ANSI_ARGS_((void));
-static int		SetupMainInterp _ANSI_ARGS_((Tcl_Interp *interp));
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	Main program for Wish.
- *
- * Results:
- *	None. This procedure never returns (it exits the process when
- *	it's done
- *
- * Side effects:
- *	This procedure initializes the wish world and then 
- *	calls Tk_Main.
- *
- *----------------------------------------------------------------------
- */
-
-void
-main(
-    int argc,				/* Number of arguments. */
-    char **argv)			/* Array of argument strings. */
-{
-    char *newArgv[2];
-
-    if (MacintoshInit()  != TCL_OK) {
-	Tcl_Exit(1);
-    }
-
-    argc = 1;
-    newArgv[0] = "itkwish";
-    newArgv[1] = NULL;
-    Tk_Main(argc, newArgv, Tcl_AppInit);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in interp->result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(
-    Tcl_Interp *interp)		/* Interpreter for application. */
-{
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    if (Tk_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
-	
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-#ifdef TCL_TEST
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
-    if (TclObjTest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#endif /* TCL_TEST */
-
-#ifdef TK_TEST
-    if (Tktest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tktest", Tktest_Init,
-            (Tcl_PackageInitProc *) NULL);
-#endif /* TK_TEST */
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     * Each call would look like this:
-     *
-     * Tcl_CreateCommand(interp, "tclName", CFuncCmd, NULL, NULL);
-     */
-    if (Itcl_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    if (Itk_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Itcl", Itcl_Init, Itcl_SafeInit);
-    Tcl_StaticPackage(interp, "Itk", Itk_Init, (Tcl_PackageInitProc *) NULL);
-
-    /*
-     *  This is itkwish, so import all [incr Tcl] commands by
-     *  default into the global namespace.  Fix up the autoloader
-     *  to do the same.
-     */
-    if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
-            "::itk::*", /* allowOverwrite */ 1) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
-            "::itcl::*", /* allowOverwrite */ 1) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    if (Tcl_Eval(interp, "auto_mkindex_parser::slavehook { _%@namespace import -force ::itcl::* ::itk::* }") != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    SetupMainInterp(interp);
-
-    /*
-     * Specify a user-specific startup script to invoke if the application
-     * is run interactively.  On the Mac we can specifiy either a TEXT resource
-     * which contains the script or the more UNIX like file location
-     * may also used.  (I highly recommend using the resource method.)
-     */
-
-    Tcl_SetVar(interp, "tcl_rcRsrcName", "itkwishrc", TCL_GLOBAL_ONLY);
-    /* Tcl_SetVar(interp, "tcl_rcFileName", "~/.itkwishrc", TCL_GLOBAL_ONLY); */
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MacintoshInit --
- *
- *	This procedure calls Mac specific initilization calls.  Most of
- *	these calls must be made as soon as possible in the startup
- *	process.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	Inits the application.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-MacintoshInit()
-{
-    int i;
-    long result, mask = 0x0700; 		/* mask = system 7.x */
-
-#if GENERATING68K && !GENERATINGCFM
-    SetApplLimit(GetApplLimit() - (TK_MAC_68K_STACK_GROWTH));
-#endif
-    MaxApplZone();
-    for (i = 0; i < 4; i++) {
-	(void) MoreMasters();
-    }
-
-    /*
-     * Tk needs us to set the qd pointer it uses.  This is needed
-     * so Tk doesn't have to assume the availablity of the qd global
-     * variable.  Which in turn allows Tk to be used in code resources.
-     */
-    tcl_macQdPtr = &qd;
-
-    /*
-     * If appearance is present, then register Tk as an Appearance client
-     * This means that the mapping from non-Appearance to Appearance cdefs
-     * will be done for Tk regardless of the setting in the Appearance
-     * control panel.  
-     */
-     
-     if (TkMacHaveAppearance()) {
-         RegisterAppearanceClient();
-     }
-
-    InitGraf(&tcl_macQdPtr->thePort);
-    InitFonts();
-    InitWindows();
-    InitMenus();
-    InitDialogs((long) NULL);		
-    InitCursor();
-
-    /*
-     * Make sure we are running on system 7 or higher
-     */
-     
-    if ((NGetTrapAddress(_Gestalt, ToolTrap) == 
-    	    NGetTrapAddress(_Unimplemented, ToolTrap))
-    	    || (((Gestalt(gestaltSystemVersion, &result) != noErr)
-	    || (result < mask)))) {
-	panic("Tcl/Tk requires System 7 or higher.");
-    }
-
-    /*
-     * Make sure we have color quick draw 
-     * (this means we can't run on 68000 macs)
-     */
-     
-    if (((Gestalt(gestaltQuickdrawVersion, &result) != noErr)
-	    || (result < gestalt32BitQD13))) {
-	panic("Tk requires Color QuickDraw.");
-    }
-
-    
-    FlushEvents(everyEvent, 0);
-    SetEventMask(everyEvent);
-
-
-    Tcl_MacSetEventProc(TkMacConvertEvent);
-    TkConsoleCreate();
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetupMainInterp --
- *
- *	This procedure calls initalization routines require a Tcl 
- *	interp as an argument.  This call effectively makes the passed
- *	iterpreter the "main" interpreter for the application.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	More initilization.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetupMainInterp(
-    Tcl_Interp *interp)
-{
-    /*
-     * Initialize the console only if we are running as an interactive
-     * application.
-     */
-
-    TkMacInitAppleEvents(interp);
-    TkMacInitMenus(interp);
-
-    if (strcmp(Tcl_GetVar(interp, "tcl_interactive", TCL_GLOBAL_ONLY), "1")
-	    == 0) {
-	if (TkConsoleInit(interp) == TCL_ERROR) {
-	    goto error;
-	}
-    }
-
-    /*
-     * Attach the global interpreter to tk's expected global console
-     */
-
-    gStdoutInterp = interp;
-
-    return TCL_OK;
-
-error:
-    panic(interp->result);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InstallConsole, RemoveConsole, etc. --
- *
- *	The following functions provide the UI for the console package.
- *	Users wishing to replace SIOUX with their own console package 
- *	need only provide the four functions below in a library.
- *
- * Results:
- *	See SIOUX documentation for details.
- *
- * Side effects:
- *	See SIOUX documentation for details.
- *
- *----------------------------------------------------------------------
- */
-
-short 
-InstallConsole(short fd)
-{
-#pragma unused (fd)
-
-	return 0;
-}
-
-void 
-RemoveConsole(void)
-{
-}
-
-long 
-WriteCharsToConsole(char *buffer, long n)
-{
-    TkConsolePrint(gStdoutInterp, TCL_STDOUT, buffer, n);
-    return n;
-}
-
-long 
-ReadCharsFromConsole(char *buffer, long n)
-{
-    return 0;
-}
-
-extern char *
-__ttyname(long fildes)
-{
-    static char *__devicename = "null device";
-
-    if (fildes >= 0 && fildes <= 2) {
-	return (__devicename);
-    }
-    
-    return (0L);
-}
-
-short
-SIOUXHandleOneEvent(EventRecord *event)
-{
-    return 0;
-}

pkgIndex.tcl.in

@@ -1,3 +1,16 @@
-# Tcl package index file, version 1.0
+# -*- tcl -*-
+# Tcl package index file, version 1.1
+#
 
-package ifneeded Itk @VERSION@ [list load [file join $dir @RELPATH@ "@itk_LIB_FILE@"] Itk]
+if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
+if {[string length [package provide Itcl]] && ![package vsatisfies [package provide Itcl] 4.1]} return
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded itk @PACKAGE_VERSION@ \
+	    [list load [file join $dir @PKG_LIB_FILE9@] Itk]
+} else {
+    package ifneeded itk @PACKAGE_VERSION@ \
+	    [list load [file join $dir @PKG_LIB_FILE8@] Itk]
+}
+
+package ifneeded Itk @PACKAGE_VERSION@ \
+	[list package require -exact itk @PACKAGE_VERSION@]

tests/all

@@ -1,16 +0,0 @@
-# This file contains a top-level script to run all of the Tcl
-# tests.  Execute it by invoking "source all" when running tclTest
-# in this directory.
-#
-# SCCS: @(#) all 1.7 96/02/16 08:55:38
-
-foreach i [lsort [glob *.test]] {
-    if [string match l.*.test $i] {
-	# This is an SCCS lock file;  ignore it.
-	continue
-    }
-    puts stdout $i
-    if [catch {source $i} msg] {
-	puts $msg
-    }	
-}

tests/all.tcl

@@ -0,0 +1,18 @@
+# all.tcl --
+#
+# This file contains a top-level script to run all of the Tcl
+# tests.  Execute it by invoking "source all.test" when running tcltest
+# in this directory.
+#
+# Copyright (c) 1998-2000 by Ajuba Solutions
+# All rights reserved.
+
+package prefer latest
+
+package require Tcl 8.6-
+package require tcltest 2.2
+
+tcltest::configure {*}$argv -testdir [file dir [info script]]
+tcltest::runAllTests
+
+return

tests/defs

@@ -1,343 +0,0 @@
-# This file contains support code for the Tcl test suite.  It is
-# normally sourced by the individual files in the test suite before
-# they run their tests.  This improved approach to testing was designed
-# and initially implemented by Mary Ann May-Pumphrey of Sun Microsystems.
-#
-# Copyright (c) 1990-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# SCCS: @(#) defs 1.44 96/10/08 17:26:58
-
-if ![info exists VERBOSE] {
-    set VERBOSE 0
-}
-if ![info exists TESTS] {
-    set TESTS {}
-}
-
-# If tests are being run as root, issue a warning message and set a
-# variable to prevent some tests from running at all.
-
-set user {}
-if {$tcl_platform(platform) == "unix"} {
-    catch {set user [exec whoami]}
-    if {$user == ""} {
-        catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-    }
-    if {$user == ""} {set user root}
-    if {$user == "root"} {
-        puts stdout "Warning: you're executing as root.  I'll have to"
-        puts stdout "skip some of the tests, since they'll fail as root."
-    }
-}
-
-# Some of the tests don't work on some system configurations due to
-# differences in word length, file system configuration, etc.  In order
-# to prevent false alarms, these tests are generally only run in the
-# master development directory for Tcl.  The presence of a file
-# "doAllTests" in this directory is used to indicate that the non-portable
-# tests should be run.
-
-set doNonPortableTests [file exists doAllTests]
-
-# If there is no "memory" command (because memory debugging isn't
-# enabled), generate a dummy command that does nothing.
-
-if {[info commands memory] == ""} {
-    proc memory args {}
-}
-
-# Check configuration information that will determine which tests
-# to run.  To do this, create an array testConfig.  Each element
-# has a 0 or 1 value, and the following elements are defined:
-#	unixOnly -	1 means this is a UNIX platform, so it's OK
-#			to run tests that only work under UNIX.
-#	macOnly -	1 means this is a Mac platform, so it's OK
-#			to run tests that only work on Macs.
-#	pcOnly -	1 means this is a PC platform, so it's OK to
-#			run tests that only work on PCs.
-#	unixOrPc -	1 means this is a UNIX or PC platform.
-#	macOrPc -	1 means this is a Mac or PC platform.
-#	macOrUnix -	1 means this is a Mac or UNIX platform.
-#	nonPortable -	1 means this the tests are being running in
-#			the master Tcl/Tk development environment;
-#			Some tests are inherently non-portable because
-#			they depend on things like word length, file system
-#			configuration, window manager, etc.  These tests
-#			are only run in the main Tcl development directory
-#			where the configuration is well known.  The presence
-#			of the file "doAllTests" in this directory indicates
-#			that it is safe to run non-portable tests.
-#	tempNotPc -	The inverse of pcOnly.  This flag is used to
-#			temporarily disable a test.
-#	nonBlockFiles - 1 means this platform supports setting files into
-#			nonblocking mode.
-#	asyncPipeClose- 1 means this platform supports async flush and
-#			async close on a pipe.
-#	unixExecs     - 1 means this machine has commands such as 'cat',
-#			'echo' etc available.
-
-catch {unset testConfig}
-if {$tcl_platform(platform) == "unix"} {
-    set testConfig(unixOnly) 1
-    set testConfig(tempNotPc) 1
-} else {
-    set testConfig(unixOnly) 0
-} 
-if {$tcl_platform(platform) == "macintosh"} {
-    set testConfig(tempNotPc) 1
-    set testConfig(macOnly) 1
-} else {
-    set testConfig(macOnly) 0
-} 
-if {$tcl_platform(platform) == "windows"} {
-    set testConfig(pcOnly) 1
-} else {
-    set testConfig(pcOnly) 0
-}
-set testConfig(unixOrPc) [expr $testConfig(unixOnly) || $testConfig(pcOnly)]
-set testConfig(macOrPc) [expr $testConfig(macOnly) || $testConfig(pcOnly)]
-set testConfig(macOrUnix) [expr $testConfig(macOnly) || $testConfig(unixOnly)]
-set testConfig(nonPortable) [file exists doAllTests]
-
-set f [open defs r]
-if {[expr [catch {fconfigure $f -blocking off}]] == 0} {
-    set testConfig(nonBlockFiles) 1
-} else {
-    set testConfig(nonBlockFiles) 0
-}
-close $f
-
-# Test for SCO Unix - cannot run async flushing tests because a potential
-# problem with select is apparently interfering. (Mark Diekhans).
-
-if {$tcl_platform(platform) == "unix"} {
-    if {[catch {exec uname -X | fgrep {Release = 3.2v}}] == 0} {
-	set testConfig(asyncPipeClose) 0
-    } else {
-	set testConfig(asyncPipeClose) 1
-    }
-} else {
-    set testConfig(asyncPipeClose) 1
-}
-
-# Test to see if execed commands such as cat, echo, rm and so forth are
-# present on this machine.
-
-set testConfig(unixExecs) 1
-if {$tcl_platform(platform) == "macintosh"} {
-    set testConfig(unixExecs) 0
-}
-if {($testConfig(unixExecs) == 1) && ($tcl_platform(platform) == "windows")} {
-    if {[catch {exec cat defs}] == 1} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec echo hello}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec sh -c echo hello}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec wc defs}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {$testConfig(unixExecs) == 1} {
-	exec echo hello > removeMe
-        if {[catch {exec rm removeMe}] == 1} {
-	    set testConfig(unixExecs) 0
-	}
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec sleep 1}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec fgrep unixExecs defs}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec ps}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec echo abc > removeMe}] == 0) && \
-		([catch {exec chmod 644 removeMe}] == 1) && \
-		([catch {exec rm removeMe}] == 0)} {
-	set testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -f removeMe}
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec mkdir removeMe}] == 1)} {
-	set testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -r removeMe}
-    }
-    if {$testConfig(unixExecs) == 0} {
-	puts stdout "Warning: Unix-style executables are not available, so"
-	puts stdout "some tests will be skipped."
-    }
-}    
-
-proc print_verbose {name description script code answer} {
-    puts stdout "\n"
-    puts stdout "==== $name $description"
-    puts stdout "==== Contents of test case:"
-    puts stdout "$script"
-    if {$code != 0} {
-	if {$code == 1} {
-	    puts stdout "==== Test generated error:"
-	    puts stdout $answer
-	} elseif {$code == 2} {
-	    puts stdout "==== Test generated return exception;  result was:"
-	    puts stdout $answer
-	} elseif {$code == 3} {
-	    puts stdout "==== Test generated break exception"
-	} elseif {$code == 4} {
-	    puts stdout "==== Test generated continue exception"
-	} else {
-	    puts stdout "==== Test generated exception $code;  message was:"
-	    puts stdout $answer
-	}
-    } else {
-	puts stdout "==== Result was:"
-	puts stdout "$answer"
-    }
-}
-
-# test --
-# This procedure runs a test and prints an error message if the
-# test fails.  If VERBOSE has been set, it also prints a message
-# even if the test succeeds.  The test will be skipped if it
-# doesn't match the TESTS variable, or if one of the elements
-# of "constraints" turns out not to be true.
-#
-# Arguments:
-# name -		Name of test, in the form foo-1.2.
-# description -		Short textual description of the test, to
-#			help humans understand what it does.
-# constraints -		A list of one or more keywords, each of
-#			which must be the name of an element in
-#			the array "testConfig".  If any of these
-#			elements is zero, the test is skipped.
-#			This argument may be omitted.
-# script -		Script to run to carry out the test.  It must
-#			return a result that can be checked for
-#			correctness.
-# answer -		Expected result from script.
-
-proc test {name description script answer args} {
-    global VERBOSE TESTS testConfig
-    if {[string compare $TESTS ""] != 0} then {
-	set ok 0
-	foreach test $TESTS {
-	    if [string match $test $name] then {
-		set ok 1
-		break
-	    }
-        }
-	if !$ok then return
-    }
-    set i [llength $args]
-    if {$i == 0} {
-	# Empty body
-    } elseif {$i == 1} {
-	# "constraints" argument exists;  shuffle arguments down, then
-	# make sure that the constraints are satisfied.
-
-	set constraints $script
-	set script $answer
-	set answer [lindex $args 0]
-	foreach constraint $constraints {
-	    if {![info exists testConfig($constraint)]
-		    || !$testConfig($constraint)} {
-		return
-	    }
-	}
-    } else {
-	error "wrong # args: must be \"test name description ?constraints? script answer\""
-    }
-    memory tag $name
-    set code [catch {uplevel $script} result]
-    if {$code != 0} {
-	print_verbose $name $description $script \
-		$code $result
-    } elseif {[string compare $result $answer] == 0} then { 
-	if $VERBOSE then {
-	    if {$VERBOSE > 0} {
-		print_verbose $name $description $script \
-		    $code $result
-	    }
-	    puts stdout "++++ $name PASSED"
-	}
-    } else { 
-	print_verbose $name $description $script \
-		$code $result
-	puts stdout "---- Result should have been:"
-	puts stdout "$answer"
-	puts stdout "---- $name FAILED" 
-    }
-}
-
-proc dotests {file args} {
-    global TESTS
-    set savedTests $TESTS
-    set TESTS $args
-    source $file
-    set TESTS $savedTests
-}
-
-proc normalizeMsg {msg} {
-    regsub "\n$" [string tolower $msg] "" msg
-    regsub -all "\n\n" $msg "\n" msg
-    regsub -all "\n\}" $msg "\}" msg
-    return $msg
-}
-
-proc makeFile {contents name} {
-    set fd [open $name w]
-    fconfigure $fd -translation lf
-    if {[string index $contents [expr [string length $contents] - 1]] == "\n"} {
-	puts -nonewline $fd $contents
-    } else {
-	puts $fd $contents
-    }
-    close $fd
-}
-
-proc removeFile {name} {
-    file delete $name
-}
-
-proc makeDirectory {name} {
-    file mkdir $name
-}
-
-proc removeDirectory {name} {
-    file delete -force $name
-}
-
-proc viewFile {name} {
-    global tcl_platform testConfig
-    if {($tcl_platform(platform) == "macintosh") || \
-		($testConfig(unixExecs) == 0)} {
-	set f [open $name]
-	set data [read -nonewline $f]
-	close $f
-	return $data
-    } else {
-	exec cat $name
-    }
-}
-
-# Locate tcltest executable
-
-set tcltest [list [info nameofexecutable]]
-if {$tcltest == "{}"} {
-    set tcltest {}
-    puts "Unable to find tcltest executable, multiple process tests will fail."
-}
-
-

tests/interp.test

@@ -5,15 +5,17 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: interp.test,v 1.1 1998/07/27 18:45:31 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Make sure that slave interpreters can be created and loaded
@@ -27,13 +29,14 @@ test interp-1.1 {create a slave interp with [incr Tk]} {
     list [slave eval "namespace children :: ::itk"] [interp delete slave]
 } {::itk {}}
 
-test interp-1.2 {can't load [incr Tk] into a safe interp} {
-    interp create -safe slave
+test interp-1.2 {can load [incr Tk] into a safe interp} {
+    safe::interpCreate slave
+    safe::loadTk slave
     load "" Itcl slave
     set result [list [catch {load "" Itk slave} msg] $msg]
-    interp delete slave
+    safe::interpDelete slave
     set result
-} {1 {can't use package in a safe interpreter: no Itk_SafeInit procedure}}
+} {0 {}}
 
 test interp-1.3 {errors are okay when slave interp is deleted} {
     interp create slave
@@ -41,8 +44,11 @@ test interp-1.3 {errors are okay when slave interp is deleted} {
     load "" Tk slave
     load "" Itk slave
     slave eval {
-        label .l
-        bind .l <Destroy> {error "dying!"}
+	label .l
+	bind .l <Destroy> {error "dying!"}
     }
     interp delete slave
 } {}
+
+::tcltest::cleanupTests
+exit

tests/option.test

@@ -5,74 +5,76 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: option.test,v 1.1 1998/07/27 18:45:32 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Component option processing
 # ----------------------------------------------------------------------
 test option-1.1 {create a widget for the following tests} {
     itcl::class TestOptComp {
-        inherit itk::Widget
-        constructor {args} {
-            itk_component add test1 {
-                label $itk_interior.t1
-            } {
-                keep -background -foreground -cursor
-                keep -text
-            }
-            pack $itk_component(test1) -side left -padx 2
-            eval itk_initialize $args
-        }
-        private variable status ""
-        public method action {info} {
-            lappend status $info
-        }
-        public method do {cmd} {
-            eval $cmd
-        }
-        itk_option define -status status Status {} {
-            lappend status $itk_option(-status)
-        }
+	inherit itk::Widget
+	constructor {args} {
+	    itk_component add test1 {
+		label $itk_interior.t1
+	    } {
+		keep -background -foreground -cursor
+		keep -text
+	    }
+	    pack $itk_component(test1) -side left -padx 2
+	    eval itk_initialize $args
+	}
+	private variable status ""
+	public method action {info} {
+	    lappend status $info
+	}
+	public method do {cmd} {
+	    eval $cmd
+	}
+	itk_option define -status status Status {} {
+	    lappend status $itk_option(-status)
+	}
     }
 
     itcl::class TestOptWidget {
-        inherit itk::Widget
-        constructor {args} {
-            itk_component add test1 {
-                label $itk_interior.t1
-            } {
-                keep -background -foreground -cursor
-                keep -text
-            }
-            pack $itk_component(test1) -side left -padx 2
-            eval itk_initialize $args
-        }
-        public method do {cmd} {
-            eval $cmd
-        }
+	inherit itk::Widget
+	constructor {args} {
+	    itk_component add test1 {
+		label $itk_interior.t1
+	    } {
+		keep -background -foreground -cursor
+		keep -text
+	    }
+	    pack $itk_component(test1) -side left -padx 2
+	    eval itk_initialize $args
+	}
+	public method do {cmd} {
+	    eval $cmd
+	}
     }
     TestOptWidget .#auto
 } {.testOptWidget0}
 
 test option-1.2 {"keep" can be called more than once} {
     .testOptWidget0 do {
-        itk_component add k0 {
-            TestOptComp $itk_interior.k0 -status "create"
-        } {
-            keep -background -foreground -cursor
-            keep -background -foreground -cursor
-            keep -status
-            keep -status
-        }
-        pack $itk_component(k0)
+	itk_component add k0 {
+	    TestOptComp $itk_interior.k0 -status "create"
+	} {
+	    keep -background -foreground -cursor
+	    keep -background -foreground -cursor
+	    keep -status
+	    keep -status
+	}
+	pack $itk_component(k0)
     }
     .testOptWidget0 configure -status "foo"
     .testOptWidget0 component k0 do {set status}
@@ -80,13 +82,13 @@ test option-1.2 {"keep" can be called more than once} {
 
 test option-1.3 {"rename" can be called more than once} {
     .testOptWidget0 do {
-        itk_component add k1 {
-            TestOptComp $itk_interior.k1 -status "create"
-        } {
-            rename -status -test test Test
-            rename -status -test test Test
-        }
-        pack $itk_component(k1)
+	itk_component add k1 {
+	    TestOptComp $itk_interior.k1 -status "create"
+	} {
+	    rename -status -test test Test
+	    rename -status -test test Test
+	}
+	pack $itk_component(k1)
     }
     .testOptWidget0 configure -test "bar"
     .testOptWidget0 component k1 do {set status}
@@ -94,14 +96,14 @@ test option-1.3 {"rename" can be called more than once} {
 
 test option-1.4 {"ignore" overrides keep and rename} {
     .testOptWidget0 do {
-        itk_component add k2 {
-            TestOptComp $itk_interior.k2 -status "create"
-        } {
-            keep -status
-            rename -status -test test Test
-            ignore -status
-        }
-        pack $itk_component(k2)
+	itk_component add k2 {
+	    TestOptComp $itk_interior.k2 -status "create"
+	} {
+	    keep -status
+	    rename -status -test test Test
+	    ignore -status
+	}
+	pack $itk_component(k2)
     }
     .testOptWidget0 configure -status k2 -test k2
     .testOptWidget0 component k2 do {set status}
@@ -115,61 +117,61 @@ test option-2.1 {create a widget for the following tests} {
 } {.testUsual}
 
 test option-2.2 {register some "usual" code} {
-    usual TestOptComp-test {keep -cursor -foreground}
+    itk::usual TestOptComp-test {keep -cursor -foreground}
 } {}
 
 test option-2.3 {query back "usual" code} {
-    usual TestOptComp-test
+    itk::usual TestOptComp-test
 } {keep -cursor -foreground}
 
 test option-2.4 {query back unknown "usual" code} {
-    usual xyzzyxyzzy
+    itk::usual xyzzyxyzzy
 } {}
 
 test option-2.5 {add a component using "usual" code} {
     .testUsual do {
-        itk_component add u0 {
-            label $itk_interior.u0 -text "Usual Test #0"
-        } {
-            usual TestOptComp-test
-        }
-        pack $itk_component(u0)
+	itk_component add u0 {
+	    label $itk_interior.u0 -text "Usual Test #0"
+	} {
+	    usual TestOptComp-test
+	}
+	pack $itk_component(u0)
     }
     .testUsual configure -foreground green -cursor gumby
 
     list [.testUsual component u0 cget -foreground] \
-         [.testUsual component u0 cget -cursor]
+	 [.testUsual component u0 cget -cursor]
 } {green gumby}
 
 test option-2.6 {override "usual" options} {
     .testUsual do {
-        itk_component add u1 {
-            label $itk_interior.u1 -text "Usual Test #1"
-        } {
-            usual TestOptComp-test
-            ignore -cursor
-            keep -background
-        }
-        pack $itk_component(u1)
+	itk_component add u1 {
+	    label $itk_interior.u1 -text "Usual Test #1"
+	} {
+	    usual TestOptComp-test
+	    ignore -cursor
+	    keep -background
+	}
+	pack $itk_component(u1)
     }
     .testUsual configure -foreground red -background white -cursor dot
 
     list [.testUsual component u1 cget -foreground] \
-         [.testUsual component u1 cget -background] \
-         [.testUsual component u1 cget -cursor]
+	 [.testUsual component u1 cget -background] \
+	 [.testUsual component u1 cget -cursor]
 } {red white gumby}
 
 set unique 0
 foreach widget {button canvas checkbutton entry frame label listbox
-                menu menubutton message radiobutton scale scrollbar
-                text toplevel} {
+		menu menubutton message radiobutton scale scrollbar
+		text toplevel} {
     set name "c[incr unique]"
     test option-2.7.$name {verify "usual" options for all Tk widgets} {
-        .testUsual do [format {
-            itk_component add %s {
-                %s $itk_interior.%s
-            }
-        } $name $widget $name]
+	.testUsual do [format {
+	    itk_component add %s {
+		%s $itk_interior.%s
+	    }
+	} $name $widget $name]
     } $name
 }
 
@@ -177,3 +179,6 @@ foreach widget {button canvas checkbutton entry frame label listbox
 #  Clean up
 # ----------------------------------------------------------------------
 itcl::delete class TestOptComp TestOptWidget
+
+::tcltest::cleanupTests
+exit

tests/privacy.test

@@ -5,28 +5,30 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: privacy.test,v 1.1 1998/07/27 18:45:32 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Define a base class with public variables and a simple mega-widget
 # ----------------------------------------------------------------------
 test privacy-1.1 {define simple mega-widget class} {
     itcl::class TestPrivacy {
-        inherit itk::Widget
-        constructor {args} {
-            eval itk_initialize $args
-        }
-        method do {args} {
-            return [eval $args]
-        }
+	inherit itk::Widget
+	constructor {args} {
+	    eval itk_initialize $args
+	}
+	method do {args} {
+	    return [eval $args]
+	}
     }
     set testobj [TestPrivacy .#auto]
     pack $testobj
@@ -34,61 +36,64 @@ test privacy-1.1 {define simple mega-widget class} {
 
 test privacy-1.2 {"itk_component add" requires certain arguments} {
     list [catch {$testobj do itk_component add foo} msg] $msg \
-         [catch {$testobj do itk_component add foo bar baz qux} msg] $msg
+	 [catch {$testobj do itk_component add foo bar baz qux} msg] $msg
 } {1 {wrong # args: should be "itk_component add ?-protected? ?-private? ?--? name createCmds ?optionCmds?"} 1 {wrong # args: should be "add ?-protected? ?-private? ?--? name createCmds ?optionCmds?}}
 
 test privacy-1.3 {"itk_component add" rejects invalid options} {
     list [catch {
-             $testobj do itk_component add -foo bar baz qux
-         } msg] $msg \
-         [catch {
-             $testobj do itk_component add -- -foo {label $itk_interior.l}
-         } msg] $msg
+	     $testobj do itk_component add -foo bar baz qux
+	 } msg] $msg \
+	 [catch {
+	     $testobj do itk_component add -- -foo {label $itk_interior.l}
+	 } msg] $msg
 } {1 {bad option "-foo": should be -private, -protected or --} 0 -foo}
 
 test privacy-1.4 {"itk_component add" recognizes privacy options} {
     list [catch {
-             $testobj do itk_component add -protected x {label $itk_interior.x}
-         } msg] $msg \
-         [catch {
-             $testobj do itk_component add -private y {label $itk_interior.y}
-         } msg] $msg
+	     $testobj do itk_component add -protected x {label $itk_interior.x}
+	 } msg] $msg \
+	 [catch {
+	     $testobj do itk_component add -private y {label $itk_interior.y}
+	 } msg] $msg
 } {0 x 0 y}
 
 test privacy-1.5 {protected/private components are hidden} {
     list [lsort [$testobj component]] \
-         [lsort [$testobj do component]]
+	 [lsort [$testobj do component]]
 } {{-foo hull} {-foo hull x y}}
 
 test privacy-1.6 {define a derived class and add protected/private comps} {
     itcl::class TestMorePrivacy {
-        inherit TestPrivacy
-        constructor {args} {
-            eval itk_initialize $args
-        }
-        method do {args} {
-            return [eval $args]
-        }
+	inherit TestPrivacy
+	constructor {args} {
+	    eval itk_initialize $args
+	}
+	method do {args} {
+	    return [eval $args]
+	}
     }
     set testobj2 [TestMorePrivacy .#auto]
     $testobj2 TestPrivacy::do itk_component add -private x {
-        label $itk_interior.x
+	label $itk_interior.x
     }
     $testobj2 TestPrivacy::do itk_component add -protected y {
-        label $itk_interior.y
+	label $itk_interior.y
     }
     $testobj2 TestPrivacy::do itk_component add z {
-        label $itk_interior.z
+	label $itk_interior.z
     }
 } {z}
 
 test privacy-1.7 {components are visible depending on namespace context} {
     list [lsort [$testobj2 component]] \
-         [lsort [$testobj2 do component]] \
-         [lsort [$testobj2 TestPrivacy::do component]]
+	 [lsort [$testobj2 do component]] \
+	 [lsort [$testobj2 TestPrivacy::do component]]
 } {{hull z} {hull y z} {hull x y z}}
 
 # ----------------------------------------------------------------------
 #  Clean up
 # ----------------------------------------------------------------------
 itcl::delete class TestPrivacy TestMorePrivacy
+
+::tcltest::cleanupTests
+exit

tests/public.test

@@ -5,32 +5,34 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: public.test,v 1.1 1998/07/27 18:45:32 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Define a base class with public variables and a simple mega-widget
 # ----------------------------------------------------------------------
 test public-1.1 {define base class and simple mega-widget class} {
     itcl::class test_public_base {
-        public variable null
-        public variable background "not used"
-        public variable message
+	public variable null
+	public variable background "not used"
+	public variable message
     }
     itcl::configbody test_public_base::message {
-        global ::test_public_status
-        lappend test_public_status "message: $message"
+	global ::test_public_status
+	lappend test_public_status "message: $message"
     }
     itcl::configbody test_public_base::background {
-        global ::test_public_status
-        lappend test_public_status "background: $background"
+	global ::test_public_status
+	lappend test_public_status "background: $background"
     }
     option add *TestPublic.background red
     option add *TestPublic.foreground white
@@ -38,18 +40,18 @@ test public-1.1 {define base class and simple mega-widget class} {
     option add *TestPublic.message "Hello, World!"
 
     itcl::class TestPublic {
-        inherit itk::Widget test_public_base
-        constructor {args} {
-            itk_component add mesg {
-                label $itk_interior.mesg
-            } {
-                keep -background -foreground -cursor
-                rename -text -message message Message
-            }
-            pack $itk_component(mesg) -side left -padx 2
+	inherit itk::Widget test_public_base
+	constructor {args} {
+	    itk_component add mesg {
+		label $itk_interior.mesg
+	    } {
+		keep -background -foreground -cursor
+		rename -text -message message Message
+	    }
+	    pack $itk_component(mesg) -side left -padx 2
 
-            eval itk_initialize $args
-        }
+	    eval itk_initialize $args
+	}
     }
     set testobj [TestPublic .#auto]
     pack $testobj
@@ -73,3 +75,6 @@ test public-1.4 {config code gets fired off} {
 #  Clean up
 # ----------------------------------------------------------------------
 itcl::delete class TestPublic test_public_base
+
+::tcltest::cleanupTests
+exit

tests/toplevel.test

@@ -5,15 +5,17 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: toplevel.test,v 1.1 1998/07/27 18:45:33 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Toplevel mega-widget
@@ -27,32 +29,32 @@ test toplevel-1.1 {define a toplevel mega-widget class} {
     option add *TestToplevel.text ""
 
     itcl::class TestToplevel {
-        inherit itk::Toplevel
-        constructor {args} {
-            itk_component add test1 {
-                label $itk_interior.t1
-            } {
-                keep -background -foreground -cursor
-                keep -text
-            }
-            pack $itk_component(test1) -side left -padx 2
-            eval itk_initialize $args
-        }
-        public method do {cmd} {
-            eval $cmd
-        }
+	inherit itk::Toplevel
+	constructor {args} {
+	    itk_component add test1 {
+		label $itk_interior.t1
+	    } {
+		keep -background -foreground -cursor
+		keep -text
+	    }
+	    pack $itk_component(test1) -side left -padx 2
+	    eval itk_initialize $args
+	}
+	public method do {cmd} {
+	    eval $cmd
+	}
 
-        private variable status ""
-        itk_option define -background background Background {} {
-            lappend status "background: $itk_option(-background)"
-        }
+	private variable status ""
+	itk_option define -background background Background {} {
+	    lappend status "background: $itk_option(-background)"
+	}
     }
     TestToplevel .#auto
 } {.testToplevel0}
 
 test toplevel-1.2 {check the list of configuration options} {
     .testToplevel0 configure
-} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground Foreground navy navy} {-takefocus takeFocus TakeFocus 0 0} {-text text Text {} {}} {-title title Title {} {}}}
+} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground Foreground navy navy} {-menu menu Menu {} {}} {-takefocus takeFocus TakeFocus 0 0} {-text text Text {} {}} {-title title Title {} {}}}
 
 test toplevel-1.3 {check the list components} {
     lsort [.testToplevel0 component]
@@ -61,8 +63,8 @@ test toplevel-1.3 {check the list components} {
 test toplevel-1.4 {check the propagation of configuration options} {
     .testToplevel0 configure -background red
     list [.testToplevel0 component hull cget -background] \
-         [.testToplevel0 component test1 cget -background] \
-         [.testToplevel0 do {set status}]
+	 [.testToplevel0 component test1 cget -background] \
+	 [.testToplevel0 do {set status}]
 } {red red {{background: linen} {background: red}}}
 
 test toplevel-1.5 {mega-widgets show up on the object list} {
@@ -74,7 +76,127 @@ test toplevel-1.6 {when a mega-widget is destroyed, its object is deleted} {
     itcl::find objects .testToplevel*
 } {}
 
+test toplevel-1.7 {when an mega-widget object is deleted, its window and any
+	components are destroyed } {
+    TestToplevel .delme
+    set label [.delme component test1]
+    itcl::delete object .delme
+    list [winfo exists .delme] [winfo exists $label]
+} {0 0}
+
+test toplevel-1.8 {when a mega-widget object is deleted, its window and any
+	components are destroyed (even if in another window) } {
+    catch {destroy .t1}
+    catch {destroy .t2}
+    catch {rename .t2 {}}
+    catch {itcl::delete class ButtonTop}
+
+    itcl::class ButtonTop {
+	inherit itk::Toplevel
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    itk_component add button {
+		button $itk_option(-container).b -text Button
+	    } {}
+	    pack $itk_component(button)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    ButtonTop .t2 -container .t1
+    set button [.t2 component button]
+    itcl::delete object .t2
+    set result [list $button [winfo exists $button]]
+    itcl::delete class ButtonTop
+    destroy .t1
+    set result
+} {.t1.b 0}
+
+test toplevel-1.9 {when a window that contains a megawidget component
+	is destroyed, the component is removed from the megawidget} {
+    catch {destroy .t1}
+    catch {destroy .t2}
+    catch {rename .t2 {}}
+    catch {itcl::delete class ButtonTop}
+
+    itcl::class ButtonTop {
+	inherit itk::Toplevel
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    itk_component add button {
+		button $itk_option(-container).b -text Button
+	    } {}
+	    pack $itk_component(button)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    ButtonTop .t2 -container .t1
+    set result [list [.t2 component]]
+    destroy .t1
+    lappend result [list [.t2 component]]
+    itcl::delete object .t2
+    itcl::delete class ButtonTop
+    set result
+} {{button hull} hull}
+
+test toplevel-1.10 {when destroying a component that is inside another
+	window protect against that case where one component destroy
+	actually destroys other contained components} {
+    catch {destroy .t1}
+    catch {destroy .t2}
+    catch {rename .t2 {}}
+    catch {itcl::delete class ButtonTop}
+
+    itcl::class ButtonTop {
+	inherit itk::Toplevel
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    # Note, the component names matter here since
+	    # [.t2 component] returns names in hash order.
+	    # We need to delete cframe first since it
+	    # is the parent of cbutton.
+
+	    itk_component add cframe {
+		button $itk_option(-container).cframe
+	    } {}
+	    pack $itk_component(cframe)
+
+	    itk_component add cbutton {
+		button $itk_component(cframe).b -text Button
+	    } {}
+	    pack $itk_component(cbutton)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    ButtonTop .t2 -container .t1
+    set result [list [.t2 component]]
+    # destructor should destroy cframe but not cbutton
+    itcl::delete object .t2
+    lappend result [winfo exists .t1.cframe]
+    destroy .t1
+    itcl::delete class ButtonTop
+    set result
+} {{hull cframe cbutton} 0}
+
+
 # ----------------------------------------------------------------------
 #  Clean up
 # ----------------------------------------------------------------------
 itcl::delete class TestToplevel
+
+::tcltest::cleanupTests
+exit

tests/widget.test

@@ -5,15 +5,17 @@
 #            Bell Labs Innovations for Lucent Technologies
 #            mmclennan@lucent.com
 #            http://www.tcltk.com/itcl
-#
-#      RCS:  $Id: widget.test,v 1.1 1998/07/27 18:45:33 stanton Exp $
 # ----------------------------------------------------------------------
 #            Copyright (c) 1993-1998  Lucent Technologies, Inc.
 # ======================================================================
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[string compare test [info procs test]] == 1} then {source defs}
+package require tcltest
+namespace import -force ::tcltest::*
+
+::tcltest::loadTestedCommands
+
 
 # ----------------------------------------------------------------------
 #  Simple mega-widget
@@ -29,39 +31,39 @@ test widget-1.1 {define a simple mega-widget class} {
     option add *TestWidget.text ""
 
     itcl::class TestWidget {
-        inherit itk::Widget
-        constructor {args} {
-            itk_component add test1 {
-                label $itk_interior.t1
-            } {
-                keep -background -foreground -cursor
-                keep -text
-            }
-            pack $itk_component(test1) -side left -padx 2
+	inherit itk::Widget
+	constructor {args} {
+	    itk_component add test1 {
+		label $itk_interior.t1
+	    } {
+		keep -background -foreground -cursor
+		keep -text
+	    }
+	    pack $itk_component(test1) -side left -padx 2
 
-            itk_component add test2 {
-                button $itk_interior.t2 -text "Push Me"
-            } {
-                keep -foreground -cursor -borderwidth -command
-                rename -background -normal normal Background
-                rename -activebackground -highlight highlight Foreground
-            }
-            pack $itk_component(test2) -side right -fill x -pady 2
+	    itk_component add test2 {
+		button $itk_interior.t2 -text "Push Me"
+	    } {
+		keep -foreground -cursor -borderwidth -command
+		rename -background -normal normal Background
+		rename -activebackground -highlight highlight Foreground
+	    }
+	    pack $itk_component(test2) -side right -fill x -pady 2
 
-            eval itk_initialize $args
-        }
-        private variable status ""
-        public method action {info} {
-            lappend status $info
-        }
+	    eval itk_initialize $args
+	}
+	private variable status ""
+	public method action {info} {
+	    lappend status $info
+	}
 
-        public method do {cmd} {
-            eval $cmd
-        }
+	public method do {cmd} {
+	    eval $cmd
+	}
 
-        itk_option define -status status Status {} {
-            lappend status $itk_option(-status)
-        }
+	itk_option define -status status Status {} {
+	    lappend status $itk_option(-status)
+	}
     }
     TestWidget .#auto
 } {.testWidget0}
@@ -89,7 +91,7 @@ foreach test {
     set result [lindex $test 1]
 
     test widget-1.3.[incr unique] {check individual configuration options} {
-        .testWidget0 configure $opt
+	.testWidget0 configure $opt
     } $result
 }
 
@@ -110,9 +112,9 @@ foreach test {
     set value [lindex $test 1]
 
     test widget-1.4.[incr unique] {set individual configuration options} {
-        list [.testWidget0 configure $opt $value] \
-             [.testWidget0 cget $opt] \
-             [.testWidget0 do "set itk_option($opt)"]
+	list [.testWidget0 configure $opt $value] \
+	     [.testWidget0 cget $opt] \
+	     [.testWidget0 do "set itk_option($opt)"]
     } [list "" $value $value]
 }
 
@@ -130,26 +132,26 @@ foreach test {
     set win  [lindex $test 1]
 
     test widget-1.6 {check the window for each component} {
-        list [.testWidget0 component $name] \
-             [.testWidget0 do "set itk_component($name)"]
+	list [.testWidget0 component $name] \
+	     [.testWidget0 do "set itk_component($name)"]
     } [list $win $win]
 }
 
 test widget-1.7 {check the propagation of configuration options} {
     list [.testWidget0 component hull cget -cursor] \
-         [.testWidget0 component test1 cget -cursor] \
-         [.testWidget0 component test2 cget -cursor]
+	 [.testWidget0 component test1 cget -cursor] \
+	 [.testWidget0 component test2 cget -cursor]
 } {trek trek trek}
 
 test widget-1.8 {check the propagation of configuration options} {
     list [.testWidget0 component hull cget -background] \
-         [.testWidget0 component test1 cget -background] \
-         [.testWidget0 component test2 cget -background]
+	 [.testWidget0 component test1 cget -background] \
+	 [.testWidget0 component test2 cget -background]
 } {red red MistyRose2}
 
 test widget-1.9 {check the propagation of configuration options} {
     list [.testWidget0 component test1 cget -text] \
-         [.testWidget0 component test2 cget -text]
+	 [.testWidget0 component test2 cget -text]
 } {Label: {Push Me}}
 
 test widget-1.10 {check the invocation of "config" code} {
@@ -157,7 +159,7 @@ test widget-1.10 {check the invocation of "config" code} {
 } {{} {test message}}
 
 test widget-1.11a {configure using the "code" command} {
-    .testWidget0 do {configure -command [code $this action "button press"]}
+    .testWidget0 do {configure -command [itcl::code $this action "button press"]}
     .testWidget0 cget -command
 } {namespace inscope ::TestWidget {::.testWidget0 action {button press}}}
 
@@ -171,17 +173,17 @@ test widget-1.11b {execute some code created by "code" command} {
 
 test widget-1.12a {components can be added on the fly} {
     .testWidget0 do {
-        itk_component add test3 {
-            label $itk_interior.t3 -text "Temporary"
-        } {
-            keep -background -foreground -cursor
-        }
+	itk_component add test3 {
+	    label $itk_interior.t3 -text "Temporary"
+	} {
+	    keep -background -foreground -cursor
+	}
     }
 } {test3}
 
 test widget-1.12b {components can be added on the fly} {
     .testWidget0 do {
-        pack $itk_component(test3) -fill x
+	pack $itk_component(test3) -fill x
     }
 } {}
 
@@ -191,8 +193,8 @@ test widget-1.13 {new components show up on the component list} {
 
 test widget-1.14 {new components are initialized properly} {
     list [.testWidget0 component test3 cget -background] \
-         [.testWidget0 component test3 cget -foreground] \
-         [.testWidget0 component test3 cget -cursor]
+	 [.testWidget0 component test3 cget -foreground] \
+	 [.testWidget0 component test3 cget -cursor]
 } {red IndianRed trek}
 
 test widget-1.15 {components can be deleted like ordinary widgets} {
@@ -204,7 +206,7 @@ test widget-1.16 {dead components are removed from the component list} {
 } {hull test1 test2}
 
 test widget-1.17 {use "configbody" command to change "config" code} {
-    configbody TestWidget::status {lappend status "new"}
+    itcl::configbody TestWidget::status {lappend status "new"}
 } {}
 
 test widget-1.18 {"config" code can really change} {
@@ -215,7 +217,7 @@ test widget-1.18 {"config" code can really change} {
 } {new new}
 
 test widget-1.19 {"config" code can change back} {
-    configbody TestWidget::status {lappend status $itk_option(-status)}
+    itcl::configbody TestWidget::status {lappend status $itk_option(-status)}
 } {}
 
 test widget-1.20 {mega-widgets show up on the object list} {
@@ -237,7 +239,155 @@ test widget-1.23 {when an object is deleted the widget is destroyed} {
     winfo exists .testWidget0
 } {0}
 
+test widget-1.24 {recreate another test widget} {
+    TestWidget .testWidget
+} {.testWidget}
+
+test widget-1.25 {when an internal component is destroyed, it is removed from the list of components, and any dead options disappear} {
+    list [lsort [.testWidget component]] \
+	 [.testWidget configure] \
+      [catch {destroy [.testWidget component test1]}] \
+	 [.testWidget component] \
+	 [.testWidget do {return [lsort [array names itk_component]]}] \
+	 [.testWidget configure]
+} {{hull test1 test2} {{-background background Background linen linen} {-borderwidth borderWidth BorderWidth 2 2} {-clientdata clientData ClientData {} {}} {-command command Command {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground Foreground navy navy} {-highlight highlight Foreground white white} {-normal normal Background ivory ivory} {-status status Status {} {}} {-text text Text {} {}}} 0 {hull test2} {hull test2} {{-background background Background linen linen} {-borderwidth borderWidth BorderWidth 2 2} {-clientdata clientData ClientData {} {}} {-command command Command {} {}} {-cursor cursor Cursor {} {}} {-foreground foreground Foreground navy navy} {-highlight highlight Foreground white white} {-normal normal Background ivory ivory} {-status status Status {} {}}}}
+
+test widget-1.26 {when an internal component is deleted (but not destroyed) it is disconnected from the option list and its binding tags are updated} {
+    set comp [.testWidget component test2]
+    list [bindtags $comp] \
+	 [bind itk-destroy-$comp <Destroy>] \
+      [catch {.testWidget do {itk_component delete test2}}] \
+	 [bindtags $comp] \
+	 [bind itk-destroy-$comp <Destroy>] \
+	 [.testWidget configure]
+} {{itk-destroy-.testWidget.t2 .testWidget.t2 Button . all} {namespace inscope ::TestWidget {::.testWidget itk_component delete test2}} 0 {.testWidget.t2 Button . all} {} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-status status Status {} {}}}}
+
+test widget-1.27 {when a mega-widget object is deleted, its window and any
+	components are destroyed (even if in another window) } {
+    catch {destroy .t1}
+    catch {rename .t1.bw {}}
+    catch {itcl::delete class ButtonWidget}
+
+    itcl::class ButtonWidget {
+	inherit itk::Widget
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    itk_component add button {
+		button $itk_option(-container).b -text Button
+	    } {}
+	    pack $itk_component(button)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    frame .t1.f
+    ButtonWidget .t1.bw -container .t1.f
+
+    pack .t1.f
+    pack .t1.bw
+
+    set button [.t1.bw component button]
+    itcl::delete object .t1.bw
+    set result [list $button [winfo exists $button]]
+    destroy .t1
+    itcl::delete class ButtonWidget
+    set result
+} {.t1.f.b 0}
+
+test widget-1.28 {when a window that contains a megawidget component
+	is destroyed, the component is removed from the megawidget} {
+    catch {destroy .t1}
+    catch {rename .t1.bw {}}
+    catch {itcl::delete class ButtonWidget}
+
+    itcl::class ButtonWidget {
+	inherit itk::Widget
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    itk_component add button {
+		button $itk_option(-container).b -text Button
+	    } {}
+	    pack $itk_component(button)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    frame .t1.f
+    ButtonWidget .t1.bw -container .t1.f
+
+    pack .t1.f
+    pack .t1.bw
+    set result [list [.t1.bw component]]
+    destroy .t1.f
+    lappend result [list [.t1.bw component]]
+
+    itcl::delete object .t1.bw
+    destroy .t1
+    itcl::delete class ButtonWidget
+    set result
+} {{button hull} hull}
+
+test widget-1.29 {when destroying a component that is inside another
+	window protect against that case where one component destroy
+	actually destroys other contained components} {
+    catch {destroy .t1}
+    catch {rename .t1.bw {}}
+    catch {itcl::delete class ButtonWidget}
+
+    itcl::class ButtonWidget {
+	inherit itk::Widget
+
+	constructor {args} {
+	    eval itk_initialize $args
+
+	    # Note, the component names matter here since
+	    # [.t2 component] returns names in hash order.
+	    # We need to delete cframe first since it
+	    # is the parent of cbutton.
+
+	    itk_component add cframe {
+		button $itk_option(-container).cframe
+	    } {}
+	    pack $itk_component(cframe)
+
+	    itk_component add cbutton {
+		button $itk_component(cframe).b -text Button
+	    } {}
+	    pack $itk_component(cbutton)
+	}
+
+	itk_option define -container container Container {}
+    }
+
+    toplevel .t1
+    frame .t1.f
+    ButtonWidget .t1.bw -container .t1.f
+
+    pack .t1.f
+    pack .t1.bw
+    set result [list [.t1.bw component]]
+    # destructor should destroy cframe but not cbutton
+    itcl::delete object .t1.bw
+    lappend result [winfo exists .t1.f.cframe]
+
+    destroy .t1
+    itcl::delete class ButtonWidget
+    set result
+} {{hull cframe cbutton} 0}
+
+
 # ----------------------------------------------------------------------
 #  Clean up
 # ----------------------------------------------------------------------
 itcl::delete class TestWidget
+
+::tcltest::cleanupTests
+exit

unix/Makefile.in

@@ -1,357 +0,0 @@
-#
-# This file is a Makefile for [incr Tk].  If it has the name
-# "Makefile.in" then it is a template for a Makefile; to generate
-# the actual Makefile, run "./configure", which is a configuration
-# script generated by the "autoconf" program (constructs like
-# "@foo@" will get replaced in the actual Makefile.
-#
-# RCS: $Id: Makefile.in,v 1.4 1999/08/21 17:05:46 matt Exp $
-
-# Current [incr Tcl] version;  used in various names.
-
-MAJOR_VERSION = @ITCL_MAJOR_VERSION@
-MINOR_VERSION = @ITCL_MINOR_VERSION@
-RELEASE_LEVEL = @ITCL_RELEASE_LEVEL@
-VERSION = @ITCL_VERSION@
-
-#----------------------------------------------------------------
-# Things you can change to personalize the Makefile for your own
-# site (you can make these changes in either Makefile.in or
-# Makefile, but changes to Makefile will get lost if you re-run
-# the configuration script).
-#----------------------------------------------------------------
-
-# Default top-level directories in which to install architecture-
-# specific files (exec_prefix) and machine-independent files such
-# as scripts (prefix).  The values specified here may be overridden
-# at configure-time with the --exec-prefix and --prefix options
-# to the "configure" script.
-
-prefix =		@prefix@
-exec_prefix =		@exec_prefix@
-
-# The following definition can be set to non-null for special systems
-# like AFS with replication.  It allows the pathnames used for installation
-# to be different than those used for actually reference files at
-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
-# when installing files.
-INSTALL_ROOT =
-
-# Directory from which applications will reference the library of Tcl
-# scripts (note: you can set the ITK_LIBRARY environment variable at
-# run-time to override the compiled-in location):
-ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
-
-# Path name to use when installing library scripts:
-SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(ITK_LIBRARY)
-
-# Directory in which to install the archive libitk.a:
-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
-
-# Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR =	$(exec_prefix)/lib
-
-# Directory in which to install the program wish:
-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-
-# Directory in which to install the include file itk.h:
-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-
-# Top-level directory for manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-
-# Directory in which to install manual entry for wish:
-MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
-
-# Directory in which to install manual entries for Tk's C library
-# procedures:
-MAN3_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man3
-
-# Directory in which to install manual entries for the built-in
-# Tcl commands implemented by Tk:
-MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
-
-# The directory containing the Tcl sources and headers appropriate
-# for this version of [incr Tk]:
-TCL_SRC_DIR =		@TCL_SRC_DIR@
-
-# The directory containing the Tcl library archive file appropriate
-# for this version of [incr Tk]:
-TCL_LIB_DIR =		@TCL_LIB_DIR@
-
-# Library flags for Tcl library
-TCL_LIB_FLAG =		@TCL_LIB_FLAG@
-
-# Tcl libraries built with optimization switches have this additional extension
-DBGX =			@TCL_DBGX@
-
-# The directory containing the Tk sources and headers appropriate
-# for this version of [incr Tk]:
-TK_SRC_DIR =		@TK_SRC_DIR@
-
-# The directory containing the Tk library archive file appropriate
-# for this version of [incr Tk]:
-TK_LIB_DIR =		@TK_LIB_DIR@
-
-# Library flags for Tk library
-TK_LIB_FLAG =		@TK_LIB_FLAG@
-
-# The directory containing the [incr Tcl] sources and headers appropriate
-# for this version of [incr Tk]:
-ITCL_SRC_DIR =		@ITCL_SRC_DIR@
-
-# The directory containing the [incr Tcl] library archive file appropriate
-# for this version of [incr Tk]:
-ITCL_LIB_DIR =		@ITCL_LIB_DIR@
-
-# A "-I" switch that can be used when compiling to make all of the
-# X11 include files accessible (the configure script will try to
-# set this value, and will cause it to be an empty string if the
-# include files are accessible via /usr/include).
-X11_INCLUDES =		@TK_XINCLUDES@
-
-# Linker switch(es) to use to link with the X11 library archive (the
-# configure script will try to set this value automatically, but you
-# can override it).
-X11_LIB_SWITCHES =	@TK_XLIBSW@
-
-# Libraries to use when linking:  must include at least Tk, Tcl, Xlib,
-# and the math library (in that order).  The "LIBS" part will be
-# replaced (or has already been replaced) with relevant libraries as
-# determined by the configure script.
-EXE_LIBS = @TK_BUILD_LIB_SPEC@ $(X11_LIB_SWITCHES) \
-	@ITCL_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ \
-	@TCL_LIBS@ @DL_LIBS@ -lc
-
-LIBS = @TK_BUILD_STUB_LIB_SPEC@ $(X11_LIB_SWITCHES) \
-	@ITCL_BUILD_LIB_SPEC@ @TCL_BUILD_STUB_LIB_SPEC@ \
-	@TCL_LIBS@ @DL_LIBS@ -lc
-
-# To change the compiler switches, for example to change from -O
-# to -g, change the following line:
-CFLAGS = @CFLAGS@
-
-# To disable ANSI-C procedure prototypes reverse the comment characters
-# on the following lines:
-PROTO_FLAGS =
-#PROTO_FLAGS = -DNO_PROTOTYPE
-
-# To enable memory debugging reverse the comment characters on the following
-# lines.  Warning:  if you enable memory debugging, you must do it
-# *everywhere*, including all the code that calls Tcl, and you must use
-# ckalloc and ckfree everywhere instead of malloc and free.
-MEM_DEBUG_FLAGS =
-#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG
-
-# If your X server is X11R4 or earlier, then you may wish to reverse
-# the comment characters on the following two lines.  This will enable
-# extra code to speed up XStringToKeysym.  In X11R5 and later releases
-# XStringToKeysym is plenty fast, so you needn't define REDO_KEYSYM_LOOKUP.
-KEYSYM_FLAGS =
-#KEYSYM_FLAGS = -DREDO_KEYSYM_LOOKUP
-
-# Some versions of make, like SGI's, use the following variable to
-# determine which shell to use for executing commands:
-SHELL =		/bin/sh
-
-# Tk used to let the configure script choose which program to use
-# for installing, but there are just too many different versions of
-# "install" around;  better to use the install-sh script that comes
-# with the distribution, which is slower but guaranteed to work.
-
-INSTALL = $(TOP_DIR)/../config/install-sh -c
-INSTALL_PROGRAM =	${INSTALL}
-INSTALL_DATA =		${INSTALL} -m 644
-MKINSTALLDIRS =		$(TOP_DIR)/../config/mkinstalldirs
-
-# The symbols below provide support for dynamic loading and shared
-# libraries.  The values of the symbols are normally set by the
-# configure script.  You shouldn't normally need to modify any of
-# these definitions by hand.
-
-SHLIB_CFLAGS = @SHLIB_CFLAGS@
-
-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
-
-ITK_LIB_FILE = @ITK_LIB_FILE@
-#ITK_LIB_FILE = libitk.a
-
-ITK_STUB_LIB_FILE = @ITK_STUB_LIB_FILE@
-#ITK_LIB_FILE = libitkstub.a
-
-# The symbol below provides support for dynamic loading and shared
-# libraries.  See configure.in for a description of what it means.
-# The values of the symbolis normally set by the configure script.
-
-SHLIB_LD = @SHLIB_LD@
-
-#----------------------------------------------------------------
-# The information below is modified by the configure script when
-# Makefile is generated from Makefile.in.  You shouldn't normally
-# modify any of this stuff by hand.
-#----------------------------------------------------------------
-
-AC_FLAGS =		@TCL_DEFS@
-RANLIB =		@RANLIB@
-TOP_DIR =		@ITK_SRC_DIR@
-GENERIC_DIR =		$(TOP_DIR)/generic
-UNIX_DIR =		$(TOP_DIR)/unix
-
-#----------------------------------------------------------------
-# The information below should be usable as is.  The configure
-# script won't modify it and you shouldn't need to modify it
-# either.
-#----------------------------------------------------------------
-
-
-CC = @CC@
-EXE_CC_SWITCHES = $(CFLAGS) $(SHLIB_CFLAGS) -I$(UNIX_DIR) -I$(GENERIC_DIR) \
--I$(TCL_SRC_DIR)/generic -I$(ITCL_SRC_DIR)/generic \
--I$(TK_SRC_DIR)/generic $(X11_INCLUDES) \
-$(AC_FLAGS) $(PROTO_FLAGS) $(MEM_DEBUG_FLAGS) $(KEYSYM_FLAGS) \
--DITK_LIBRARY=\"$(ITK_LIBRARY)\"
-
-CC_SWITCHES = $(EXE_CC_SWITCHES) @TCL_STUB_FLAGS@
-
-OBJS = itkStubInit.o itk_cmds.o itk_option.o itk_archetype.o itk_util.o
-
-ITK_STUB_LIB_OBJS = itkStubLib.o
-
-SRCS = $(GENERIC_DIR)/itk_cmds.c $(GENERIC_DIR)/itk_option.c \
-	$(GENERIC_DIR)/itk_archetype.c $(GENERIC_DIR)/itk_util.c \
-	$(GENERIC_DIR)/itkStubInit.c $(GENERIC_DIR)/itkStubLib.c 
-
-all: itkwish
-
-# The following target is configured by autoconf to generate either
-# a shared library or non-shared library for [incr Tk].
-
-@ITK_LIB_FILE@: ${OBJS}
-	rm -f $(ITK_LIB_FILE)
-	@MAKE_LIB@
-	$(RANLIB) $(ITK_LIB_FILE)
-
-itkwish: tkAppInit.o $(ITK_LIB_FILE) $(ITK_STUB_LIB_FILE)
-	$(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \
-		$(EXE_LIBS) $(LD_SEARCH_FLAGS) -o itkwish
-
-$(ITK_STUB_LIB_FILE): $(ITCL_STUB_LIB_OBJS) 
-	rm -f $(ITK_STUB_LIB_FILE)
-	@MAKE_STUB_LIB@
-	$(RANLIB) $(ITCL_STUB_LIB_FILE)
-
-# Note, in the target below TCL_LIBRARY needs to be set or else
-# "make test" won't work in the case where the compilation directory
-# isn't the same as the source directory.
-
-test: itkwish
-	TCLLIBPATH="`pwd` $(TK_LIB_DIR) $(ITCL_LIB_DIR) $(TCL_LIB_DIR)"; export TCLLIBPATH; \
-	LD_LIBRARY_PATH=`pwd`:$(ITCL_LIB_DIR):$(TK_LIB_DIR):$(TCL_LIB_DIR):$(LD_LIBRARY_PATH); export LD_LIBRARY_PATH; \
-	TCL_LIBRARY=$(TCL_SRC_DIR)/library; export TCL_LIBRARY; \
-	TK_LIBRARY=$(TK_SRC_DIR)/library; export TK_LIBRARY; \
-	ITCL_LIBRARY=$(ITCL_SRC_DIR)/library; export ITCL_LIBRARY; \
-	ITK_LIBRARY=$(TOP_DIR)/library; export ITK_LIBRARY; \
-	( echo cd $(TOP_DIR)/tests\; source all\; exit ) \
-	| ./itkwish -geometry +0+0
-
-install: install-binaries install-libraries install-man
-
-install-binaries: $(ITK_LIB_FILE) $(ITK_STUB_LIB_FILE) itkwish
-	@$(MKINSTALLDIRS) $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR)
-	@echo "Installing $(ITK_LIB_FILE)"
-	@$(INSTALL_DATA) $(ITK_LIB_FILE) $(LIB_INSTALL_DIR)
-	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_LIB_FILE))
-	@chmod 555 $(LIB_INSTALL_DIR)/$(ITK_LIB_FILE)
-	@echo "Installing $(ITK_STUB_LIB_FILE)"
-	@$(INSTALL_DATA) $(ITK_STUB_LIB_FILE) $(LIB_INSTALL_DIR)
-	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(ITK_STUB_LIB_FILE))
-	@chmod 555 $(LIB_INSTALL_DIR)/$(ITK_STUB_LIB_FILE)
-	@echo "Installing itkwish"
-	$(INSTALL_PROGRAM) itkwish $(BIN_INSTALL_DIR)/itkwish$(VERSION)
-	@echo "Installing itkConfig.sh"
-	@$(INSTALL_DATA) itkConfig.sh $(LIB_INSTALL_DIR)/itkConfig.sh
-
-install-libraries:
-	@$(MKINSTALLDIRS) $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)
-	@echo "Installing itk.h"
-	@$(INSTALL_DATA) $(GENERIC_DIR)/itk.h $(INCLUDE_INSTALL_DIR)
-	@for i in $(TOP_DIR)/library/*.* $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
-	    do \
-	    echo "Installing $$i"; \
-	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
-	    done;
-	@echo "Installing pkgIndex.tcl"
-	@$(INSTALL_DATA) pkgIndex.tcl $(SCRIPT_INSTALL_DIR)
-
-install-man:
-	@$(MKINSTALLDIRS) $(MAN1_INSTALL_DIR) $(MANN_INSTALL_DIR)
-	@cd $(TOP_DIR)/doc; for i in *.1; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-	    done;
-	@cd $(TOP_DIR)/doc; for i in *.n; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-	    done;
-
-Makefile: $(UNIX_DIR)/Makefile.in
-	$(SHELL) config.status
-
-genstubs:
-	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
-		$(GENERIC_DIR)/itk.decls $(GENERIC_DIR)/itkInt.decls
-
-clean:
-	rm -f *.a *.o core errs *~ \#* TAGS *.E a.out errors \
-	rm -f itkwish* libitk* *pure* *% ../tests/core
-
-distclean: clean
-	rm -f Makefile config.status config.log config.cache pkgIndex.tcl
-
-pure: tkAppInit.o $(ITK_LIB_FILE)
-	purify $(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \
-		$(LIBS) $(LD_SEARCH_FLAGS) -o itkwish.pure
-
-profile: tkAppInit.o $(ITK_LIB_FILE)
-	quantify $(CC) @LD_FLAGS@ tkAppInit.o @ITK_BUILD_LIB_SPEC@ \
-		$(LIBS) $(LD_SEARCH_FLAGS) -o itkwish.pure
-
-depend:
-	makedepend -- $(CC_SWITCHES) -- $(SRCS)
-
-configure: configure.in
-	autoconf
-
-.c.o:
-	$(CC) -c $(CC_SWITCHES) $<
-
-tkAppInit.o:	$(UNIX_DIR)/tkAppInit.c Makefile
-	$(CC) -c $(EXE_CC_SWITCHES) $(UNIX_DIR)/tkAppInit.c
-
-itkStubInit.o: $(GENERIC_DIR)/itkStubInit.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itkStubInit.c
-
-itkStubLib.o: $(GENERIC_DIR)/itkStubLib.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itkStubLib.c
-
-itk_cmds.o:	$(GENERIC_DIR)/itk_cmds.c Makefile
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_cmds.c
-
-itk_option.o:	$(GENERIC_DIR)/itk_option.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_option.c
-
-itk_archetype.o:	$(GENERIC_DIR)/itk_archetype.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_archetype.c
-
-itk_util.o:	$(GENERIC_DIR)/itk_util.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/itk_util.c
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.

unix/configure.in

@@ -1,266 +0,0 @@
-dnl	This file is an input file used by the GNU "autoconf" program to
-dnl	generate the file "configure", which is run during Tk installation
-dnl	to configure the system for the local environment.
-
-AC_INIT(../generic/itk.h)
-# RCS: $Id: configure.in,v 1.5 1999/06/28 18:47:35 hershey Exp $
-
-ITCL_VERSION=3.1
-ITCL_MAJOR_VERSION=3
-ITCL_MINOR_VERSION=1
-ITCL_RELEASE_LEVEL=0
-VERSION=${ITCL_VERSION}
-
-AC_CONFIG_AUX_DIR(../../config)
-AC_PREREQ(2.0)
-
-# -----------------------------------------------------------------------
-#   Set up a new default --prefix.  If a previous installation of
-#   [incr Tcl] can be found searching $PATH use that directory.
-# -----------------------------------------------------------------------
-
-AC_PREFIX_DEFAULT(/usr/local)
-AC_PREFIX_PROGRAM(tclsh)
-
-if test "${prefix}" = "NONE"; then
-    prefix=/usr/local
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-
-# -----------------------------------------------------------------------
-BUILD_DIR=`pwd`
-ITK_SRC_DIR=`cd $srcdir/..; pwd`
-cd ${BUILD_DIR}
-
-AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available],
-    [itk_ok=$enableval], [itk_ok=no])
-if test "$itk_ok" = "yes"; then
-    AC_PROG_CC
-else
-    CC=${CC-cc}
-AC_SUBST(CC)
-fi
-
-#--------------------------------------------------------------------
-#   See if there was a command-line option for where Tcl is;  if
-#   not, search for Tcl.
-#--------------------------------------------------------------------
-
-AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.0 binaries from DIR],
-        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl8.*/unix`)
-
-TCL_LIB_DIR=""
-for dir in $itcl_search $exec_prefix/lib ; do
-    if test -r $dir/tclConfig.sh; then
-        TCL_LIB_DIR=$dir
-        break
-    fi
-done
-
-if test -z "$TCL_LIB_DIR"; then
-    AC_MSG_ERROR(Can't find Tcl libraries.  Use --with-tcl to specify the directory containing tclConfig.sh on your system.)
-fi
-
-#--------------------------------------------------------------------
-#   Read in configuration information generated by Tcl for shared
-#   libraries, and arrange for it to be substituted into our
-#   Makefile.
-#--------------------------------------------------------------------
-
-file=$TCL_LIB_DIR/tclConfig.sh
-. $file
-CFLAGS=$TCL_CFLAGS
-SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
-SHLIB_LD=$TCL_SHLIB_LD
-SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS
-SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
-DL_LIBS=$TCL_DL_LIBS
-LD_FLAGS=$TCL_LD_FLAGS
-LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
-
-#--------------------------------------------------------------------
-#   Make sure that we can find the Tcl sources, so we can include
-#   the "tclInt.h" file.
-#--------------------------------------------------------------------
-
-if test ! -d "$TCL_SRC_DIR"; then
-    AC_MSG_ERROR(Can't find Tcl source directory "$TCL_SRC_DIR".  Itcl can't be built without this directory.)
-fi
-
-#--------------------------------------------------------------------
-#   See if there was a command-line option for where Tk is;  if
-#   not, search for Tk.
-#--------------------------------------------------------------------
-
-AC_ARG_WITH(tk, [  --with-tk=DIR           use Tk 8.0 binaries from DIR],
-        itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk8.*/unix`)
-
-TK_LIB_DIR=""
-for dir in $itcl_search $exec_prefix/lib ; do
-    if test -r $dir/tkConfig.sh; then
-        TK_LIB_DIR=$dir
-        break
-    fi
-done
-
-if test -z "$TK_LIB_DIR"; then
-    AC_MSG_ERROR(Can't find Tk libraries.  Use --with-tk to specify the directory containing tkConfig.sh on your system.)
-fi
-
-file=$TK_LIB_DIR/tkConfig.sh
-. $file
-
-#--------------------------------------------------------------------
-#   See if there was a command-line option for where [incr Tcl] is.
-#   If not, assume that its top-level directory is a sibling of ours.
-#--------------------------------------------------------------------
-
-AC_ARG_WITH(itcl, [  --with-itcl=DIR          use Itcl binaries from DIR],
-        ITCL_LIB_DIR=$withval, ITCL_LIB_DIR=`cd ../../itcl/unix; pwd`)
-
-if test ! -r "$ITCL_LIB_DIR/itclConfig.sh"; then
-    AC_MSG_ERROR(Can't find Itcl libraries.  Have you built Itcl yet?  Use --with-itcl to specify the directory containing itclConfig.sh on your system.)
-fi
-
-file=$ITCL_LIB_DIR/itclConfig.sh
-. $file
-
-#--------------------------------------------------------------------
-#   If this is gcc, add some extra compile flags.
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING([whether C compiler is gcc])
-AC_CACHE_VAL(itcl_cv_prog_gcc,
-    AC_EGREP_CPP(_cc_is_gcc_, [
-#ifdef __GNUC__
-_cc_is_gcc_
-#endif
-],      [itcl_cv_prog_gcc=yes], [itcl_cv_prog_gcc=no]))
-AC_MSG_RESULT([$itcl_cv_prog_gcc])
-
-if test -z "$CFLAGS" ; then
-    CFLAGS="-O"
-fi
-if test "$itcl_cv_prog_gcc" = "yes" ; then
-    CFLAGS="$CFLAGS -Wall -Wconversion -Wno-implicit-int"
-fi
-
-AC_MSG_CHECKING([default compiler flags])
-AC_ARG_WITH(cflags, [  --with-cflags=FLAGS     set compiler flags to FLAGS],
-    [CFLAGS="$with_cflags"])
-
-AC_MSG_RESULT([$CFLAGS])
-
-if test "$TCL_CC" != "$CC" ; then
-    echo ""
-    echo "WARNING:  Compiler is $CC but Tcl was compiled with $TCL_CC"
-    echo ""
-fi
-
-#--------------------------------------------------------------------
-#   The statements below define a collection of symbols related to
-#   building libitk as a shared library instead of a static library.
-#--------------------------------------------------------------------
-
-AC_ARG_ENABLE(shared,
-    [  --enable-shared         build libitk as a shared library],
-    [ok=$enableval], [ok=yes])
-if test "$ok" = "yes"; then
-    if test ${TCL_SHARED_BUILD} = 0; then
-        AC_MSG_ERROR(Tcl was not built with --enable-shared, so you can't use shared libraries.)
-    fi
-    SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-    TCL_STUB_FLAGS=-DUSE_TCL_STUBS
-    eval "ITK_LIB_FILE=libitk${VERSION}${SHLIB_SUFFIX}"
-    ITK_PKG_FILE="[[file join [file dirname \$dir] ${ITK_LIB_FILE}]]"
-    MAKE_LIB="\$(SHLIB_LD) -o ${ITK_LIB_FILE} \$(OBJS) ${SHLIB_LD_LIBS}"
-    RANLIB=":"
-else
-    SHLIB_CFLAGS=""
-    TCL_STUB_FLAGS=""
-    eval "ITK_LIB_FILE=libitk${VERSION}.a"
-    ITK_PKG_FILE=""
-    MAKE_LIB="ar cr ${ITK_LIB_FILE} \${OBJS}"
-fi
-
-eval "STUB_LIB_FILE=libitkstub${TCL_UNSHARED_LIB_SUFFIX}"
-MAKE_STUB_LIB="ar cr \${ITK_STUB_LIB_FILE} \${ITK_STUB_LIB_OBJS}"
-ITK_STUB_LIB_FILE=${STUB_LIB_FILE}
-
-
-# Note:  in the following variable, it's important to use the absolute
-# path name of the Tcl directory rather than "..":  this is because
-# AIX remembers this path and will attempt to use it at run-time to look
-# up the Tcl library.
-
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    ITK_BUILD_LIB_SPEC="-L`pwd` -litk${VERSION}"
-    ITK_LIB_SPEC="-L${exec_prefix}/lib -litk${VERSION}"
-else
-    ITK_BUILD_LIB_SPEC="-L`pwd` -litk`echo ${VERSION} | tr -d .`"
-    ITK_LIB_SPEC="-L${exec_prefix}/lib -litk`echo ${VERSION} | tr -d .`"
-fi
-
-ITK_BUILD_STUB_LIB_SPEC="-L`pwd` -litkstub${VERSION}"
-ITK_STUB_LIB_SPEC="-L${exec_prefix}/lib -litkstub${VERSION}"
-
-AC_SUBST(CFLAGS)
-AC_SUBST(DL_LIBS)
-AC_SUBST(LD_FLAGS)
-AC_SUBST(MAKE_LIB)
-AC_SUBST(MAKE_STUB_LIB)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_LD_LIBS)
-AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(LD_SEARCH_FLAGS)
-
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_SRC_DIR)
-AC_SUBST(TCL_LIB_SPEC)
-AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
-AC_SUBST(TCL_BUILD_LIB_SPEC)
-AC_SUBST(TCL_STUB_FLAGS)
-AC_SUBST(TCL_LIB_FLAG)
-AC_SUBST(TCL_DBGX)
-AC_SUBST(TCL_DEFS)
-AC_SUBST(TCL_LIBS)
-AC_SUBST(TCL_SHLIB_LD_LIBS)
-AC_SUBST(TCL_SHLIB_SUFFIX)
-AC_SUBST(TCL_COMPAT_OBJS)
-
-AC_SUBST(TK_VERSION)
-AC_SUBST(TK_BUILD_LIB_SPEC)
-AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
-AC_SUBST(TK_LIB_DIR)
-AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TK_LIB_FLAG)
-AC_SUBST(TK_XINCLUDES)
-AC_SUBST(TK_XLIBSW)
-AC_SUBST(TK_SRC_DIR)
-
-AC_SUBST(ITCL_VERSION)
-AC_SUBST(ITCL_MAJOR_VERSION)
-AC_SUBST(ITCL_MINOR_VERSION)
-AC_SUBST(ITCL_RELEASE_LEVEL)
-AC_SUBST(ITCL_BUILD_LIB_SPEC)
-AC_SUBST(ITCL_LIB_DIR)
-AC_SUBST(ITCL_LIB_SPEC)
-AC_SUBST(ITCL_PKG_FILE)
-AC_SUBST(ITCL_SRC_DIR)
-
-AC_SUBST(ITK_BUILD_LIB_SPEC)
-AC_SUBST(ITK_LIB_FILE)
-AC_SUBST(ITK_LIB_SPEC)
-AC_SUBST(ITK_BUILD_STUB_LIB_SPEC)
-AC_SUBST(ITK_STUB_LIB_FILE)
-AC_SUBST(ITK_STUB_LIB_SPEC)
-AC_SUBST(ITK_PKG_FILE)
-AC_SUBST(ITK_SRC_DIR)
-
-AC_OUTPUT(Makefile pkgIndex.tcl itkConfig.sh)

unix/itkConfig.sh

@@ -1,47 +0,0 @@
-# itkConfig.sh --
-# 
-# This shell script (for sh) is generated automatically by Itk's
-# configure script.  It will create shell variables for most of
-# the configuration options discovered by the configure script.
-# This script is intended to be included by the configure scripts
-# for Itk extensions so that they don't have to figure this all
-# out for themselves.  This file does not duplicate information
-# already provided by tclConfig.sh, tkConfig.sh or itclConfig.sh,
-# so you may need to use those files in addition to this one.
-#
-# The information in this file is specific to a single platform.
-
-# Itcl's version number.
-ITCL_VERSION='3.1'
-ITCL_MAJOR_VERSION='3'
-ITCL_MINOR_VERSION='1'
-
-# The name of the Itk library (may be either a .a file or a shared library):
-ITK_LIB_FILE=libitk3.1.so
-
-# String to pass to linker to pick up the Itk library from its
-# build directory.
-ITK_BUILD_LIB_SPEC='-L/home/hershey/cvs/itcl3.1.0/itk/unix -litk3.1'
-
-# String to pass to linker to pick up the Itk library from its
-# installed directory.
-ITK_LIB_SPEC='-L/home/hershey/cvs/lib -litk3.1'
-
-# The name of the Itk stub library (a .a file):
-ITK_STUB_LIB_FILE=libitkstub3.1.a
-
-# String to pass to linker to pick up the Itk stub library from its
-# build directory.
-ITK_BUILD_STUB_LIB_SPEC='-L/home/hershey/cvs/itcl3.1.0/itk/unix -litkstub3.1'
-
-# String to pass to linker to pick up the Itk stub library from its
-# installed directory.
-ITK_STUB_LIB_SPEC='-L/home/hershey/cvs/lib -litkstub3.1'
-
-# Location of the top-level source directories from which [incr Tk]
-# was built.  This is the directory that contains a README file as well
-# as subdirectories such as generic, unix, etc.  If [incr Tk] was
-# compiled in a different place than the directory containing the source
-# files, this points to the location of the sources, not the location
-# where [incr Tk] was compiled.
-ITK_SRC_DIR='/home/hershey/cvs/itcl3.1.0/itk'

unix/pkgIndex.tcl.in

@@ -1,3 +0,0 @@
-# Tcl package index file, version 1.0
-
-package ifneeded Itk @ITCL_VERSION@ [list load "@ITK_PKG_FILE@" Itk]

unix/tkAppInit.c

@@ -1,151 +0,0 @@
-/* 
- * tkAppInit.c --
- *
- *	Provides a default version of the Tcl_AppInit procedure for
- *	use in wish and similar Tk-based applications.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tkAppInit.c 1.22 96/05/29 09:47:08
- */
-
-#include "tk.h"
-#include "itk.h"
-
-/* include tclInt.h for access to namespace API */
-#include "tclInt.h"
-
-/*
- * The following variable is a special hack that is needed in order for
- * Sun shared libraries to be used for Tcl.
- */
-
-extern int matherr();
-int *tclDummyMathPtr = (int *) matherr;
-
-#ifdef TK_TEST
-EXTERN int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TK_TEST */
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	This is the main program for the application.
- *
- * Results:
- *	None: Tk_Main never returns here, so this procedure never
- *	returns either.
- *
- * Side effects:
- *	Whatever the application does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-main(argc, argv)
-    int argc;			/* Number of command-line arguments. */
-    char **argv;		/* Values of command-line arguments. */
-{
-    Tk_Main(argc, argv, Tcl_AppInit);
-    return 0;			/* Needed only to prevent compiler warning. */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in interp->result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(interp)
-    Tcl_Interp *interp;		/* Interpreter for application. */
-{
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    if (Tk_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
-#ifdef TK_TEST
-    if (Tktest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tktest", Tktest_Init,
-            (Tcl_PackageInitProc *) NULL);
-#endif /* TK_TEST */
-
-
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-    if (Itcl_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    if (Itk_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Itcl", Itcl_Init, Itcl_SafeInit);
-    Tcl_StaticPackage(interp, "Itk", Itk_Init, (Tcl_PackageInitProc *) NULL);
-
-    /*
-     *  This is itkwish, so import all [incr Tcl] commands by
-     *  default into the global namespace.  Fix up the autoloader
-     *  to do the same.
-     */
-    if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
-            "::itk::*", /* allowOverwrite */ 1) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    if (Tcl_Import(interp, Tcl_GetGlobalNamespace(interp),
-            "::itcl::*", /* allowOverwrite */ 1) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    if (Tcl_Eval(interp, "auto_mkindex_parser::slavehook { _%@namespace import -force ::itcl::* ::itk::* }") != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     */
-
-    /*
-     * Specify a user-specific startup file to invoke if the application
-     * is run interactively.  Typically the startup file is "~/.apprc"
-     * where "app" is the name of the application.  If this line is deleted
-     * then no user-specific startup file will be run under any conditions.
-     */
-
-    Tcl_SetVar(interp, "tcl_rcFileName", "~/.itkwishrc", TCL_GLOBAL_ONLY);
-    return TCL_OK;
-}

win/dllEntryPoint.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * dllEntryPoint.c --
  *
  *	This file implements the Dll entry point as needed by Windows.
@@ -7,7 +7,16 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #if defined(_MSC_VER)
+    /* Only do this when MSVC++ is compiling us. */
 #   define DllEntryPoint DllMain
+#   if defined(USE_TCL_STUBS) && (!defined(_MT) || !defined(_DLL) || defined(_DEBUG))
+	/*
+	 * This fixes a bug with how the Stubs library was compiled.
+	 * The requirement for msvcrt.lib from tclstubXX.lib should
+	 * be removed.
+	 */
+#	pragma comment(linker, "-nodefaultlib:msvcrt.lib")
+#   endif
 #endif
 
 /*

win/gitmanifest.in

@@ -0,0 +1 @@
+git-

win/itkUuid.h.in

@@ -0,0 +1 @@
+#define ITK_VERSION_UUID \

win/makefile.bc

@@ -1,227 +0,0 @@
-# Borland C++ 4.52 makefile
-#
-# Copyright (c) 1993-1996 Lucent Technologies
-# based on original from
-# Copyright (c) 1995-1996 by Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-
-!include "..\..\Makefile.bc"
-
-#
-# Project directories
-#
-# ROOT = top of source tree
-# TMPDIR = location where .obj files should be stored during build
-
-ROOT	   		= ..
-TMPDIR			= .
-TARGET_LIB_ITK		= $(TARGET_LIB)\Itk2.2
-TARGET_DOC_ITK 		= $(TARGET_DOC)\Itk
-
-# uncomment the following line to compile with symbols
-#DEBUG=1
-
-# uncomment the following two lines to compile with TCL_MEM_DEBUG
-#DEBUGDEFINES	=TCL_MEM_DEBUG
-
-
-INCLUDES   =$(BORLAND)\include;$(ROOT)\generic;$(ROOT);$(TCLDIR)\generic;$(ITCLDIR)\generic;$(TKDIR)\generic;$(TKDIR)\xlib;$(TKDIR)\bitmaps
-LIBDIRS    =$(BORLAND)\lib;$(ROOT)\win
-
-!ifndef DEBUG
-
-# these macros cause maximum optimization and no symbols
-DEBUGLDFLAGS =
-DEBUGCCFLAGS = -v- -vi- -O2
-
-!else
-
-# these macros enable debugging
-DEBUGLDFLAGS = -v
-DEBUGCCFLAGS = -k -Od -v
-
-!endif
-
-DEFINES = _RTLDLL;USE_TCLALLOC=0;STRICT;$(DEBUGDEFINES);ITCL_NAMESPACES=1
-PROJECTCCFLAGS= $(DEBUGCCFLAGS) -w-par -w-stu
-
-LNFLAGS_exe = -Tpe -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0w32
-LNFLAGS_dll = -Tpd -aa -c $(DEBUGLDFLAGS) $(BORLAND)\lib\c0d32
-
-LNLIBS_exe =	$(ITKLIB) $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i
-LNLIBS_dll =	$(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) import32 cw32i
-
-#
-# Global makefile settings
-#
-
-.AUTODEPEND
-.CACHEAUTODEPEND
-
-.suffixes: .c .dll .lib .obj .exe
-
-.path.c=$(ROOT)\win;$(ROOT)\generic;
-.path.obj=$(TMPDIR)
-
-ITKWISHOBJS = \
-	$(TMPDIR)\winMain.obj
-
-ITKOBJS = \
-	$(TMPDIR)\itk_archetype.obj \
-	$(TMPDIR)\itk_cmds.obj \
-	$(TMPDIR)\itk_option.obj \
-	$(TMPDIR)\itk_util.obj \
-	$(TMPDIR)\dllEntryPoint.obj
-
-ITKWISH = itkwish.exe
-
-
-#
-# Targets
-#
-
-all: cfgdll $(ITKDLL) cfgexe $(ITKWISH) cfgcln
-test: $(ITKWISH)
-	$(CP) $(TCLLIBDIR)\*.dll
-	$(CP) $(TKLIBDIR)\*.dll
-	$(CP) $(ITCLLIBDIR)\*.dll
-#set ITK_
-	$(ITKWISH) <<|
-   cd ..\tests
-   source all
-   exit
-|
-
-install: all
-	$(MKDIR) "$(TARGET_ROOT)"
-	$(MKDIR) "$(TARGET_BIN)"
-	$(MKDIR) "$(TARGET_LIB_ROOT)"
-	$(MKDIR) "$(TARGET_LIB)"
-	$(MKDIR) "$(TARGET_LIB_ITK)"
-	$(MKDIR) "$(TARGET_INCLUDE_ROOT)"
-	$(MKDIR) "$(TARGET_INCLUDE)"
-	$(MKDIR) "$(TARGET_DOC)"
-	$(MKDIR) "$(TARGET_DOC_ITK)"
-	$(CP) $(TMPDIR)\$(ITKWISH) "$(TARGET_BIN)"
-	$(CP) $(TMPDIR)\$(ITKDLL) "$(TARGET_BIN)"
-	$(CP) $(ROOT)\generic\itk.h "$(TARGET_INCLUDE)"
-	$(CP) $(ROOT)\library\*.* "$(TARGET_LIB_ITK)"
-	$(CP) $(ROOT)\win\*.tcl "$(TARGET_LIB_ITK)"
-	$(CP) $(ROOT)\..\html\Itk\*.* "$(TARGET_DOC_ITK)"
-
-# Implicit Targets
-
-.c.obj:
-	@$(BCC32) {$< }
-
-.dll.lib:
-	$(IMPLIB) -c $@ $<
-
-.rc.res:
-	$(RC) -i$(ROOT)\generic;$(ITCLDIR)\generic;$(TCLDIR)\generic;$(TKDIR)\generic $<
-
-#
-# Special case object file targets
-#
-
-#
-# Configuration file targets - these files are implicitly used by the compiler
-#
-
-cfgdll:
-	@$(CP) &&|
-		-n$(TMPDIR) -I$(INCLUDES) -c -WD
-		-D$(DEFINES) -3 -d $(PROJECTCCFLAGS)
-| bcc32.cfg >NUL
-
-cfgexe:
-	@$(CP) &&|
-		-n$(TMPDIR) -I$(INCLUDES) -c -W
-		-D$(DEFINES) -3 -d $(PROJECTCCFLAGS)
-| bcc32.cfg >NUL
-
-cfgtest:
-	@$(CP) &&|
-		-n$(TMPDIR) -I$(INCLUDES) -c -W
-		-D$(DEFINES);TCL_TEST -3 -d $(PROJECTCCFLAGS)
-| bcc32.cfg >NUL
-
-cfgcln:
-	@$(RM) bcc32.cfg
-
-#
-# Executable targets
-#
-
-$(ITKDLL): $(ITKOBJS) itk.def rc\itk.res
-	$(TLINK32) @&&|
-$(LNFLAGS_dll) $(ITKOBJS)
-$@
--x
-$(LNLIBS_dll)
-itk.def
-rc\itk.res
-|
-
-$(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) rc\itkwish.res
-	$(TLINK32) @&&|
-$(LNFLAGS_exe) $(ITKWISHOBJS)
-$@
--x
-$(LNLIBS_exe)
-|, &&|
-EXETYPE WINDOWS
-CODE PRELOAD MOVEABLE DISCARDABLE
-DATA PRELOAD MOVEABLE MULTIPLE
-|, rc\itkwish.res
-
-#
-# Other dependencies
-#
-
-
-# The following rule automatically generates a tk.def file containing
-# an export entry for every public symbol in the $(TKDLL) library.
-
-itk.def: $(ITKOBJS)
-	$(TCLLIBDIR)\dumpexts.exe -o $@ $(ITKDLL) @&&|
-		$(ITKOBJS)
-|
-
-# Dependencies for .rc files:
-rc\itk.res: rc\*.cur rc\itk.ico
-rc\itkwish.res: rc\*.cur rc\itk.ico
-
-# debugging rules, the .dll and .exe files must be in the same
-# directory as the object files for debugging purposes
-
-$(TMPDIR)\$(ITKDLL): $(ITKDLL)
-	$(CP) $(ITKDLL) $(TMPDIR)
-
-$(TMPDIR)\$(ITCLDLL): $(ITCLLIBDIR)\$(ITCLDLL)
-        $(CP) $(ITCLLIBDIR)\$(ITCLDLL) $(TMPDIR)
-
-$(TMPDIR)\$(TKDLL): $(TKLIBDIR)\$(TKDLL)
-        $(CP) $(TKLIBDIR)\$(TKDLL) $(TMPDIR)
-
-$(TMPDIR)\$(TCLDLL): $(TCLLIBDIR)\$(TCLDLL)
-	$(CP) $(TCLLIBDIR)\$(TCLDLL) $(TMPDIR)
-
-$(TMPDIR)\$(ITKWISH): $(ITKWISH)
-	$(CP) $(ITKWISH) $(TMPDIR)
-
-debug: $(TMPDIR)\$(ITKDLL) $(TMPDIR)\$(ITCLDLL) $(TMPDIR)\$(TKDLL) $(TMPDIR)\$(TCLDLL)
-
-
-# remove all generated files
-
-clean:
-	-@$(RM) $(ITKWISH)
-	-@$(RM) $(ITKLIB)
-	-@$(RM) $(ITKDLL)
-	-@$(RM) itk.def
-	-@$(RM) $(TMPDIR)\Rc\*.res
-	-@$(RM) $(TMPDIR)\*.obj
-	-@$(RM) *.cfg

win/makefile.vc

@@ -1,305 +1,163 @@
-# Visual C++ 2.x and 4.0 makefile
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# SCCS: @(#) makefile.vc 1.8 98/07/29 13:14:52
-
-# Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from 
-# location of the compiler directories.
-#
-# NOTE: Be sure to modify the "makefile.vc" file in the toplevel directory
-#   for the itcl distribution.  Include the location of your VC++ development
-#   tools and the installation directory.
-
-!include "..\..\makefile.vc"
-
-
-# ROOT    = top of source tree
-#
-# TMPDIR  = location where .obj files should be stored during build
-
-ROOT		= ..
-ITCLDIR     = ..\..\itcl
-
-######################################################################
-# Do not modify below this line
-######################################################################
-
-ITKNAMEPREFIX  = itk
-WISHNAMEPREFIX = itkwish
-VERSION	       = 31
-DOTVERSION     = 3.1
-STUBPREFIX = $(ITKNAMEPREFIX)stub
-
-BINROOT		= .
-!IF "$(NODEBUG)" == "1"
-TMPDIR		= $(BINROOT)\Release
-DBGX		=
-!ELSE
-TMPDIR		= $(BINROOT)\Debug
-DBGX		= d
-!ENDIF
-OUTDIR		= $(TMPDIR)
-
-ITKDLLNAME	= $(ITKNAMEPREFIX)$(VERSION)$(DBGX).dll
-ITKDLL 		= $(OUTDIR)\$(ITKDLLNAME)
-ITKLIB 		= $(OUTDIR)\$(ITKNAMEPREFIX)$(VERSION)$(DBGX).lib
-
-ITKWISH 	= $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
-DUMPEXTS 	= $(TMPDIR)\dumpexts.exe
-
-ITKSTUBLIBNAME = $(STUBPREFIX)$(VERSION)$(DBGX).lib
-ITKSTUBLIB     = $(OUTDIR)\$(ITKSTUBLIBNAME)
-
-
-LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
-BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
-SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\itk$(DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
-
-ITKWISHOBJS = \
-	$(TMPDIR)\winMain.obj
-
-ITKOBJS = \
-	$(TMPDIR)\itkStubInit.obj \
-	$(TMPDIR)\itk_archetype.obj \
-	$(TMPDIR)\itk_cmds.obj \
-	$(TMPDIR)\itk_option.obj \
-	$(TMPDIR)\itk_util.obj \
-	$(TMPDIR)\dllEntryPoint.obj
-
-ITKSTUBOBJS = \
-    $(TMPDIR)\itkStubLib.obj
-
-cc32		= $(TOOLS32)\bin\cl.exe
-link32		= $(TOOLS32)\bin\link.exe
-rc32		= $(TOOLS32_rc)\bin\rc.exe
-include32	= -I$(TOOLS32)\include
-lib32       = "$(TOOLS32)\bin\lib.exe"
-
-WINDIR      = $(ROOT)\win
-GENERICDIR	= $(ROOT)\generic
-RCDIR       = $(WINDIR)\rc
-
-TCLBUILDDIR	= $(TCLDIR)\win\$(OUTDIR)
-TCLLIB      = $(TCLBUILDDIR)\tcl81$(DBGX).lib
-TCLSTUBLIB      = $(TCLBUILDDIR)\tclstub81$(DBGX).lib
-TCLDLL      = $(TCLBUILDDIR)\tcl81$(DBGX).dll
-TKBUILDDIR	= $(TKDIR)\win\$(OUTDIR)
-TKLIB       = $(TKBUILDDIR)\tk81$(DBGX).lib
-TKSTUBLIB       = $(TKBUILDDIR)\tkstub81$(DBGX).lib
-TKDLL       = $(TKBUILDDIR)\tk81$(DBGX).dll
-ITCLBUILDDIR = $(ITCLDIR)\win\$(OUTDIR)
-ITCLLIB      = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).lib
-ITCLDLL      = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).dll
-
-ITCLSTUBLIBNAME = itclstub$(VERSION)$(DBGX).lib
-ITCLSTUBLIB     = $(ITCLBUILDDIR)\$(ITCLSTUBLIBNAME)
-
-ITK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) \
-			-I$(TCLDIR)\generic -I$(TKDIR)\generic \
-			-I$(TCLDIR)\win -I$(TKDIR)\win \
-			-I$(TKDIR)\xlib -I$(ITCLDIR)\generic
-
-ITK_EXE_DEFINES	= -DBUILD_itk $(DEBUGDEFINES)
-
-ITK_EXE_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
-			$(ITK_INCLUDES) $(ITK_EXE_DEFINES) 
-
-ITK_CFLAGS	= $(ITK_EXE_CFLAGS) -DUSE_TK_STUBS -DUSE_TCL_STUBS \
-		         -DUSE_ITCL_STUBS
-
-######################################################################
-# Link flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-ldebug = /RELEASE
-!ELSE
-ldebug = -debug:full -debugtype:cv
-!ENDIF
-
-# declarations common to all linker options
-lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
-
-# declarations for use on Intel i386, i486, and Pentium systems
-!IF "$(MACHINE)" == "IX86"
-DLLENTRY = @12
-lflags   = $(lcommon) /MACHINE:$(MACHINE)
-!ELSE
-lflags   = $(lcommon) /MACHINE:$(MACHINE)
-!ENDIF
-
-conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup
-guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
-dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
-
-!IF "$(MACHINE)" == "PPC"
-libc = libc.lib
-libcdll = crtdll.lib
-!ELSE
-libc = libc.lib oldnames.lib
-libcdll = msvcrt.lib oldnames.lib
-!ENDIF
-
-baselibs   = kernel32.lib $(optlibs) advapi32.lib
-winlibs    = $(baselibs) user32.lib gdi32.lib comdlg32.lib winspool.lib
-guilibs	   = $(libc) $(winlibs)
-
-guilibsdll = $(libcdll) $(winlibs)
-
-######################################################################
-# Compile flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-!IF "$(MACHINE)" == "ALPHA"
-# MSVC on Alpha doesn't understand -Ot
-cdebug = -O2i -Gs -GD -DNDEBUG
-!ELSE
-cdebug = -Oti -Gs -GD -DNDEBUG
-!ENDIF
-!ELSE
-cdebug = -Z7 -Od -WX -DDEBUG
-!ENDIF
-
-# declarations common to all compiler options
-ccommon = -c -W3 -nologo -Fp$(TMPDIR)\ -YX
-
-!IF "$(MACHINE)" == "IX86"
-cflags = $(ccommon) -D_X86_=1
-!ELSE
-!IF "$(MACHINE)" == "MIPS"
-cflags = $(ccommon) -D_MIPS_=1
-!ELSE
-!IF "$(MACHINE)" == "PPC"
-cflags = $(ccommon) -D_PPC_=1
-!ELSE
-!IF "$(MACHINE)" == "ALPHA"
-cflags = $(ccommon) -D_ALPHA_=1
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-cvars      = -DWIN32 -D_WIN32
-cvarsmt    = $(cvars) -D_MT
-cvarsdll   = $(cvarsmt) -D_DLL
-
-!IF "$(NODEBUG)" == "1"
-cvarsdll   = $(cvars) -MD
-!ELSE
-cvarsdll   = $(cvars) -MDd
-!ENDIF
-
-CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
-
-######################################################################
-# Project specific targets
-######################################################################
-
-all:    setup $(ITKWISH) $(ITKDLL) $(ITKSTUBLIB)
-test:	setup $(ITKDLL) $(ITKSTUBLIB) $(ITKWISH)
-	-@copy $(TCLDLL) $(TMPDIR)
-	-@copy $(TKDLL) $(TMPDIR)
-	-@copy $(ITCLDLL) $(TMPDIR)
-#	$(ITKWISH)
-
-setup:
-	if not exist $(TMPDIR) mkdir $(TMPDIR)
-	if not exist $(OUTDIR) mkdir $(OUTDIR)
-
-$(ITKLIB) : $(ITKDLL) $(ITKSTUBLIB)
-$(ITKDLL) : $(ITKOBJS) $(TMPDIR)\itk.res $(TMPDIR)\itkvc.def
-	set LIB=$(TOOLS32)\lib
-       $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\itkvc.def \
-		-out:$@ $(TMPDIR)\itk.res $(TCLSTUBLIB)  \
-                $(TKSTUBLIB) $(guilibsdll) @<<
-			$(ITKOBJS)
-<<
-
-
-$(ITKSTUBLIB): $(ITKSTUBOBJS)
-    $(lib32) -nologo -out:$@ $(ITKSTUBOBJS)
-
-$(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) $(TMPDIR)\itkwish.res
-	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\itkwish.res -out:$@ \
-		$(guilibsdll) $(TCLLIB) $(TKLIB) $(ITCLLIB) $(ITKLIB) \
-		$(ITKWISHOBJS) 
-
-$(TMPDIR)\itkvc.def: $(DUMPEXTS) $(ITKOBJS)
-	$(DUMPEXTS) -o $@ $(ITKDLLNAME) @<<
-		$(ITKOBJS)
-<<
-
-$(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
-		$(TMPDIR)\winDumpExts.obj 
-
-install: all
-	if not exist $(INSTALLDIR) mkdir $(INSTALLDIR)
-	if not exist $(BIN_INSTALL_DIR) mkdir $(BIN_INSTALL_DIR)
-	if not exist $(LIB_INSTALL_DIR) mkdir $(LIB_INSTALL_DIR)
-	if not exist $(SCRIPT_INSTALL_DIR) mkdir $(SCRIPT_INSTALL_DIR)
-	if not exist $(INCLUDE_INSTALL_DIR) mkdir $(INCLUDE_INSTALL_DIR)
-	copy $(ITKWISH) "$(BIN_INSTALL_DIR)"
-	copy $(ITKDLL) "$(BIN_INSTALL_DIR)"
-	copy $(ROOT)\generic\itk.h "$(INCLUDE_INSTALL_DIR)"
-	copy $(ROOT)\library\*.* "$(SCRIPT_INSTALL_DIR)"
-	copy $(ROOT)\win\*.tcl "$(SCRIPT_INSTALL_DIR)"
-
-#
-# Regenerate the stubs files.
-#
-genstubs:
-    $(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
-        $(GENERICDIR)\itk.decls
-
-#
-# Special case object file targets
-#
-
-$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
-	$(cc32) $(ITK_EXE_CFLAGS) -Fo$@ $?
-
-# The following object is part of the stub library and should not
-# be built as DLL objects but none of the symbols should be exported
-
-$(TMPDIR)\itkStubLib.obj : $(GENERICDIR)\itkStubLib.c
-    $(cc32) -DSTATIC_BUILD $(ITK_CFLAGS) -Fo$@ $?
-
-#
-# Implicit rules
-#
-
-{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
-	$(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(WINDIR)}.c{$(TMPDIR)}.obj:
-	$(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(ROOT)\unix}.c{$(TMPDIR)}.obj:
-	$(cc32) -DDLL_BUILD $(ITK_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(RCDIR)}.rc{$(TMPDIR)}.res:
-	$(rc32) -fo $@ -r -i $(GENERICDIR) -i $(TCLDIR)\generic -i $(ITCLDIR)\generic $<
-
-clean:
-	-@del $(OUTDIR)\*.exp 
-	-@del $(OUTDIR)\*.lib 
-	-@del $(OUTDIR)\*.dll 
-	-@del $(OUTDIR)\*.exe
-	-@del $(OUTDIR)\*.pdb
-	-@del $(TMPDIR)\*.pch
-	-@del $(TMPDIR)\*.obj
-	-@del $(TMPDIR)\*.res
-	-@del $(TMPDIR)\*.def
-	-@del $(TMPDIR)\*.exe
-	-@rmdir $(OUTDIR)
-	-@rmdir $(TMPDIR)
+#------------------------------------------------------------- -*- makefile -*-
+#
+# Makefile for [Incr Tk] interface
+#
+# Basic build, test and install
+#   nmake /f makefile.vc INSTALLDIR=c:\path\to\installdir
+#   nmake /f makefile.vc INSTALLDIR=c:\path\to\installdir test
+#   nmake /f makefile.vc INSTALLDIR=c:\path\to\installdir install
+#
+# For other build options (debug, static etc.),
+# See TIP 477 (https://core.tcl-lang.org/tips/doc/main/tip/477.md) for
+# detailed documentation.
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+#------------------------------------------------------------------------------
+
+PROJECT = itk
+# Tcl 8.6 etc. compile with /DUNICODE. ITK pre-nmake reform compiled
+# without -DUNICODE. Keep that behaviour for now.
+USE_WIDECHAR_API  = 0
+NEED_TK = 1
+
+PRJ_DEFINES	= $(PRJ_DEFINES) -Dinline=__inline
+PRJ_DEFINES = $(PRJ_DEFINES)
+PRJ_DEFINES = $(PRJ_DEFINES) -I$(TMP_DIR)
+
+!include "rules-ext.vc"
+
+# nmakehelp -V <file> <tag> will search the file for tag, skips until a
+#	number and returns all character until a character not in [0-9.ab]
+#	is read.
+!if [echo REM = This file is generated from Makefile.vc > versions.vc]
+!endif
+!if [echo TCL_VERSION_REQ = \>> versions.vc] \
+   && [nmakehlp -V ..\configure.ac TCL_VERSION_REQ >> versions.vc]
+!endif
+!include "versions.vc"
+
+PRJ_OBJS = \
+	$(TMP_DIR)\itkArchBase.obj \
+	$(TMP_DIR)\itkArchetype.obj \
+	$(TMP_DIR)\itkBase.obj \
+	$(TMP_DIR)\itkCmd.obj \
+	$(TMP_DIR)\itkHelpers.obj \
+	$(TMP_DIR)\itkOption.obj \
+	$(TMP_DIR)\itkUtil.obj \
+	$(TMP_DIR)\itkStubInit.obj
+
+
+# Uncomment the following line if you want to build and install stubs
+PRJ_STUBOBJS = $(TMP_DIR)\itkStubLib.obj
+
+PRJ_HEADERS = \
+	$(GENERICDIR)\itkInt.h \
+	$(GENERICDIR)\itk.h
+
+# Locate ITCL headers and libraries.
+# In principle, we don't need the ITCL source directory, and an installed
+# ITCL should suffice. But that needs additional machinery not implemented
+# yet.
+!if [echo ITCL_DIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\itcl.h >> nmakehlp.out]
+!error Could not locate ITCL source directory.
+!endif
+# Locate TK headers and libraries.
+# In principle, we don't need the TK source directory, and an installed
+# TK should suffice. But that needs additional machinery not implemented
+# yet.
+!if [echo TK_DIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\tk.h >> nmakehlp.out]
+!error Could not locate TK source directory.
+!endif
+!include nmakehlp.out
+
+# Get the ITCL version from its configure.ac
+!if [echo ITCL_DOTVERSION = \> versions.vc] \
+   && [nmakehlp -V "$(ITCL_DIR)\configure.ac" itcl >> versions.vc]
+!error Could not retrieve ITCL version.
+!endif
+# Get the TK version from its configure.ac
+!if [echo TK_DOTVERSION = \> versions.vc] \
+   && [nmakehlp -V "$(TK_DIR)\configure.ac" tk >> versions.vc]
+!error Could not retrieve TK version.
+!endif
+!include versions.vc
+
+ITCL_VERSION     = $(ITCL_DOTVERSION:.=)
+ITCL_GENERIC_DIR = $(ITCL_DIR)\generic
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
+ITCLSTUBLIBNAME	 = itclstub$(ITCL_VERSION).lib
+ITCL_LIB_FILE	 = itcl$(ITCL_VERSION).dll
+!else
+ITCLSTUBLIBNAME	 = itclstub.lib
+ITCL_LIB_FILE	 = tcl9itcl$(ITCL_VERSION).dll
+!endif
+ITCLSTUBLIB	 = $(ITCL_DIR)\win\$(BUILDDIRTOP)\$(ITCLSTUBLIBNAME)
+ITCL_BIN_DIR     = $(ITCL_DIR)/win/$(BUILDDIRTOP)
+
+TK_VERSION     = $(TK_DOTVERSION:.=)
+TK_GENERIC_DIR = $(TK_DIR)\generic
+TK_XLIB_DIR = $(TK_DIR)\xlib
+!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"
+TKSTUBLIBNAME	 = tkstub$(TK_VERSION).lib
+!else
+TKSTUBLIBNAME	 = tkstub.lib
+!endif
+TKSTUBLIB	 = $(TK_DIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)
+TK_BIN_DIR     = $(TK_DIR)/win/$(BUILDDIRTOP)
+
+PRJ_INCLUDES	= -I"$(ITCL_GENERIC_DIR)" -I"$(TK_GENERIC_DIR)" -I"$(TK_XLIB_DIR)"
+
+!if !$(STATIC_BUILD)
+PRJ_LIBS  = $(ITCLSTUBLIB) $(TKSTUBLIB)
+!endif
+
+# Disable standard test target because we have a custom one
+DISABLE_TARGET_test = 1
+!include "$(_RULESDIR)\targets.vc"
+
+# Additional default actions for install
+install: default-install-docs-n
+
+# The TIP 477 generation of pkgIndex.tcl from pkgIndex.tcl.in does not include
+# all replacements below so define our own target.
+pkgindex:   $(OUT_DIR)\pkgIndex.tcl
+$(OUT_DIR)\pkgIndex.tcl: $(ROOT)\pkgIndex.tcl.in
+	@nmakehlp -s << $** > $@
+@PACKAGE_NAME@        $(PROJECT)
+@PACKAGE_VERSION@     $(DOTVERSION)
+@TCL_VERSION_REQ@     $(TCL_VERSION_REQ)
+@PKG_LIB_FILE@        $(PRJLIBNAME)
+@PKG_LIB_FILE8@       $(PRJLIBNAME8)
+@PKG_LIB_FILE9@       $(PRJLIBNAME9)
+<<
+
+$(ROOT)\manifest.uuid:
+   copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid
+   git rev-parse HEAD >>$(ROOT)\manifest.uuid
+
+$(TMP_DIR)\itkUuid.h:	$(ROOT)\manifest.uuid
+	copy $(WIN_DIR)\itkUuid.h.in+$(ROOT)\manifest.uuid $(TMP_DIR)\itkUuid.h
+
+test: setup $(PROJECT)
+	@echo testing itk
+	@set ITK_LIBRARY=$(LIBDIR:\=/)
+	@$(CPY) $(LIBDIR)\*.tcl $(OUT_DIR)
+!if $(TKINSTALL)
+	@set PATH=$(_TKDIR)\bin;$(PATH)
+	$(DEBUGGER) $(WISH) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS)
+!else
+	@set PATH=$(_TKDIR)\win\$(BUILDDIRTOP);$(PATH)
+	$(DEBUGGER) $(WISH) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) \
+		-load "package ifneeded itk $(DOTVERSION) \
+			{source {$(LIBDIR:\=/)/itk.tcl};load {$(PRJLIB:\=/)} [string totitle $(PROJECT)]};\
+		package ifneeded itcl $(ITCL_DOTVERSION) \
+			{source {$(ITCL_BIN_DIR:\=/)/itcl.tcl};load {$(ITCL_BIN_DIR:\=/)/$(ITCL_LIB_FILE)} Itcl}"
+!endif
+
+
+# Explicit dependency rules
+$(GENERICDIR)\itkBase.c : $(TMP_DIR)\itkUuid.h

win/nmakehlp.c

@@ -0,0 +1,820 @@
+/*
+ * ----------------------------------------------------------------------------
+ * nmakehlp.c --
+ *
+ *	This is used to fix limitations within nmake and the environment.
+ *
+ * Copyright (c) 2002 David Gravereaux.
+ * Copyright (c) 2006 Pat Thoyts
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * ----------------------------------------------------------------------------
+ */
+
+#define _CRT_SECURE_NO_DEPRECATE
+#include <windows.h>
+#ifdef _MSC_VER
+#pragma comment (lib, "user32.lib")
+#pragma comment (lib, "kernel32.lib")
+#endif
+#include <stdio.h>
+
+/*
+ * This library is required for x64 builds with _some_ versions of MSVC
+ */
+#if defined(_M_IA64) || defined(_M_AMD64)
+#if _MSC_VER >= 1400 && _MSC_VER < 1500
+#pragma comment(lib, "bufferoverflowU")
+#endif
+#endif
+
+/* ISO hack for dumb VC++ */
+#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1900
+#define   snprintf	_snprintf
+#endif
+
+
+/* protos */
+
+static int CheckForCompilerFeature(const char *option);
+static int CheckForLinkerFeature(char **options, int count);
+static int IsIn(const char *string, const char *substring);
+static int SubstituteFile(const char *substs, const char *filename);
+static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
+static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
+static DWORD WINAPI ReadFromPipe(LPVOID args);
+
+/* globals */
+
+#define CHUNK	25
+#define STATICBUFFERSIZE    1000
+typedef struct {
+    HANDLE pipe;
+    char buffer[STATICBUFFERSIZE];
+} pipeinfo;
+
+pipeinfo Out = {INVALID_HANDLE_VALUE, ""};
+pipeinfo Err = {INVALID_HANDLE_VALUE, ""};
+
+/*
+ * exitcodes: 0 == no, 1 == yes, 2 == error
+ */
+
+int
+main(
+    int argc,
+    char *argv[])
+{
+    char msg[300];
+    DWORD dwWritten;
+    int chars;
+    const char *s;
+
+    /*
+     * Make sure children (cl.exe and link.exe) are kept quiet.
+     */
+
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+
+    /*
+     * Make sure the compiler and linker aren't effected by the outside world.
+     */
+
+    SetEnvironmentVariable("CL", "");
+    SetEnvironmentVariable("LINK", "");
+
+    if (argc > 1 && *argv[1] == '-') {
+	switch (*(argv[1]+1)) {
+	case 'c':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -c <compiler option>\n"
+			"Tests for whether cl.exe supports an option\n"
+			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
+		return 2;
+	    }
+	    return CheckForCompilerFeature(argv[2]);
+	case 'l':
+	    if (argc < 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -l <linker option> ?<mandatory option> ...?\n"
+			"Tests for whether link.exe supports an option\n"
+			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
+		return 2;
+	    }
+	    return CheckForLinkerFeature(&argv[2], argc-2);
+	case 'f':
+	    if (argc == 2) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -f <string> <substring>\n"
+			"Find a substring within another\n"
+			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
+		return 2;
+	    } else if (argc == 3) {
+		/*
+		 * If the string is blank, there is no match.
+		 */
+
+		return 0;
+	    } else {
+		return IsIn(argv[2], argv[3]);
+	    }
+	case 's':
+	    if (argc == 2) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -s <substitutions file> <file>\n"
+			"Perform a set of string map type substutitions on a file\n"
+			"exitcodes: 0\n",
+			argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
+		return 2;
+	    }
+	    return SubstituteFile(argv[2], argv[3]);
+	case 'V':
+	    if (argc != 4) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -V filename matchstring\n"
+		    "Extract a version from a file:\n"
+		    "eg: pkgIndex.tcl \"package ifneeded http\"",
+		    argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 0;
+	    }
+	    s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0');
+	    if (s && *s) {
+		printf("%s\n", s);
+		return 0;
+	    } else
+		return 1; /* Version not found. Return non-0 exit code */
+
+	case 'Q':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -Q path\n"
+		    "Emit the fully qualified path\n"
+		    "exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
+	}
+    }
+    chars = snprintf(msg, sizeof(msg) - 1,
+	    "usage: %s -c|-f|-l|-Q|-s|-V ...\n"
+	    "This is a little helper app to equalize shell differences between WinNT and\n"
+	    "Win9x and get nmake.exe to accomplish its job.\n",
+	    argv[0]);
+    WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
+    return 2;
+}
+
+static int
+CheckForCompilerFeature(
+    const char *option)
+{
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    SECURITY_ATTRIBUTES sa;
+    DWORD threadID;
+    char msg[300];
+    BOOL ok;
+    HANDLE hProcess, h, pipeThreads[2];
+    char cmdline[100];
+
+    hProcess = GetCurrentProcess();
+
+    memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+    memset(&si, 0, sizeof(STARTUPINFO));
+    si.cb = sizeof(STARTUPINFO);
+    si.dwFlags   = STARTF_USESTDHANDLES;
+    si.hStdInput = INVALID_HANDLE_VALUE;
+
+    memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.lpSecurityDescriptor = NULL;
+    sa.bInheritHandle = FALSE;
+
+    /*
+     * Create a non-inheritable pipe.
+     */
+
+    CreatePipe(&Out.pipe, &h, &sa, 0);
+
+    /*
+     * Dupe the write side, make it inheritable, and close the original.
+     */
+
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Same as above, but for the error side.
+     */
+
+    CreatePipe(&Err.pipe, &h, &sa, 0);
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Base command line.
+     */
+
+    lstrcpy(cmdline, "cl.exe -nologo -c -TC -Zs -X -Fp.\\_junk.pch ");
+
+    /*
+     * Append our option for testing
+     */
+
+    lstrcat(cmdline, option);
+
+    /*
+     * Filename to compile, which exists, but is nothing and empty.
+     */
+
+    lstrcat(cmdline, " .\\nul");
+
+    ok = CreateProcess(
+	    NULL,	    /* Module name. */
+	    cmdline,	    /* Command line. */
+	    NULL,	    /* Process handle not inheritable. */
+	    NULL,	    /* Thread handle not inheritable. */
+	    TRUE,	    /* yes, inherit handles. */
+	    DETACHED_PROCESS, /* No console for you. */
+	    NULL,	    /* Use parent's environment block. */
+	    NULL,	    /* Use parent's starting directory. */
+	    &si,	    /* Pointer to STARTUPINFO structure. */
+	    &pi);	    /* Pointer to PROCESS_INFORMATION structure. */
+
+    if (!ok) {
+	DWORD err = GetLastError();
+	int chars = snprintf(msg, sizeof(msg) - 1,
+		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
+		(300-chars), 0);
+	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
+	return 2;
+    }
+
+    /*
+     * Close our references to the write handles that have now been inherited.
+     */
+
+    CloseHandle(si.hStdOutput);
+    CloseHandle(si.hStdError);
+
+    WaitForInputIdle(pi.hProcess, 5000);
+    CloseHandle(pi.hThread);
+
+    /*
+     * Start the pipe reader threads.
+     */
+
+    pipeThreads[0] = CreateThread(NULL, 0, ReadFromPipe, &Out, 0, &threadID);
+    pipeThreads[1] = CreateThread(NULL, 0, ReadFromPipe, &Err, 0, &threadID);
+
+    /*
+     * Block waiting for the process to end.
+     */
+
+    WaitForSingleObject(pi.hProcess, INFINITE);
+    CloseHandle(pi.hProcess);
+
+    /*
+     * Wait for our pipe to get done reading, should it be a little slow.
+     */
+
+    WaitForMultipleObjects(2, pipeThreads, TRUE, 500);
+    CloseHandle(pipeThreads[0]);
+    CloseHandle(pipeThreads[1]);
+
+    /*
+     * Look for the commandline warning code in both streams.
+     *  - in MSVC 6 & 7 we get D4002, in MSVC 8 we get D9002.
+     */
+
+    return !(strstr(Out.buffer, "D4002") != NULL
+	    || strstr(Err.buffer, "D4002") != NULL
+	    || strstr(Out.buffer, "D9002") != NULL
+	    || strstr(Err.buffer, "D9002") != NULL
+	    || strstr(Out.buffer, "D2021") != NULL
+	    || strstr(Err.buffer, "D2021") != NULL);
+}
+
+static int
+CheckForLinkerFeature(
+    char **options,
+    int count)
+{
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    SECURITY_ATTRIBUTES sa;
+    DWORD threadID;
+    char msg[300];
+    BOOL ok;
+    HANDLE hProcess, h, pipeThreads[2];
+    int i;
+    char cmdline[255];
+
+    hProcess = GetCurrentProcess();
+
+    memset(&pi, 0, sizeof(PROCESS_INFORMATION));
+    memset(&si, 0, sizeof(STARTUPINFO));
+    si.cb = sizeof(STARTUPINFO);
+    si.dwFlags   = STARTF_USESTDHANDLES;
+    si.hStdInput = INVALID_HANDLE_VALUE;
+
+    memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.lpSecurityDescriptor = NULL;
+    sa.bInheritHandle = TRUE;
+
+    /*
+     * Create a non-inheritible pipe.
+     */
+
+    CreatePipe(&Out.pipe, &h, &sa, 0);
+
+    /*
+     * Dupe the write side, make it inheritable, and close the original.
+     */
+
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Same as above, but for the error side.
+     */
+
+    CreatePipe(&Err.pipe, &h, &sa, 0);
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Base command line.
+     */
+
+    lstrcpy(cmdline, "link.exe -nologo ");
+
+    /*
+     * Append our option for testing.
+     */
+
+    for (i = 0; i < count; i++) {
+	lstrcat(cmdline, " \"");
+	lstrcat(cmdline, options[i]);
+	lstrcat(cmdline, "\"");
+    }
+
+    ok = CreateProcess(
+	    NULL,	    /* Module name. */
+	    cmdline,	    /* Command line. */
+	    NULL,	    /* Process handle not inheritable. */
+	    NULL,	    /* Thread handle not inheritable. */
+	    TRUE,	    /* yes, inherit handles. */
+	    DETACHED_PROCESS, /* No console for you. */
+	    NULL,	    /* Use parent's environment block. */
+	    NULL,	    /* Use parent's starting directory. */
+	    &si,	    /* Pointer to STARTUPINFO structure. */
+	    &pi);	    /* Pointer to PROCESS_INFORMATION structure. */
+
+    if (!ok) {
+	DWORD err = GetLastError();
+	int chars = snprintf(msg, sizeof(msg) - 1,
+		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
+		(300-chars), 0);
+	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
+	return 2;
+    }
+
+    /*
+     * Close our references to the write handles that have now been inherited.
+     */
+
+    CloseHandle(si.hStdOutput);
+    CloseHandle(si.hStdError);
+
+    WaitForInputIdle(pi.hProcess, 5000);
+    CloseHandle(pi.hThread);
+
+    /*
+     * Start the pipe reader threads.
+     */
+
+    pipeThreads[0] = CreateThread(NULL, 0, ReadFromPipe, &Out, 0, &threadID);
+    pipeThreads[1] = CreateThread(NULL, 0, ReadFromPipe, &Err, 0, &threadID);
+
+    /*
+     * Block waiting for the process to end.
+     */
+
+    WaitForSingleObject(pi.hProcess, INFINITE);
+    CloseHandle(pi.hProcess);
+
+    /*
+     * Wait for our pipe to get done reading, should it be a little slow.
+     */
+
+    WaitForMultipleObjects(2, pipeThreads, TRUE, 500);
+    CloseHandle(pipeThreads[0]);
+    CloseHandle(pipeThreads[1]);
+
+    /*
+     * Look for the commandline warning code in the stderr stream.
+     */
+
+    return !(strstr(Out.buffer, "LNK1117") != NULL ||
+	    strstr(Err.buffer, "LNK1117") != NULL ||
+	    strstr(Out.buffer, "LNK4044") != NULL ||
+	    strstr(Err.buffer, "LNK4044") != NULL ||
+	    strstr(Out.buffer, "LNK4224") != NULL ||
+	    strstr(Err.buffer, "LNK4224") != NULL);
+}
+
+static DWORD WINAPI
+ReadFromPipe(
+    LPVOID args)
+{
+    pipeinfo *pi = (pipeinfo *) args;
+    char *lastBuf = pi->buffer;
+    DWORD dwRead;
+    BOOL ok;
+
+  again:
+    if (lastBuf - pi->buffer + CHUNK > STATICBUFFERSIZE) {
+	CloseHandle(pi->pipe);
+	return (DWORD)-1;
+    }
+    ok = ReadFile(pi->pipe, lastBuf, CHUNK, &dwRead, 0L);
+    if (!ok || dwRead == 0) {
+	CloseHandle(pi->pipe);
+	return 0;
+    }
+    lastBuf += dwRead;
+    goto again;
+
+    return 0;  /* makes the compiler happy */
+}
+
+static int
+IsIn(
+    const char *string,
+    const char *substring)
+{
+    return (strstr(string, substring) != NULL);
+}
+
+/*
+ * GetVersionFromFile --
+ *	Looks for a match string in a file and then returns the version
+ *	following the match where a version is anything acceptable to
+ *	package provide or package ifneeded.
+ */
+
+static const char *
+GetVersionFromFile(
+    const char *filename,
+    const char *match,
+    int numdots)
+{
+    static char szBuffer[100];
+    char *szResult = NULL;
+    FILE *fp = fopen(filename, "rt");
+
+    if (fp != NULL) {
+	/*
+	 * Read data until we see our match string.
+	 */
+
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	    LPSTR p, q;
+
+	    p = strstr(szBuffer, match);
+	    if (p != NULL) {
+		/*
+		 * Skip to first digit after the match.
+		 */
+
+		p += strlen(match);
+		while (*p && !isdigit((unsigned char)*p)) {
+		    ++p;
+		}
+
+		/*
+		 * Find ending whitespace.
+		 */
+
+		q = p;
+		while (*q && (strchr("0123456789.ab", *q)) && (((!strchr(".ab", *q)
+			    && !strchr("ab", q[-1])) || --numdots))) {
+		    ++q;
+		}
+
+		*q = 0;
+		szResult = p;
+		break;
+	    }
+	}
+	fclose(fp);
+    }
+    return szResult;
+}
+
+/*
+ * List helpers for the SubstituteFile function
+ */
+
+typedef struct list_item_t {
+    struct list_item_t *nextPtr;
+    char * key;
+    char * value;
+} list_item_t;
+
+/* insert a list item into the list (list may be null) */
+static list_item_t *
+list_insert(list_item_t **listPtrPtr, const char *key, const char *value)
+{
+    list_item_t *itemPtr = (list_item_t *)malloc(sizeof(list_item_t));
+    if (itemPtr) {
+	itemPtr->key = strdup(key);
+	itemPtr->value = strdup(value);
+	itemPtr->nextPtr = NULL;
+
+	while(*listPtrPtr) {
+	    listPtrPtr = &(*listPtrPtr)->nextPtr;
+	}
+	*listPtrPtr = itemPtr;
+    }
+    return itemPtr;
+}
+
+static void
+list_free(list_item_t **listPtrPtr)
+{
+    list_item_t *tmpPtr, *listPtr = *listPtrPtr;
+    while (listPtr) {
+	tmpPtr = listPtr;
+	listPtr = listPtr->nextPtr;
+	free(tmpPtr->key);
+	free(tmpPtr->value);
+	free(tmpPtr);
+    }
+}
+
+/*
+ * SubstituteFile --
+ *	As windows doesn't provide anything useful like sed and it's unreliable
+ *	to use the tclsh you are building against (consider x-platform builds -
+ *	e.g. compiling AMD64 target from IX86) we provide a simple substitution
+ *	option here to handle autoconf style substitutions.
+ *	The substitution file is whitespace and line delimited. The file should
+ *	consist of lines matching the regular expression:
+ *	  \s*\S+\s+\S*$
+ *
+ *	Usage is something like:
+ *	  nmakehlp -S << $** > $@
+ *	    @PACKAGE_NAME@ $(PACKAGE_NAME)
+ *	    @PACKAGE_VERSION@ $(PACKAGE_VERSION)
+ *	    <<
+ */
+
+static int
+SubstituteFile(
+    const char *substitutions,
+    const char *filename)
+{
+    static char szBuffer[1024], szCopy[1024];
+    list_item_t *substPtr = NULL;
+    FILE *fp, *sp;
+
+    fp = fopen(filename, "rt");
+    if (fp != NULL) {
+
+	/*
+	 * Build a list of substitutions from the first filename
+	 */
+
+	sp = fopen(substitutions, "rt");
+	if (sp != NULL) {
+	    while (fgets(szBuffer, sizeof(szBuffer), sp) != NULL) {
+		unsigned char *ks, *ke, *vs, *ve;
+		ks = (unsigned char*)szBuffer;
+		while (ks && *ks && isspace(*ks)) ++ks;
+		ke = ks;
+		while (ke && *ke && !isspace(*ke)) ++ke;
+		vs = ke;
+		while (vs && *vs && isspace(*vs)) ++vs;
+		ve = vs;
+		while (ve && *ve && !(*ve == '\r' || *ve == '\n')) ++ve;
+		*ke = 0, *ve = 0;
+		list_insert(&substPtr, (char*)ks, (char*)vs);
+	    }
+	    fclose(sp);
+	}
+
+	/* debug: dump the list */
+#ifndef NDEBUG
+	{
+	    int n = 0;
+	    list_item_t *p = NULL;
+	    for (p = substPtr; p != NULL; p = p->nextPtr, ++n) {
+		fprintf(stderr, "% 3d '%s' => '%s'\n", n, p->key, p->value);
+	    }
+	}
+#endif
+
+	/*
+	 * Run the substitutions over each line of the input
+	 */
+
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	    list_item_t *p = NULL;
+	    for (p = substPtr; p != NULL; p = p->nextPtr) {
+		char *m = strstr(szBuffer, p->key);
+		if (m) {
+		    char *cp, *op, *sp;
+		    cp = szCopy;
+		    op = szBuffer;
+		    while (op != m) *cp++ = *op++;
+		    sp = p->value;
+		    while (sp && *sp) *cp++ = *sp++;
+		    op += strlen(p->key);
+		    while (*op) *cp++ = *op++;
+		    *cp = 0;
+		    memcpy(szBuffer, szCopy, sizeof(szCopy));
+		}
+	    }
+	    printf("%s", szBuffer);
+	}
+
+	list_free(&substPtr);
+    }
+    fclose(fp);
+    return 0;
+}
+
+BOOL FileExists(LPCTSTR szPath)
+{
+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+    DWORD pathAttr = GetFileAttributes(szPath);
+    return (pathAttr != INVALID_FILE_ATTRIBUTES &&
+	    !(pathAttr & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+
+/*
+ * QualifyPath --
+ *
+ *	This composes the current working directory with a provided path
+ *	and returns the fully qualified and normalized path.
+ *	Mostly needed to setup paths for testing.
+ */
+
+static int
+QualifyPath(
+    const char *szPath)
+{
+    char szCwd[MAX_PATH + 1];
+
+    GetFullPathName(szPath, sizeof(szCwd)-1, szCwd, NULL);
+    printf("%s\n", szCwd);
+    return 0;
+}
+
+/*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    size_t dirlen;
+    int keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL) {
+	return 2; /* Have no real error reporting mechanism into nmake */
+    }
+    dirlen = strlen(dir);
+    if (dirlen > sizeof(path) - 3) {
+	return 2;
+    }
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories,
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE) {
+	return 1; /* Not found */
+    }
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+	    continue;
+	}
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path)) {
+	    continue;		/* Path does not fit, assume not matched */
+	}
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (FileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *	    keypath - a relative path within the package directory
+ *	      that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *	    the parent and grandparent of the current working directory.
+ *	    If found, the command prints
+ *	      name_DIRPATH=<full path of located directory>
+ *	    and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    size_t i;
+    int ret;
+    static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
+
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0) {
+	    return ret;
+	}
+    }
+    return ret;
+}
+
+
+/*
+ * Local variables:
+ *   mode: c
+ *   c-basic-offset: 4
+ *   fill-column: 78
+ *   indent-tabs-mode: t
+ *   tab-width: 8
+ * End:
+ */

win/pkgIndex.tcl

@@ -1,3 +0,0 @@
-# Tcl package index file, version 1.0
-
-package ifneeded Itk 3.1 [list load [file join $dir itk31.dll] Itk]