Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch main Excluding Merge-Ins
This is equivalent to a diff from 682771e3a5 to 98063d7ffb
2023-12-18
| ||
15:16 | Another round of makefile.vc bugfixing Leaf check-in: 98063d7ffb user: jan.nijtmans tags: main, trunk | |
14:41 | Workaround for nmake bug check-in: df1c9f98da user: jan.nijtmans tags: main, trunk | |
2022-01-10
| ||
15:22 | Resolve fork check-in: 6cab658091 user: jan.nijtmans tags: main, trunk | |
15:20 | Add "itk::build-info" command, if loaded in Tcl 8.7+ Closed-Leaf check-in: 682771e3a5 user: jan.nijtmans tags: trunk | |
14:21 | Update version -> 4.2.3 check-in: bc357be7b6 user: jan.nijtmans tags: trunk | |
Added .fossil-settings/binary-glob.
|
Added .fossil-settings/crlf-glob.
|
Added .fossil-settings/encoding-glob.
|
Added .fossil-settings/ignore-glob.
|
Added .gitattributes.
|
Added .gitignore.
|
Changes to Makefile.in.
︙ | |||
60 61 62 63 64 65 66 | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | - + | #======================================================================== 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@ |
︙ | |||
167 168 169 170 171 172 173 | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | - + | CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itkConfig.sh pkgIndex.tcl CLEANFILES = @CLEANFILES@ CPPFLAGS = @CPPFLAGS@ LIBS = @PKG_LIBS@ @LIBS@ AR = @AR@ |
︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 229 | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | + | install: all install-binaries install-libraries install-doc 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 @$(INSTALL_DATA_DIR) "$(DESTDIR)$(includedir)" @echo "Installing header files in $(DESTDIR)$(includedir)" @list='$(PKG_HEADERS)'; for i in $$list; do \ echo "Installing $(srcdir)/$$i" ; \ |
︙ | |||
306 307 308 309 310 311 312 | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 | - + | # $(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:.... #======================================================================== |
︙ |
Changes to configure.
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | #! /bin/sh # Guess values for system-dependent variables and create Makefiles. |
︙ | |||
604 605 606 607 608 609 610 | 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | - - + + | subdirs= MFLAGS= MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itk' PACKAGE_TARNAME='itk' |
︙ | |||
660 661 662 663 664 665 666 667 668 669 670 671 672 673 | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 | + | itk_LIB_SPEC itk_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE VC_MANIFEST_EMBED_DLL RANLIB_STUB PKG_STUB_LIB_FILE MAKE_STUB_LIB MAKE_STATIC_LIB MAKE_SHARED_LIB MAKE_LIB EGREP GREP LDFLAGS_DEFAULT |
︙ | |||
748 749 750 751 752 753 754 | 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | - | PKG_CFLAGS PKG_LIBS PKG_INCLUDES PKG_HEADERS PKG_TCL_SOURCES PKG_STUB_OBJECTS PKG_STUB_SOURCES |
︙ | |||
797 798 799 800 801 802 803 804 805 806 807 808 809 810 | 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 | + | PACKAGE_NAME PATH_SEPARATOR SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking with_tcl with_tcl8 with_tk with_itcl with_tclinclude with_tkinclude with_x enable_shared enable_stubs |
︙ | |||
1367 1368 1369 1370 1371 1372 1373 | 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 | - + | # # Report the --help message. # if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF |
︙ | |||
1433 1434 1435 1436 1437 1438 1439 | 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 | - + + | --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in |
︙ | |||
1538 1539 1540 1541 1542 1543 1544 | 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 | - + | cd "$ac_pwd" || { ac_status=$?; break; } done fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF |
︙ | |||
1837 1838 1839 1840 1841 1842 1843 | 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 | - + | ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; esac cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. |
︙ | |||
2606 2607 2608 2609 2610 2611 2612 | 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 | - - | # This package name must be replaced statically for AC_SUBST to work |
︙ | |||
2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 | 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 | + + + + + + + | # Check whether --with-tcl was given. if test ${with_tcl+y} then : withval=$with_tcl; with_tclconfig="${withval}" fi # Check whether --with-tcl8 was given. if test ${with_tcl8+y} then : withval=$with_tcl8; with_tcl8="${withval}" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 printf %s "checking for Tcl configuration... " >&6; } if test ${ac_cv_c_tclconfig+y} then : printf %s "(cached) " >&6 else $as_nop |
︙ | |||
5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 | 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 | + + + + + + | fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_pipe" >&5 printf "%s\n" "$tcl_cv_cc_pipe" >&6; } if test $tcl_cv_cc_pipe = yes; then CFLAGS="$CFLAGS -pipe" fi fi if test "${TCL_MAJOR_VERSION}" -lt 9 -a "${TCL_MINOR_VERSION}" -lt 7; then printf "%s\n" "#define Tcl_Size int" >>confdefs.h fi #-------------------------------------------------------------------- # Common compiler flag setup #-------------------------------------------------------------------- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 printf %s "checking whether byte ordering is bigendian... " >&6; } |
︙ | |||
5874 5875 5876 5877 5878 5879 5880 | 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 | - + - - | case $ac_cv_c_bigendian in #( yes) printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) |
︙ | |||
5972 5973 5974 5975 5976 5977 5978 | 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 | + - + + + + + + + + + + + + + + + + + + + + + + + | done PKG_CFLAGS="$PKG_CFLAGS " |
︙ | |||
7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 | 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 | + + + | windows) MACHINE="X86" if test "$do64bit" != "no" ; then case "$do64bit" in amd64|x64|yes) MACHINE="AMD64" ; # default to AMD64 64-bit build ;; arm64|aarch64) MACHINE="ARM64" ;; ia64) MACHINE="IA64" ;; esac fi if test "$GCC" != "yes" ; then |
︙ | |||
7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 | 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 | + + + + + + + | amd64|x64|yes) CC="x86_64-w64-mingw32-${CC}" LD="x86_64-w64-mingw32-ld" AR="x86_64-w64-mingw32-ar" RANLIB="x86_64-w64-mingw32-ranlib" RC="x86_64-w64-mingw32-windres" ;; arm64|aarch64) CC="aarch64-w64-mingw32-clang" LD="aarch64-w64-mingw32-ld" AR="aarch64-w64-mingw32-ar" RANLIB="aarch64-w64-mingw32-ranlib" RC="aarch64-w64-mingw32-windres" ;; *) CC="i686-w64-mingw32-${CC}" LD="i686-w64-mingw32-ld" AR="i686-w64-mingw32-ar" RANLIB="i686-w64-mingw32-ranlib" RC="i686-w64-mingw32-windres" ;; |
︙ | |||
8962 8963 8964 8965 8966 8967 8968 8969 | 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 | + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - | if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then printf "%s\n" "#define _ISOC99_SOURCE 1" >>confdefs.h tcl_flags="$tcl_flags _ISOC99_SOURCE" fi if test "${TCL_MAJOR_VERSION}" -ne 8 ; then |
︙ | |||
9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 | 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | printf "%s\n" "#define TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit}" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${tcl_cv_type_64bit}" >&5 printf "%s\n" "${tcl_cv_type_64bit}" >&6; } # Now check for auxiliary declarations if test "${TCL_MAJOR_VERSION}" -ne 8 ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t" >&5 printf %s "checking for 64-bit time_t... " >&6; } if test ${tcl_cv_time_t_64+y} then : printf %s "(cached) " >&6 else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> int main (void) { switch (0) {case 0: case (sizeof(time_t)==sizeof(long long)): ;} ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : tcl_cv_time_t_64=yes else $as_nop tcl_cv_time_t_64=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_time_t_64" >&5 printf "%s\n" "$tcl_cv_time_t_64" >&6; } if test "x${tcl_cv_time_t_64}" = "xno" ; then # Note that _TIME_BITS=64 requires _FILE_OFFSET_BITS=64 # which SC_TCL_EARLY_FLAGS has defined if necessary. { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if _TIME_BITS=64 enables 64-bit time_t" >&5 printf %s "checking if _TIME_BITS=64 enables 64-bit time_t... " >&6; } if test ${tcl_cv__time_bits+y} then : printf %s "(cached) " >&6 else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _TIME_BITS 64 #include <sys/types.h> int main (void) { switch (0) {case 0: case (sizeof(time_t)==sizeof(long long)): ;} ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : tcl_cv__time_bits=yes else $as_nop tcl_cv__time_bits=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv__time_bits" >&5 printf "%s\n" "$tcl_cv__time_bits" >&6; } if test "x${tcl_cv__time_bits}" = "xyes" ; then printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5 printf %s "checking for struct dirent64... " >&6; } if test ${tcl_cv_struct_dirent64+y} then : printf %s "(cached) " >&6 else $as_nop |
︙ | |||
9561 9562 9563 9564 9565 9566 9567 | 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 | - + + + + | # Shared libraries and static libraries have different names. # Use the double eval to make sure any variables in the suffix is # substituted. (@@@ Might not be necessary anymore) #-------------------------------------------------------------------- PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}" PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9" |
︙ | |||
9589 9590 9591 9592 9593 9594 9595 | 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 | + - + + + + - - + + + + + - + + + + | PACKAGE_LIB_PREFIX=lib${PACKAGE_LIB_PREFIX} fi eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}" fi # Some packages build their own stubs libraries if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then |
︙ | |||
9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 | 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 | + + + + | if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}" eval itk_STUB_LIB_FLAG="-litkstub${PACKAGE_VERSION}" else eval itk_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`" eval itk_STUB_LIB_FLAG="-litkstub`echo ${PACKAGE_VERSION} | tr -d .`" fi if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" == x; then eval itk_STUB_LIB_FLAG="-litkstub" fi itk_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${itk_LIB_FLAG}" itk_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${itk_LIB_FLAG}" itk_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${itk_STUB_LIB_FLAG}" itk_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${itk_STUB_LIB_FLAG}" itk_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" itk_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" |
︙ | |||
9928 9929 9930 9931 9932 9933 9934 | 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 | - | # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs |
︙ | |||
10322 10323 10324 10325 10326 10327 10328 | 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 | - + | test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" |
︙ | |||
10377 10378 10379 10380 10381 10382 10383 | 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 | - + | _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ |
︙ |
Changes to configure.ac.
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | - + | # 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. #----------------------------------------------------------------------- |
︙ | |||
111 112 113 114 115 116 117 | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | - + | 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([]) |
︙ | |||
255 256 257 258 259 260 261 | 255 256 257 258 259 260 261 262 | - + | AC_CONFIG_FILES([itkConfig.sh]) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the files # specified with AC_CONFIG_FILES. #-------------------------------------------------------------------- |
Changes to doc/Archetype.n.
︙ | |||
44 45 46 47 48 49 50 | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | - + | class for more specialized widgets. The \fBWidget\fR base class inherits from \fBArchetype\fR, and adds a Tk frame which acts as the "hull" for the mega-widget. The \fBToplevel\fR base class 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 |
︙ |
Changes to doc/itkvars.n.
︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - + - + | variable to hold the name of a directory containing the system library of \fB[incr\ Tk]\fR scripts. The initial value of \fBitk::library\fR is set from the ITK_LIBRARY environment variable if it exists, 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, |
︙ |
Changes to generic/itk.decls.
︙ | |||
51 52 53 54 55 56 57 | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | - + - + - + - + - + | # # # Functions used internally by this package: # declare 2 { |
︙ |
Changes to generic/itk.h.
︙ | |||
67 68 69 70 71 72 73 | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - + | #define ITK_MAJOR_VERSION 4 #define ITK_MINOR_VERSION 2 #define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE #define ITK_RELEASE_SERIAL 3 #define ITK_VERSION "4.2" |
︙ |
Changes to generic/itkArchBase.c.
︙ | |||
25 26 27 28 29 30 31 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - + - + - + | #include "itkInt.h" /* * FORWARD DECLARATIONS */ static int Itk_PropagateOption (Tcl_Interp *interp, |
︙ | |||
108 109 110 111 112 113 114 | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | - + | * widget is no longer needed. This usually happens when a widget * is destroyed. Frees the given bundle of data and removes it * from the global list of Archetype objects. * ------------------------------------------------------------------------ */ void Itk_DelArchInfo( |
︙ | |||
161 162 163 164 165 166 167 | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchCompAddCmd( |
︙ | |||
307 308 309 310 311 312 313 | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 | - + | /* * Take the result from the widget creation commands as the * path name for the new component. Make a local copy of * this, since the interpreter will get used in the mean time. */ resultStr = Tcl_GetStringResult(interp); |
︙ | |||
344 345 346 347 348 349 350 | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 | - + | archComp = Itk_CreateArchComponent(interp, info, name, ownerClass, accessCmd); if (!archComp) { goto compFail; } |
︙ | |||
404 405 406 407 408 409 410 | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | - + | Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppend(&buffer, "::bind itk-destroy-", -1); Tcl_DStringAppend(&buffer, path, -1); Tcl_DStringAppend(&buffer, " <Destroy> [::itcl::code ", -1); Tcl_DStringAppend(&buffer, |
︙ | |||
430 431 432 433 434 435 436 | 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | - + | * Query the list of configuration options for this widget, * so we will know which ones are valid. Build an option * table to represent these, so they can be found quickly * by the option parsing commands in "itk::option-parser". */ Tcl_DStringSetLength(&buffer, 0); Tcl_DStringAppendElement(&buffer, |
︙ | |||
561 562 563 564 565 566 567 | 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 | - + | Tcl_AppendToObj(objPtr, name, -1); Tcl_AppendToObj(objPtr, "\" for widget \"", -1); Tcl_GetCommandFullName(contextObj->iclsPtr->interp, contextObj->accessCmd, objPtr); Tcl_AppendToObj(objPtr, "\")", -1); Tcl_IncrRefCount(objPtr); |
︙ | |||
585 586 587 588 589 590 591 | 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchCompDeleteCmd( |
︙ | |||
670 671 672 673 674 675 676 | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 | - - + + - + | Itcl_InitList(&delOptList); entry = Tcl_FirstHashEntry(&info->options, &place); while (entry) { archOpt = (ArchOption*)Tcl_GetHashValue(entry); elem = Itcl_FirstListElem(&archOpt->parts); while (elem) { optPart = (ArchOptionPart*)Itcl_GetListValue(elem); |
︙ | |||
718 719 720 721 722 723 724 | 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptKeepCmd( |
︙ | |||
746 747 748 749 750 751 752 | 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | - + - + | /* * Make sure that this command is being accessed in the * proper context. The merge info record should be set up * properly. */ if (!mergeInfo->archInfo || !mergeInfo->optionTable) { |
︙ | |||
784 785 786 787 788 789 790 | 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 | - + - + | /* * Build a command prefix that can be used to apply changes * to this option for this component. */ cmdlinePtr = Itk_CreateConfigCmdline(interp, mergeInfo->archComp->accessCmd, token); |
︙ | |||
824 825 826 827 828 829 830 | 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptIgnoreCmd( |
︙ | |||
848 849 850 851 852 853 854 | 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | - + - + | /* * Make sure that this command is being accessed in the * proper context. The merge info record should be set up * properly. */ if (!mergeInfo->archInfo || !mergeInfo->optionTable) { |
︙ | |||
899 900 901 902 903 904 905 | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptRenameCmd( |
︙ | |||
927 928 929 930 931 932 933 | 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 | - + - - - - + + + + | /* * Make sure that this command is being accessed in the * proper context. The merge info record should be set up * properly. */ if (!mergeInfo->archInfo || !mergeInfo->optionTable) { |
︙ | |||
983 984 985 986 987 988 989 | 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 | - + - + | /* * Build a command prefix that can be used to apply changes * to this option for this component. */ cmdlinePtr = Itk_CreateConfigCmdline(interp, mergeInfo->archComp->accessCmd, oldSwitch); |
︙ | |||
1029 1030 1031 1032 1033 1034 1035 | 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptUsualCmd( |
︙ | |||
1052 1053 1054 1055 1056 1057 1058 | 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 | - + - + | /* * Make sure that this command is being accessed in the * proper context. The merge info record should be set up * properly. */ if (!mergeInfo->archInfo || !mergeInfo->optionTable) { |
︙ | |||
1113 1114 1115 1116 1117 1118 1119 | 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_UsualCmd( |
︙ | |||
1151 1152 1153 1154 1155 1156 1157 | 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 | - + - + - + | } else { /* * If a code fragment was specified, then save it in the * hash table for "usual" code. */ if (objc == 3) { |
︙ | |||
1202 1203 1204 1205 1206 1207 1208 | 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptionAddCmd( |
︙ | |||
1276 1277 1278 1279 1280 1281 1282 | 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 | - + - + - + | Tcl_GetString(iclsPtr->fullNamePtr), "\"", (char*)NULL); Tcl_DStringFree(&buffer); return TCL_ERROR; } optPart = Itk_FindArchOptionPart(info, Tcl_GetString(opt->namePtr), |
︙ | |||
1330 1331 1332 1333 1334 1335 1336 | 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 | - + - + - + | char msg[256]; sprintf(msg, "\n (while adding option \"%.100s\")", token); Tcl_AddErrorInfo(interp, msg); return TCL_ERROR; } optPart = Itk_FindArchOptionPart(info, generic->switchName, |
︙ | |||
1391 1392 1393 1394 1395 1396 1397 | 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptionRemoveCmd( |
︙ | |||
1461 1462 1463 1464 1465 1466 1467 | 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 | - + | Tcl_GetString(iclsPtr->fullNamePtr), "\"", (char*)NULL); Tcl_DStringFree(&buffer); return TCL_ERROR; } Itk_RemoveArchOptionPart(info, Tcl_GetString(opt->namePtr), |
︙ | |||
1499 1500 1501 1502 1503 1504 1505 | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 | - + | sprintf(msg, "\n (while removing option \"%.100s\")", name); Tcl_AddErrorInfo(interp, msg); return TCL_ERROR; } Itk_RemoveArchOptionPart(info, generic->switchName, |
︙ | |||
1538 1539 1540 1541 1542 1543 1544 | 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 | - + | * ------------------------------------------------------------------------ */ /* ARGSUSED */ static int Itk_PropagateOption( Tcl_Interp *interp, /* interpreter managing the class */ ItclObject *contextObj, /* itcl object being configured */ |
︙ | |||
1574 1575 1576 1577 1578 1579 1580 | 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 | - + | * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_PropagatePublicVar( Tcl_Interp *interp, /* interpreter managing the class */ ItclObject *contextObj, /* itcl object being configured */ |
︙ | |||
1763 1764 1765 1766 1767 1768 1769 | 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 | - + | Itcl_GetContext(interp, &iclsPtr, &ioPtr); v = ItclGetInstanceVar(interp, "itk_option", archOpt->switchName, ioPtr, iclsPtr); #endif if (v) { |
︙ | |||
1908 1909 1910 1911 1912 1913 1914 | 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 | - + | } if (init && (!archOpt->init || (strcmp(init, archOpt->init) != 0))) { if (!archOpt->init) { ckfree(archOpt->init); } |
︙ | |||
1932 1933 1934 1935 1936 1937 1938 | 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 | - + | memset(archComp, 0, sizeof(ArchComponent)); archComp->namePtr = Tcl_NewStringObj(name, -1); Tcl_IncrRefCount(archComp->namePtr); archComp->iclsPtr = iclsPtr; archComp->protection = ITCL_PUBLIC; archComp->accessCmd = accessCmd; archComp->tkwin = tkwin; |
︙ | |||
2001 2002 2003 2004 2005 2006 2007 | 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 | - + - + - + | ArchOption *archOpt; Tcl_HashEntry *entry; /* * If the switch does not have a leading "-", add it on. */ if (*switchName != '-') { |
︙ | |||
2059 2060 2061 2062 2063 2064 2065 | 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 | - + - + - + - + | /* * Create the record to represent this option, and save it * in the option table. */ archOpt = (ArchOption*)ckalloc(sizeof(ArchOption)); |
︙ | |||
2164 2165 2166 2167 2168 2169 2170 | 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 | - + | ival = init; } Tcl_SetVar2(interp, "itk_option", archOpt->switchName, (char *)((ival) ? ival : ""), 0); if (ival) { |
︙ | |||
2233 2234 2235 2236 2237 2238 2239 | 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 | - + - + | * * Returns a pointer to the new option part. * ------------------------------------------------------------------------ */ ArchOptionPart* Itk_CreateOptionPart( Tcl_Interp *interp, /* interpreter handling this request */ |
︙ | |||
2304 2305 2306 2307 2308 2309 2310 | 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 | - + | /* * Add the option part to the composite option. If the * composite option has already been configured, then * simply update this part to the current value. Otherwise, * leave the configuration to Itk_ArchInitCmd(). */ |
︙ | |||
2352 2353 2354 2355 2356 2357 2358 | 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 | - + - + | * source, or NULL if the option is not recognized. * ------------------------------------------------------------------------ */ ArchOptionPart* Itk_FindArchOptionPart( ArchInfo *info, /* info for Archetype mega-widget */ char *switchName, /* name of command-line switch */ |
︙ | |||
2423 2424 2425 2426 2427 2428 2429 | 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 | - + | * Returns non-zero if the part was found and removed, and 0 otherwise. * ------------------------------------------------------------------------ */ static int Itk_RemoveArchOptionPart( ArchInfo *info, /* info for Archetype mega-widget */ char *switchName, /* name of command-line switch */ |
︙ | |||
2640 2641 2642 2643 2644 2645 2646 | 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 | - + | * Deletes the data created by Itk_CreateConfigCmdline. Called * when an option part is deleted to free up the memory associated * with the configure command. * ------------------------------------------------------------------------ */ static void Itk_DeleteConfigCmdline( |
︙ | |||
2681 2682 2683 2684 2685 2686 2687 | 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 | - + - + + - + | * ------------------------------------------------------------------------ */ static Tcl_HashTable* Itk_CreateGenericOptTable( Tcl_Interp *interp, /* interpreter handling this request */ const char *options) /* string description of config options */ { |
︙ | |||
2718 2719 2720 2721 2722 2723 2724 | 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 | - + | info->resName = (char *)optv[1]; info->resClass = (char *)optv[2]; info->init = (char *)optv[3]; info->value = (char *)optv[4]; info->storage = (char **)optv; info->integrated = NULL; info->optPart = NULL; |
︙ | |||
2798 2799 2800 2801 2802 2803 2804 | 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 | + - + - + | Tcl_Interp *interp, /* interpreter handling this request */ const char *switchName, /* command-line switch for option */ Tcl_Command accessCmd) /* access command for component */ { GenericConfigOpt *genericOpt = NULL; Tcl_Obj *codePtr = NULL; Tcl_Size optc; |
︙ | |||
2838 2839 2840 2841 2842 2843 2844 | 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 | - + | /* * Only consider options with all 5 required components. Avoid * aliases like "-bg". */ resultPtr = Tcl_GetObjResult(interp); Tcl_IncrRefCount(resultPtr); |
︙ |
Changes to generic/itkArchetype.c.
︙ | |||
91 92 93 94 95 96 97 | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | - + - + - + - + - + - + - + - + | /* * Declare all of the C routines that are integrated into * the Archetype base class. */ if (Itcl_RegisterObjC(interp, "Archetype-init", Itk_ArchInitOptsCmd, |
︙ | |||
153 154 155 156 157 158 159 | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | - + - - + + - + - + - + - + - - + + | mergeInfo = (ArchMergeInfo*)ckalloc(sizeof(ArchMergeInfo)); Tcl_InitHashTable(&mergeInfo->usualCode, TCL_STRING_KEYS); mergeInfo->archInfo = NULL; mergeInfo->archComp = NULL; mergeInfo->optionTable = NULL; parserNs = Tcl_CreateNamespace(interp, "::itk::option-parser", |
︙ | |||
210 211 212 213 214 215 216 | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | - + | * _archetype itk_option * * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchetypeCmd( |
︙ | |||
244 245 246 247 248 249 250 | 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchInitOptsCmd( |
︙ | |||
293 294 295 296 297 298 299 | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | - + | Tcl_InitHashTable(&info->options, TCL_STRING_KEYS); Itk_OptListInit(&info->order, &info->options); entry = Tcl_CreateHashEntry(objsWithArchInfo, (char*)contextObj, &newEntry); if (!newEntry) { Itk_DelArchInfo( Tcl_GetHashValue(entry) ); } |
︙ | |||
339 340 341 342 343 344 345 | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | - + - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchDeleteOptsCmd( |
︙ | |||
397 398 399 400 401 402 403 | 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchComponentCmd( |
︙ | |||
470 471 472 473 474 475 476 | 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | - + | } } Tcl_DStringFree(&buffer); /* * Flag any errors. */ |
︙ | |||
501 502 503 504 505 506 507 | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchInitCmd( |
︙ | |||
573 574 575 576 577 578 579 | 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 | - + - + - + | NULL, 0, 0, &arrayPtr); if (varPtr && TclIsVarArray(varPtr)) { continue; } optPart = Itk_FindArchOptionPart(info, |
︙ | |||
608 609 610 611 612 613 614 | 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | - + - + - + | */ optTable = Itk_FindClassOptTable(contextClass); if (optTable) { for (i=0; i < optTable->order.len; i++) { opt = (ItkClassOption*)Tcl_GetHashValue(optTable->order.list[i]); optPart = Itk_FindArchOptionPart(info, Tcl_GetString(opt->namePtr), |
︙ | |||
717 718 719 720 721 722 723 | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchOptionCmd( |
︙ | |||
826 827 828 829 830 831 832 | 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 | - + - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchCompAccessCmd( |
︙ | |||
1013 1014 1015 1016 1017 1018 1019 | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchConfigureCmd( |
︙ | |||
1169 1170 1171 1172 1173 1174 1175 | 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ArchCgetCmd( |
︙ |
Changes to generic/itkBase.c.
︙ | |||
116 117 118 119 120 121 122 | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | - + - + - + | #endif static int Initialize( Tcl_Interp *interp) /* interpreter to be updated */ { Tcl_Namespace *itkNs, *parserNs; |
︙ | |||
159 160 161 162 163 164 165 | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | - + - + - + - + | return TCL_ERROR; } Itcl_PreserveData(parserInfo); if (Itcl_AddEnsemblePart(interp, "::itcl::parser::itk_option", "add", "name ?name name...?", Itk_ClassOptionIllegalCmd, |
︙ | |||
270 271 272 273 274 275 276 | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | - + - + | ".purify" #endif #ifdef STATIC_BUILD ".static" #endif ), NULL); } |
︙ |
Changes to generic/itkCmd.c.
︙ | |||
44 45 46 47 48 49 50 | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ConfigBodyCmd( |
︙ | |||
129 130 131 132 133 134 135 | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | - + - + - + | if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, token, &mcode) != TCL_OK) { result = TCL_ERROR; goto configBodyCmdDone; } |
Changes to generic/itkHelpers.c.
︙ | |||
50 51 52 53 54 55 56 | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - + | 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); } |
︙ | |||
157 158 159 160 161 162 163 | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | - + - + | objTable = (Tcl_HashTable*)Tcl_GetAssocData(interp, "itk_objsWithArchInfo", (Tcl_InterpDeleteProc**)NULL); if (!objTable) { objTable = (Tcl_HashTable*)ckalloc(sizeof(Tcl_HashTable)); Tcl_InitHashTable(objTable, TCL_ONE_WORD_KEYS); Tcl_SetAssocData(interp, "itk_objsWithArchInfo", |
︙ |
Changes to generic/itkInt.h.
︙ | |||
104 105 106 107 108 109 110 | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | - + - + - + | */ #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, |
︙ | |||
153 154 155 156 157 158 159 | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + | /* * Options that are propagated by a "configure" method: */ typedef struct ConfigCmdline { Tcl_Obj *objv[4]; /* objects representing "configure" command */ } ConfigCmdline; |
Changes to generic/itkIntDecls.h.
︙ | |||
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - + - - + - + - + - + - + | /* * Exported function declarations: */ /* Slot 0 is reserved */ /* Slot 1 is reserved */ /* 2 */ |
︙ | |||
66 67 68 69 70 71 72 | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | - - - - - + + + + + | int magic; int epoch; int revision; void *hooks; void (*reserved0)(void); void (*reserved1)(void); |
︙ |
Changes to generic/itkOption.c.
︙ | |||
22 23 24 25 26 27 28 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - + - + | * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "itkInt.h" /* * FORWARD DECLARATIONS */ |
︙ | |||
52 53 54 55 56 57 58 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | - + | * * Returns TCL_OK/TCL_ERROR to indicate success/failure. * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ClassOptionDefineCmd( |
︙ | |||
154 155 156 157 158 159 160 | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | - + - + | } if (Itk_CreateClassOption(interp, iclsPtr, switchName, resName, resClass, init, config, &opt) != TCL_OK) { return TCL_ERROR; } |
︙ | |||
207 208 209 210 211 212 213 | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | - + | * ------------------------------------------------------------------------ */ /* ARGSUSED */ int Itk_ConfigClassOption( Tcl_Interp *interp, /* interpreter managing the class */ ItclObject *contextObj, /* object being configured */ |
︙ | |||
329 330 331 332 333 334 335 | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | - + - + | 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); |
︙ | |||
397 398 399 400 401 402 403 | 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | - + | * Returns NULL on success, or a pointer to a string describing any * error that is encountered. * ------------------------------------------------------------------------ */ /* ARGSUSED */ static char* ItkTraceClassDestroy( |
︙ | |||
474 475 476 477 478 479 480 | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | - + - + | */ if (config) { if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, config, &mcode) != TCL_OK) { return TCL_ERROR; } |
︙ | |||
498 499 500 501 502 503 504 | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 | - + - + - + | 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; |
︙ | |||
609 610 611 612 613 614 615 | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 | - + - + | classesTable = (Tcl_HashTable*)Tcl_GetAssocData(interp, "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", |
︙ |
Changes to generic/itkStubLib.c.
︙ | |||
55 56 57 58 59 60 61 | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | - + | Tcl_Interp *interp, const char *version, int exact) { const char *actualVersion; actualVersion = Tcl_PkgRequireEx(interp, "itk", (const char *)version, |
Changes to generic/itkUtil.c.
︙ | |||
37 38 39 40 41 42 43 | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | - + | 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( |
︙ | |||
90 91 92 93 94 95 96 | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | - + | /* * Make sure that the option list is big enough. Resize * if needed. */ if (olist->len >= olist->max) { size = olist->max*sizeof(Tcl_HashEntry*); |
︙ |
Changes to library/itk.tcl.
︙ | |||
10 11 12 13 14 15 16 | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | - + | # 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. |
︙ |
Changes to pkgIndex.tcl.in.
︙ | |||
8 9 10 11 12 13 14 | 8 9 10 11 12 13 14 15 16 | - + + | 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] } |
Changes to win/makefile.vc.
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | - - + + + + + + + + + + + + - - - - - - - + - - - + + - + + - - - + + + - - + - - - - + + + - + - - - - - - - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + - - + + - - - - - + - - + - - - + + - + + + - + - - - - + + + + - + + - + - - - - - - - + - + - - - + - - - + - - - - - + - - - - - + - - + + - + - - - - - - - - + + + + + + - - - - + + - - + + - - - - - - - - - - - + + + + + - + - - - - - - + + + + + + + + - - - + + + - - - + + - + + - - + + - - - - + + + - - - + - - - - - + - - - - - + + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + - - - - - + + - - - - + + - - - - + - - - - + - - - + - - - + - - - - + - - - - - + - - - - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - |
|
Added win/rules-ext.vc.