Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Repurpose the trunk for ongoing development of Itk 4.1.*. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk | itk-4-1-0 |
| Files: | files | file ages | folders |
| SHA1: |
fc469d3c3b6ccf7365554ace2a3e21e6 |
| User & Date: | dgp 2017-07-28 17:04:52 |
Context
|
2018-06-13
| ||
| 19:12 | Stop using obsolete [source -rsrc]. check-in: d40921fe23 user: stu tags: trunk | |
|
2017-07-28
| ||
| 17:04 | Repurpose the trunk for ongoing development of Itk 4.1.*. check-in: fc469d3c3b user: dgp tags: trunk, itk-4-1-0 | |
| 16:57 | Several revisions to get evaluation contexts more reliably correct. Closed-Leaf check-in: b46f3c3fe0 user: dgp tags: dgp-method-type | |
|
2017-07-07
| ||
| 18:21 | Don't allow Itk 4.0.3 to bring in Itcl 4.1+, which will break it. check-in: 755afe01e1 user: dgp tags: trunk, itk-4-0-3 | |
Changes
Changes to configure.
1 2 3 4 5 6 7 8 9 10 ... 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 .... 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 .... 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 .... 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 .... 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 .... 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 ..... 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 |
#! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for itk 4.0.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ................................................................................ subdirs= MFLAGS= MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itk' PACKAGE_TARNAME='itk' PACKAGE_VERSION='4.0.3' PACKAGE_STRING='itk 4.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #ifdef HAVE_SYS_TYPES_H ................................................................................ # # 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 \`configure' configures itk 4.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ --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 short | recursive ) echo "Configuration of itk 4.0.3:";; esac cat <<\_ACEOF Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ................................................................................ cd "$ac_pwd" || { ac_status=$?; break; } done fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF itk configure 4.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit ................................................................................ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by itk $as_me 4.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 [email protected] _ACEOF exec 5>>config.log { ................................................................................ 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=" This file was extended by itk $as_me 4.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 [email protected] ................................................................................ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ itk config.status 4.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." |
| | | | | | | | | |
1 2 3 4 5 6 7 8 9 10 ... 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 .... 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 .... 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 .... 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 .... 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 .... 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 ..... 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 |
#! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for itk 4.1.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ................................................................................ subdirs= MFLAGS= MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itk' PACKAGE_TARNAME='itk' PACKAGE_VERSION='4.1.0' PACKAGE_STRING='itk 4.1.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #ifdef HAVE_SYS_TYPES_H ................................................................................ # # 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 \`configure' configures itk 4.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ --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 short | recursive ) echo "Configuration of itk 4.1.0:";; esac cat <<\_ACEOF Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ................................................................................ cd "$ac_pwd" || { ac_status=$?; break; } done fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF itk configure 4.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit ................................................................................ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by itk $as_me 4.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 [email protected] _ACEOF exec 5>>config.log { ................................................................................ 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=" This file was extended by itk $as_me 4.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 [email protected] ................................................................................ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ itk config.status 4.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." |
Changes to configure.in.
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
#-----------------------------------------------------------------------
# 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.
#-----------------------------------------------------------------------
AC_INIT([itk], [4.0.3])
#--------------------------------------------------------------------
# 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.
#--------------------------------------------------------------------
|
| |
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
#-----------------------------------------------------------------------
# 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.
#-----------------------------------------------------------------------
AC_INIT([itk], [4.1.0])
#--------------------------------------------------------------------
# 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.
#--------------------------------------------------------------------
|
Changes to generic/itk.h.
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
#endif #ifndef TCL_FINAL_RELEASE # define TCL_FINAL_RELEASE 2 #endif #define ITK_MAJOR_VERSION 4 #define ITK_MINOR_VERSION 0 #define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE #define ITK_RELEASE_SERIAL 3 #define ITK_VERSION "4.0" #define ITK_PATCH_LEVEL "4.0.3" /* * A special definition used to allow this header file to be included * in resource files so that they can get obtain version information from * this file. Resource compilers don't like all the C stuff, like typedefs * and procedure declarations, that occur below. |
| | | | |
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
#endif #ifndef TCL_FINAL_RELEASE # define TCL_FINAL_RELEASE 2 #endif #define ITK_MAJOR_VERSION 4 #define ITK_MINOR_VERSION 1 #define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE #define ITK_RELEASE_SERIAL 0 #define ITK_VERSION "4.1" #define ITK_PATCH_LEVEL "4.1.0" /* * A special definition used to allow this header file to be included * in resource files so that they can get obtain version information from * this file. Resource compilers don't like all the C stuff, like typedefs * and procedure declarations, that occur below. |
Changes to generic/itkArchBase.c.
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 ... 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 ... 336 337 338 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 372 373 374 375 ... 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 ... 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 ... 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 ... 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 .... 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 .... 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 .... 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 .... 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 .... 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 .... 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 .... 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 .... 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 .... 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 |
int pLevel = ITCL_PUBLIC;
int newEntry;
int result;
CONST char *cmd;
CONST char *token;
CONST char *resultStr;
Tcl_CallFrame frame;
char *name;
Tcl_Namespace *parserNs;
ItclClass *contextClass;
ItclClass *ownerClass;
ItclObject *contextObj;
ArchInfo *info;
Tcl_Command accessCmd;
Tcl_Obj *objPtr;
Tcl_DString buffer;
Tcl_CallFrame *uplevelFramePtr;
Tcl_CallFrame *oldFramePtr = NULL;
ItclObjectInfo *infoPtr;
ItclCallContext *callContextPtr;
Tcl_Namespace *ownerNsPtr;
ItclShowArgs(1, "Itk_ArchCompAddCmd", objc, objv);
/*
* Get the Archetype info associated with this widget.
*/
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
................................................................................
}
}
/*
* Execute the <createCmds> to create the component widget.
* Do this one level up, in the scope of the calling routine.
*/
Itcl_SetCallFrameResolver(interp, contextClass->resolvePtr);
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
uplevelFramePtr = Itcl_GetUplevelCallFrame(interp, 1);
oldFramePtr = Itcl_ActivateCallFrame(interp, uplevelFramePtr);
result = Tcl_EvalObjEx(interp, objv[2], 0);
if (result != TCL_OK) {
goto compFail;
}
/*
* Take the result from the widget creation commands as the
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"cannot find component access command \"",
path, "\" for component \"", name, "\"",
(char*)NULL);
goto compFail;
}
(void) Itcl_ActivateCallFrame(interp, oldFramePtr);
oldFramePtr = NULL;
winNamePtr = Tcl_NewStringObj((char*)NULL, 0);
Tcl_GetCommandFullName(interp, accessCmd, winNamePtr);
Tcl_IncrRefCount(winNamePtr);
/*
* Create the component record. Set the protection level
* according to the "-protected" or "-private" option.
*/
ownerClass = contextClass;
callContextPtr = Itcl_PeekStack(&infoPtr->contextStack);
ownerNsPtr = callContextPtr->nsPtr;
if (ownerNsPtr != NULL) {
Tcl_HashEntry *hPtr;
int idx = 2;
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
idx = 1;
}
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-idx);
hPtr = Tcl_FindHashEntry(&infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
ownerClass = (ItclClass*)Tcl_GetHashValue(hPtr);
}
archComp = Itk_CreateArchComponent(interp, info, name, ownerClass,
accessCmd);
if (!archComp) {
goto compFail;
}
................................................................................
* Add a binding onto the new component, so that when its
* window is destroyed, it will automatically remove itself
* from its parent's component list. Avoid doing these things
* for the "hull" component, since it is a special case and
* these things are not really necessary.
*/
Tcl_DStringSetLength(&buffer, 0);
Tcl_DStringAppend(&buffer, "bindtags ", -1);
Tcl_DStringAppend(&buffer, path, -1);
if (Tcl_Eval(interp, Tcl_DStringValue(&buffer)) != TCL_OK) {
goto compFail;
}
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,
Tcl_GetStringFromObj(objNamePtr,(int*)NULL), -1);
Tcl_DStringAppend(&buffer, " itk_component delete ", -1);
Tcl_DStringAppend(&buffer, name, -1);
Tcl_DStringAppend(&buffer, "]\n", -1);
Tcl_DStringAppend(&buffer, "bindtags ", -1);
Tcl_DStringAppend(&buffer, path, -1);
Tcl_DStringAppend(&buffer, " {itk-destroy-", -1);
Tcl_DStringAppend(&buffer, path, -1);
Tcl_DStringAppend(&buffer, " ", -1);
Tcl_DStringAppend(&buffer, Tcl_GetStringResult(interp), -1);
Tcl_DStringAppend(&buffer, "}", -1);
if (Tcl_Eval(interp, Tcl_DStringValue(&buffer)) != TCL_OK) {
goto compFail;
}
}
/*
* Query the list of configuration options for this widget,
................................................................................
if (objc != 4) {
objPtr = Tcl_NewStringObj("usual", -1);
Tcl_IncrRefCount(objPtr);
} else {
objPtr = objv[3];
}
result = Itcl_PushCallFrame(interp, &frame, parserNs,
/* isProcCallFrame */ 0);
if (result == TCL_OK) {
result = Tcl_EvalObj(interp, objPtr);
Itcl_PopCallFrame(interp);
}
if (objc != 4) {
Tcl_DecrRefCount(objPtr);
}
if (result != TCL_OK) {
goto compFail;
}
................................................................................
Tcl_SetResult(interp, name, TCL_VOLATILE);
return TCL_OK;
/*
* If any errors were encountered, clean up and return.
*/
compFail:
if (oldFramePtr) {
(void) Itcl_ActivateCallFrame(interp, oldFramePtr);
}
if (archComp) {
Itk_DelArchComponent(archComp);
}
if (entry) {
Tcl_DeleteHashEntry(entry);
}
if (path) {
................................................................................
/*
* Clean up the binding tag that causes the widget to
* call this method automatically when destroyed.
* Ignore errors if anything goes wrong.
*/
Tcl_DStringInit(&buffer);
Tcl_DStringAppend(&buffer, "itk::remove_destroy_hook ", -1);
Tcl_DStringAppend(&buffer, archComp->pathName, -1);
(void) Tcl_Eval(interp, Tcl_DStringValue(&buffer));
Tcl_ResetResult(interp);
Tcl_DStringFree(&buffer);
Tcl_UnsetVar2(interp, "itk_component", token, 0);
Tcl_DeleteHashEntry(entry);
................................................................................
Tcl_Interp *interp, /* interpreter managing the class */
ItclObject *contextObj, /* itcl object being configured */
ClientData cdata, /* command prefix to use for configuration */
CONST char *newval) /* new value for this option */
{
ItclVariable *ivPtr = (ItclVariable*)cdata;
Tcl_CallFrame frame;
int result;
CONST char *val;
ItclMemberCode *mcode;
/*
* Update the public variable with the new option value.
* There should already be a call frame installed for handling
* instance variables, but make sure that the namespace context
* is the most-specific class, so that the public variable can
* be found.
*/
result = Itcl_PushCallFrame(interp, &frame, contextObj->iclsPtr->nsPtr,
/*isProcCallFrame*/0);
if (result == TCL_OK) {
/*
* Casting away CONST of newval only to satisfy Tcl 8.3 and
* earlier headers.
*/
val = Tcl_SetVar2(interp, Tcl_GetString(ivPtr->fullNamePtr), (char *) NULL,
(char *) newval, TCL_LEAVE_ERR_MSG);
if (!val) {
result = TCL_ERROR;
}
Itcl_PopCallFrame(interp);
}
if (result != TCL_OK) {
char msg[256];
sprintf(msg, "\n (error in configuration of public variable \"%.100s\")", Tcl_GetString(ivPtr->fullNamePtr));
Tcl_AddErrorInfo(interp, msg);
return TCL_ERROR;
................................................................................
* If this variable has some "config" code, invoke it now.
*
* NOTE: Invoke the "config" code in the class scope
* containing the data member.
*/
mcode = ivPtr->codePtr;
if (mcode && mcode->bodyPtr) {
Tcl_Namespace *saveNsPtr;
Itcl_SetCallFrameResolver(interp, ivPtr->iclsPtr->resolvePtr);
saveNsPtr = Tcl_GetCurrentNamespace(interp);
Itcl_SetCallFrameNamespace(interp, ivPtr->iclsPtr->nsPtr);
result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
Itcl_SetCallFrameNamespace(interp, saveNsPtr);
if (result == TCL_OK) {
Tcl_ResetResult(interp);
} else {
char msg[256];
sprintf(msg, "\n (error in configuration of public variable \"%.100s\")", Tcl_GetString(ivPtr->fullNamePtr));
Tcl_AddErrorInfo(interp, msg);
................................................................................
CONST char *v;
char *lastval;
Tcl_HashEntry *entry;
ArchOption *archOpt;
Itcl_ListElem *part;
ArchOptionPart *optPart;
Itcl_InterpState istate;
/*
* Query the "itk_option" array to get the current setting.
*/
entry = Tcl_FindHashEntry(&info->options, name);
if (!entry) {
/* Bug 227876
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", name, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
v = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
if (v) {
lastval = (char*)ckalloc((unsigned)(strlen(v)+1));
strcpy(lastval, v);
} else {
lastval = NULL;
}
/*
* Update the "itk_option" array with the new setting.
*/
if (!Tcl_SetVar2(interp, "itk_option", archOpt->switchName, value, 0)) {
Itk_ArchOptAccessError(interp, info, archOpt);
result = TCL_ERROR;
goto configDone;
}
/*
* Scan through all option parts to handle the new setting.
................................................................................
* If the option configuration failed, then set the option
* back to its previous settings. Scan back through all of
* the option parts and sync them up with the old value.
*/
if (result == TCL_ERROR) {
istate = Itcl_SaveInterpState(interp, result);
Tcl_SetVar2(interp, "itk_option", archOpt->switchName, lastval, 0);
part = Itcl_FirstListElem(&archOpt->parts);
while (part) {
optPart = (ArchOptionPart*)Itcl_GetListValue(part);
(*optPart->configProc)(interp, info->itclObj,
optPart->clientData, lastval);
................................................................................
Tcl_Interp *interp, /* interpreter managing the object */
ArchInfo *info, /* info for Archetype mega-widget */
ArchOption *archOpt, /* option to initialize */
CONST char *defVal, /* last-resort default value */
char *currVal) /* current option value */
{
CONST char *init = NULL;
Tcl_CallFrame frame;
int result;
CONST char *ival;
char c;
/*
* If the option is already initialized, then abort.
*/
if (archOpt->init) {
................................................................................
(c == 's' && strcmp(archOpt->switchName,"-screen") == 0) ||
(c == 'v' && strcmp(archOpt->switchName,"-visual") == 0)) {
ival = currVal;
} else {
ival = init;
}
/*
* Set the initial value in the itk_option array.
* Since this might be called from the itk::option-parser
* namespace, reinstall the object context.
*/
result = Itcl_PushCallFrame(interp, &frame, info->itclObj->iclsPtr->nsPtr, /*isProcCallFrame*/0);
if (result == TCL_OK) {
/*
* Casting away CONST of ival only to satisfy Tcl 8.3 and
* earlier headers.
*/
Tcl_SetVar2(interp, "itk_option", archOpt->switchName,
(char *)((ival) ? ival : ""), 0);
Itcl_PopCallFrame(interp);
}
if (ival) {
archOpt->init = (char*)ckalloc((unsigned)(strlen(ival)+1));
strcpy(archOpt->init, ival);
}
}
................................................................................
char *resClass, /* resource class name in X11 database */
CONST char *defVal, /* last-resort default value */
char *currVal, /* current value (or NULL) */
ArchOptionPart *optPart, /* part to be added in */
ArchOption **raOpt) /* returns: option containing new part */
{
CONST char *init = NULL;
Tcl_CallFrame frame;
int result;
ArchOption *archOpt;
*raOpt = NULL;
archOpt = NULL;
/*
* Find or create a composite option for the mega-widget.
*/
................................................................................
/*
* 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().
*/
Itcl_AppendList(&archOpt->parts, (ClientData)optPart);
if ((archOpt->flags & ITK_ARCHOPT_INIT) != 0) {
result = Itcl_PushCallFrame(interp, &frame, info->itclObj->iclsPtr->nsPtr, /*isProcCallFrame*/0);
if (result == TCL_OK) {
init = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
Itcl_PopCallFrame(interp);
}
if (!init) {
Itk_ArchOptAccessError(interp, info, archOpt);
return TCL_ERROR;
}
if (!currVal || (strcmp(init,currVal) != 0)) {
result = (*optPart->configProc)(interp, info->itclObj,
optPart->clientData, init);
if (result != TCL_OK) {
Itk_ArchOptConfigError(interp, info, archOpt);
return TCL_ERROR;
}
}
}
*raOpt = archOpt;
return TCL_OK;
|
< < < < < < < < < < < < < < < < < < < < < < < < < < | > > > > > | | | > | < < < | < < > < < < | < | < < > > > > > > < | < > | | > < > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < | < < < < > | < < < > > |
181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 ... 296 297 298 299 300 301 302 303 304 305 306 307 308 309 ... 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 ... 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 ... 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 ... 519 520 521 522 523 524 525 526 527 528 529 530 531 532 ... 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 .... 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 .... 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 .... 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 .... 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 .... 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 .... 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 .... 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 .... 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 .... 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 |
int pLevel = ITCL_PUBLIC;
int newEntry;
int result;
CONST char *cmd;
CONST char *token;
CONST char *resultStr;
char *name;
Tcl_Namespace *parserNs;
ItclClass *contextClass;
ItclClass *ownerClass;
ItclObject *contextObj;
ArchInfo *info;
Tcl_Command accessCmd;
Tcl_Obj *objPtr;
Tcl_DString buffer;
ItclShowArgs(1, "Itk_ArchCompAddCmd", objc, objv);
/*
* Get the Archetype info associated with this widget.
*/
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
................................................................................
}
}
/*
* Execute the <createCmds> to create the component widget.
* Do this one level up, in the scope of the calling routine.
*/
result = Tcl_EvalObjEx(interp, objv[2], 0);
if (result != TCL_OK) {
goto compFail;
}
/*
* Take the result from the widget creation commands as the
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"cannot find component access command \"",
path, "\" for component \"", name, "\"",
(char*)NULL);
goto compFail;
}
winNamePtr = Tcl_NewStringObj((char*)NULL, 0);
Tcl_GetCommandFullName(interp, accessCmd, winNamePtr);
Tcl_IncrRefCount(winNamePtr);
/*
* Create the component record. Set the protection level
* according to the "-protected" or "-private" option.
*/
ownerClass = contextClass;
archComp = Itk_CreateArchComponent(interp, info, name, ownerClass,
accessCmd);
if (!archComp) {
goto compFail;
}
................................................................................
* Add a binding onto the new component, so that when its
* window is destroyed, it will automatically remove itself
* from its parent's component list. Avoid doing these things
* for the "hull" component, since it is a special case and
* these things are not really necessary.
*/
Tcl_DStringSetLength(&buffer, 0);
Tcl_DStringAppend(&buffer, "::bindtags ", -1);
Tcl_DStringAppend(&buffer, path, -1);
if (Tcl_Eval(interp, Tcl_DStringValue(&buffer)) != TCL_OK) {
goto compFail;
}
/*
* NOTE: We need the [::itcl::code] because the itk_component
* method is protected.
*/
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,
Tcl_GetStringFromObj(objNamePtr,(int*)NULL), -1);
Tcl_DStringAppend(&buffer, " itk_component delete ", -1);
Tcl_DStringAppend(&buffer, name, -1);
Tcl_DStringAppend(&buffer, "]\n", -1);
Tcl_DStringAppend(&buffer, "::bindtags ", -1);
Tcl_DStringAppend(&buffer, path, -1);
Tcl_DStringAppend(&buffer, " {itk-destroy-", -1);
Tcl_DStringAppend(&buffer, path, -1);
Tcl_DStringAppend(&buffer, " ", -1);
Tcl_DStringAppend(&buffer, Tcl_GetStringResult(interp), -1);
Tcl_DStringAppend(&buffer, "}", -1);
if (Tcl_Eval(interp, Tcl_DStringValue(&buffer)) != TCL_OK) {
goto compFail;
}
}
/*
* Query the list of configuration options for this widget,
................................................................................
if (objc != 4) {
objPtr = Tcl_NewStringObj("usual", -1);
Tcl_IncrRefCount(objPtr);
} else {
objPtr = objv[3];
}
Tcl_Eval(interp, "::namespace path [::lreplace [::namespace path] end+1 end ::itk::option-parser]");
result = Tcl_EvalObj(interp, objPtr);
Tcl_Eval(interp, "::namespace path [::lrange [::namespace path] 0 end-1]");
if (objc != 4) {
Tcl_DecrRefCount(objPtr);
}
if (result != TCL_OK) {
goto compFail;
}
................................................................................
Tcl_SetResult(interp, name, TCL_VOLATILE);
return TCL_OK;
/*
* If any errors were encountered, clean up and return.
*/
compFail:
if (archComp) {
Itk_DelArchComponent(archComp);
}
if (entry) {
Tcl_DeleteHashEntry(entry);
}
if (path) {
................................................................................
/*
* Clean up the binding tag that causes the widget to
* call this method automatically when destroyed.
* Ignore errors if anything goes wrong.
*/
Tcl_DStringInit(&buffer);
Tcl_DStringAppend(&buffer, "::itk::remove_destroy_hook ", -1);
Tcl_DStringAppend(&buffer, archComp->pathName, -1);
(void) Tcl_Eval(interp, Tcl_DStringValue(&buffer));
Tcl_ResetResult(interp);
Tcl_DStringFree(&buffer);
Tcl_UnsetVar2(interp, "itk_component", token, 0);
Tcl_DeleteHashEntry(entry);
................................................................................
Tcl_Interp *interp, /* interpreter managing the class */
ItclObject *contextObj, /* itcl object being configured */
ClientData cdata, /* command prefix to use for configuration */
CONST char *newval) /* new value for this option */
{
ItclVariable *ivPtr = (ItclVariable*)cdata;
int result = TCL_OK;
CONST char *val;
ItclMemberCode *mcode;
/*
* Update the public variable with the new option value.
* There should already be a call frame installed for handling
* instance variables, but make sure that the namespace context
* is the most-specific class, so that the public variable can
* be found.
*/
if (result == TCL_OK) {
/*
* Casting away CONST of newval only to satisfy Tcl 8.3 and
* earlier headers.
*/
#if 1
val = ItclSetInstanceVar(interp, Tcl_GetString(ivPtr->fullNamePtr),
NULL, newval, contextObj, ivPtr->iclsPtr);
#else
val = Tcl_SetVar2(interp, Tcl_GetString(ivPtr->fullNamePtr), (char *) NULL,
(char *) newval, TCL_LEAVE_ERR_MSG);
#endif
if (!val) {
result = TCL_ERROR;
}
}
if (result != TCL_OK) {
char msg[256];
sprintf(msg, "\n (error in configuration of public variable \"%.100s\")", Tcl_GetString(ivPtr->fullNamePtr));
Tcl_AddErrorInfo(interp, msg);
return TCL_ERROR;
................................................................................
* If this variable has some "config" code, invoke it now.
*
* NOTE: Invoke the "config" code in the class scope
* containing the data member.
*/
mcode = ivPtr->codePtr;
if (mcode && mcode->bodyPtr) {
Tcl_CallFrame frame;
Itcl_PushCallFrame(interp, &frame, ivPtr->iclsPtr->nsPtr, 1);
Itcl_SetContext(interp, contextObj);
result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
Itcl_UnsetContext(interp);
Itcl_PopCallFrame(interp);
if (result == TCL_OK) {
Tcl_ResetResult(interp);
} else {
char msg[256];
sprintf(msg, "\n (error in configuration of public variable \"%.100s\")", Tcl_GetString(ivPtr->fullNamePtr));
Tcl_AddErrorInfo(interp, msg);
................................................................................
CONST char *v;
char *lastval;
Tcl_HashEntry *entry;
ArchOption *archOpt;
Itcl_ListElem *part;
ArchOptionPart *optPart;
Itcl_InterpState istate;
ItclClass *iclsPtr;
ItclObject *ioPtr;
/*
* Query the "itk_option" array to get the current setting.
*/
entry = Tcl_FindHashEntry(&info->options, name);
if (!entry) {
/* Bug 227876
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", name, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
#if 0
v = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
#else
Itcl_GetContext(interp, &iclsPtr, &ioPtr);
v = ItclGetInstanceVar(interp, "itk_option", archOpt->switchName,
ioPtr, iclsPtr);
#endif
if (v) {
lastval = (char*)ckalloc((unsigned)(strlen(v)+1));
strcpy(lastval, v);
} else {
lastval = NULL;
}
/*
* Update the "itk_option" array with the new setting.
*/
#if 0
if (!Tcl_SetVar2(interp, "itk_option", archOpt->switchName, value, 0)) {
#else
if (!ItclSetInstanceVar(interp, "itk_option", archOpt->switchName, value,
ioPtr, iclsPtr)) {
#endif
Itk_ArchOptAccessError(interp, info, archOpt);
result = TCL_ERROR;
goto configDone;
}
/*
* Scan through all option parts to handle the new setting.
................................................................................
* If the option configuration failed, then set the option
* back to its previous settings. Scan back through all of
* the option parts and sync them up with the old value.
*/
if (result == TCL_ERROR) {
istate = Itcl_SaveInterpState(interp, result);
#if 0
Tcl_SetVar2(interp, "itk_option", archOpt->switchName, lastval, 0);
#else
ItclSetInstanceVar(interp, "itk_option", archOpt->switchName, lastval,
ioPtr, iclsPtr);
#endif
part = Itcl_FirstListElem(&archOpt->parts);
while (part) {
optPart = (ArchOptionPart*)Itcl_GetListValue(part);
(*optPart->configProc)(interp, info->itclObj,
optPart->clientData, lastval);
................................................................................
Tcl_Interp *interp, /* interpreter managing the object */
ArchInfo *info, /* info for Archetype mega-widget */
ArchOption *archOpt, /* option to initialize */
CONST char *defVal, /* last-resort default value */
char *currVal) /* current option value */
{
CONST char *init = NULL;
CONST char *ival;
char c;
/*
* If the option is already initialized, then abort.
*/
if (archOpt->init) {
................................................................................
(c == 's' && strcmp(archOpt->switchName,"-screen") == 0) ||
(c == 'v' && strcmp(archOpt->switchName,"-visual") == 0)) {
ival = currVal;
} else {
ival = init;
}
Tcl_SetVar2(interp, "itk_option", archOpt->switchName,
(char *)((ival) ? ival : ""), 0);
if (ival) {
archOpt->init = (char*)ckalloc((unsigned)(strlen(ival)+1));
strcpy(archOpt->init, ival);
}
}
................................................................................
char *resClass, /* resource class name in X11 database */
CONST char *defVal, /* last-resort default value */
char *currVal, /* current value (or NULL) */
ArchOptionPart *optPart, /* part to be added in */
ArchOption **raOpt) /* returns: option containing new part */
{
CONST char *init = NULL;
int result;
ArchOption *archOpt;
Itcl_ListElem *elemPtr;
*raOpt = NULL;
archOpt = NULL;
/*
* Find or create a composite option for the mega-widget.
*/
................................................................................
/*
* 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().
*/
elemPtr = Itcl_AppendList(&archOpt->parts, (ClientData)optPart);
if ((archOpt->flags & ITK_ARCHOPT_INIT) != 0) {
if (result == TCL_OK) {
init = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
}
if (!init) {
Itk_ArchOptAccessError(interp, info, archOpt);
Itcl_DeleteListElem(elemPtr);
return TCL_ERROR;
}
if (!currVal || (strcmp(init,currVal) != 0)) {
result = (*optPart->configProc)(interp, info->itclObj,
optPart->clientData, init);
if (result != TCL_OK) {
Itk_ArchOptConfigError(interp, info, archOpt);
Itcl_DeleteListElem(elemPtr);
return TCL_ERROR;
}
}
}
*raOpt = archOpt;
return TCL_OK;
|
Changes to generic/itkArchetype.c.
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 ... 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 ... 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 ... 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 ... 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 ... 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 ... 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 ... 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 .... 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 .... 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 .... 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 .... 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 .... 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 |
struct NameProcMap { const char *name; Tcl_ObjCmdProc *proc; };
/*
* List of commands that are used to implement the [info object] subcommands.
*/
static const struct NameProcMap archetypeCmds[] = {
{ "::itcl::builtin::Archetype::cget", Itk_ArchCgetCmd },
{ "::itcl::builtin::Archetype::component", Itk_ArchCompAccessCmd },
{ "::itcl::builtin::Archetype::configure", Itk_ArchConfigureCmd },
{ "::itcl::builtin::Archetype::delete", Itk_ArchDeleteOptsCmd },
{ "::itcl::builtin::Archetype::init", Itk_ArchInitOptsCmd },
{ "::itcl::builtin::Archetype::itk_component", Itk_ArchComponentCmd },
{ "::itcl::builtin::Archetype::itk_initialize", Itk_ArchInitCmd },
{ "::itcl::builtin::Archetype::itk_option", Itk_ArchOptionCmd },
{ NULL, NULL }
};
/*
* ------------------------------------------------------------------------
* Itk_ArchetypeInit()
................................................................................
ItclShowArgs(2, "Itk_ArchComponentCmd", objc, objv);
/*
* Check arguments and handle the various options...
*/
cmd = Tcl_GetString(objv[0]);
Itcl_ParseNamespPath(cmd, &buffer, &head, &tail);
Tcl_DStringFree(&buffer);
if (objc < 2) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be one of...\n",
" ", tail, " add ?-protected? ?-private? ?--? name createCmds ?optionCmds?\n",
" ", tail, " delete name ?name name...?",
(char*)NULL);
return TCL_ERROR;
}
token = Tcl_GetString(objv[1]);
c = *token;
length = strlen(token);
................................................................................
if (objc < 4) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be \"",
tail,
" add ?-protected? ?-private? ?--?",
" name createCmds ?optionCmds?\"",
(char*)NULL);
return TCL_ERROR;
}
return Itk_ArchCompAddCmd(dummy, interp, objc-1, objv+1);
} else {
/*
* Handle: itk_component delete...
*/
if (c == 'd' && strncmp(token, "delete", length) == 0) {
if (objc < 3) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be \"",
tail,
" delete name ?name name...?\"",
(char*)NULL);
return TCL_ERROR;
}
return Itk_ArchCompDeleteCmd(dummy, interp, objc-1, objv+1);
}
}
/*
* Flag any errors.
*/
cmd = Tcl_GetStringFromObj(objv[0], (int*)NULL);
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", token,
................................................................................
Itcl_ListElem *part;
ArchOption *archOpt;
ArchOptionPart *optPart;
ItclHierIter hier;
ItclVariable *ivPtr;
Tcl_HashSearch place;
Tcl_HashEntry *entry;
ItclObjectInfo *infoPtr;
ItclCallContext *callContextPtr;
Tcl_HashEntry *hPtr;
ItclShowArgs(2, "Itk_ArchInitCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"improper usage: should be \"object ",
token, " ?-option value -option value...?\"",
(char*)NULL);
return TCL_ERROR;
}
infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp,
ITCL_INTERP_DATA, NULL);
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
/*
* See what class is being initialized by getting the namespace
* for the calling context.
*/
infoPtr = Tcl_GetAssocData(interp, ITCL_INTERP_DATA, NULL);
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-2);
hPtr = Tcl_FindHashEntry(
&callContextPtr->ioPtr->iclsPtr->infoPtr->namespaceClasses,
(char *)callContextPtr->nsPtr);
if (hPtr != NULL) {
contextClass = (ItclClass *)Tcl_GetHashValue(hPtr);
}
/*
* Integrate all public variables for the current class
* context into the composite option list.
*/
Itcl_InitHierIter(&hier, contextClass);
while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) {
................................................................................
Tcl_HashSearch place;
ArchInfo *info;
ArchComponent *archComp;
int cmdlinec;
Tcl_Obj *objPtr;
Tcl_Obj *cmdlinePtr;
Tcl_Obj **cmdlinev;
ItclObjectInfo *infoPtr;
ItclShowArgs(2, "Itk_ArchCompAccessCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
return TCL_ERROR;
}
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
infoPtr = (ItclObjectInfo *)Tcl_GetAssocData(interp,
ITCL_INTERP_DATA, NULL);
if (Itcl_GetStackSize(&infoPtr->contextStack) == 1) {
callingNs = Tcl_GetGlobalNamespace(interp);
} else {
ItclCallContext *callContextPtr;
callContextPtr = Itcl_GetStackValue(&infoPtr->contextStack,
Itcl_GetStackSize(&infoPtr->contextStack)-2);
#ifdef NOTDEF
callingNs = (Tcl_Namespace *)Itcl_GetStackValue(
&infoPtr->namespaceStack,
Itcl_GetStackSize(&infoPtr->namespaceStack)-2);
#endif
callingNs = callContextPtr->nsPtr;
}
/*
* With no arguments, return a list of components that can be
* accessed from the calling scope.
*/
if (objc == 2) {
/* if the name of the component is the empty string ignore that arg */
if (strlen(Tcl_GetString(objv[1])) == 0) {
................................................................................
}
/*
* If only the component name is specified, then return the
* window name for this component.
*/
if (objc == 2) {
Tcl_Obj *objPtr;
Tcl_DString buffer;
Tcl_Namespace *nsPtr;
Tcl_CallFrame frame;
objPtr = Tcl_NewObj();
Tcl_GetCommandFullName(interp, archComp->accessCmd, objPtr);
Tcl_IncrRefCount(objPtr);
Tcl_DStringInit(&buffer);
Tcl_DStringAppend(&buffer, ITCL_VARIABLES_NAMESPACE, -1);
Tcl_DStringAppend(&buffer, Tcl_GetString(objPtr), -1);
Tcl_DecrRefCount(objPtr);
Tcl_DStringAppend(&buffer, archComp->iclsPtr->nsPtr->fullName, -1);
nsPtr = Tcl_FindNamespace(interp, Tcl_DStringValue(&buffer), NULL, 0);
Itcl_PushCallFrame(interp, &frame, nsPtr, /*isProcCallFrame*/0);
val = Tcl_GetVar2(interp, "itk_component", token, 0);
Tcl_DStringFree(&buffer);
Itcl_PopCallFrame(interp);
if (!val) {
Tcl_ResetResult(interp);
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"internal error: cannot access itk_component(", token, ")",
(char*)NULL);
if (contextObj->accessCmd) {
................................................................................
}
ItclShowArgs(1, "Itk_ArchConfigureCmd2", objc, objv);
if (objc == 1) {
Tcl_DStringInit(&buffer);
for (i=0; i < info->order.len; i++) {
archOpt = (ArchOption*)Tcl_GetHashValue(info->order.list[i]);
val = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
Tcl_DStringFree(&buffer);
return TCL_ERROR;
}
Tcl_DStringStartSublist(&buffer);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", token, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
val = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
return TCL_ERROR;
}
Tcl_AppendElement(interp, archOpt->switchName);
Tcl_AppendElement(interp,
................................................................................
/*
* Otherwise, it must be a series of "-option value" assignments.
* Look up each option and assign the new value.
*/
for (objc--,objv++; objc > 0; objc-=2, objv+=2) {
char *value;
token = Tcl_GetString(objv[0]);
if (objc < 2) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"value for \"", token, "\" missing",
(char*)NULL);
return TCL_ERROR;
}
value = Tcl_GetString(objv[1]);
if (Itk_ArchConfigOption(interp, info, token, value) != TCL_OK) {
return TCL_ERROR;
}
}
Tcl_ResetResult(interp);
return TCL_OK;
}
................................................................................
CONST char *token;
CONST char *val;
ItclClass *contextClass;
ItclObject *contextObj;
ArchInfo *info;
Tcl_HashEntry *entry;
ArchOption *archOpt;
ItclShowArgs(2, "Itk_ArchCgetCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", token, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
val = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
return TCL_ERROR;
}
/*
* Casting away CONST is safe because TCL_VOLATILE guarantees
* CONST treatment.
*/
Tcl_SetResult(interp, (char *) val, TCL_VOLATILE);
return TCL_OK;
}
|
< < < < < < < > > > > > > < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < | < < > > | | | | | | | | < > | | | > > > > < < > > | > > | > > > > | > > > > > |
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 ... 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 ... 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 ... 524 525 526 527 528 529 530 531 532 533 534 535 536 537 ... 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 ... 847 848 849 850 851 852 853 854 855 856 857 858 859 860 ... 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 ... 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 953 954 955 956 957 958 959 960 .... 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 .... 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 .... 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 .... 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 .... 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 |
struct NameProcMap { const char *name; Tcl_ObjCmdProc *proc; };
/*
* List of commands that are used to implement the [info object] subcommands.
*/
static const struct NameProcMap archetypeCmds[] = {
{ "::itcl::builtin::Archetype::delete", Itk_ArchDeleteOptsCmd },
{ "::itcl::builtin::Archetype::init", Itk_ArchInitOptsCmd },
{ NULL, NULL }
};
/*
* ------------------------------------------------------------------------
* Itk_ArchetypeInit()
................................................................................
ItclShowArgs(2, "Itk_ArchComponentCmd", objc, objv);
/*
* Check arguments and handle the various options...
*/
cmd = Tcl_GetString(objv[0]);
Itcl_ParseNamespPath(cmd, &buffer, &head, &tail);
if (objc < 2) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be one of...\n",
" ", tail, " add ?-protected? ?-private? ?--? name createCmds ?optionCmds?\n",
" ", tail, " delete name ?name name...?",
(char*)NULL);
Tcl_DStringFree(&buffer);
return TCL_ERROR;
}
token = Tcl_GetString(objv[1]);
c = *token;
length = strlen(token);
................................................................................
if (objc < 4) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be \"",
tail,
" add ?-protected? ?-private? ?--?",
" name createCmds ?optionCmds?\"",
(char*)NULL);
Tcl_DStringFree(&buffer);
return TCL_ERROR;
}
Tcl_DStringFree(&buffer);
return Itk_ArchCompAddCmd(dummy, interp, objc-1, objv+1);
} else {
/*
* Handle: itk_component delete...
*/
if (c == 'd' && strncmp(token, "delete", length) == 0) {
if (objc < 3) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"wrong # args: should be \"",
tail,
" delete name ?name name...?\"",
(char*)NULL);
Tcl_DStringFree(&buffer);
return TCL_ERROR;
}
Tcl_DStringFree(&buffer);
return Itk_ArchCompDeleteCmd(dummy, interp, objc-1, objv+1);
}
}
Tcl_DStringFree(&buffer);
/*
* Flag any errors.
*/
cmd = Tcl_GetStringFromObj(objv[0], (int*)NULL);
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"bad option \"", token,
................................................................................
Itcl_ListElem *part;
ArchOption *archOpt;
ArchOptionPart *optPart;
ItclHierIter hier;
ItclVariable *ivPtr;
Tcl_HashSearch place;
Tcl_HashEntry *entry;
ItclShowArgs(2, "Itk_ArchInitCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"improper usage: should be \"object ",
token, " ?-option value -option value...?\"",
(char*)NULL);
return TCL_ERROR;
}
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
/*
* See what class is being initialized by getting the namespace
* for the calling context.
*/
/*
* Integrate all public variables for the current class
* context into the composite option list.
*/
Itcl_InitHierIter(&hier, contextClass);
while ((iclsPtr=Itcl_AdvanceHierIter(&hier)) != NULL) {
................................................................................
Tcl_HashSearch place;
ArchInfo *info;
ArchComponent *archComp;
int cmdlinec;
Tcl_Obj *objPtr;
Tcl_Obj *cmdlinePtr;
Tcl_Obj **cmdlinev;
ItclShowArgs(2, "Itk_ArchCompAccessCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
return TCL_ERROR;
}
if (Itk_GetArchInfo(interp, contextObj, &info) != TCL_OK) {
return TCL_ERROR;
}
callingNs = Tcl_GetCurrentNamespace(interp);
/*
* With no arguments, return a list of components that can be
* accessed from the calling scope.
*/
if (objc == 2) {
/* if the name of the component is the empty string ignore that arg */
if (strlen(Tcl_GetString(objv[1])) == 0) {
................................................................................
}
/*
* If only the component name is specified, then return the
* window name for this component.
*/
if (objc == 2) {
/*
* This is moderately ugly. We want to resolve the instance
* variable "itk_component". We have the contextObj context,
* but the only way to make that context control variable
* resolution is to force the context namespace to be the class
* namespace of the contextObj, while at the same time, not
* pushing any frame, so that the same contextObj context is
* still in force, when that custom resolver attached to that
* namespace finally gets the chance to resolve.
*
* Instance variable resolution, even (especially?) in C code,
* shouldn't need quite so many contortions.
*/
Tcl_Namespace *save = Tcl_GetCurrentNamespace(interp);
Itcl_SetCallFrameNamespace(interp, contextObj->iclsPtr->nsPtr);
val = Tcl_GetVar2(interp, "itk_component", token, 0);
Itcl_SetCallFrameNamespace(interp, save);
if (!val) {
Tcl_ResetResult(interp);
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"internal error: cannot access itk_component(", token, ")",
(char*)NULL);
if (contextObj->accessCmd) {
................................................................................
}
ItclShowArgs(1, "Itk_ArchConfigureCmd2", objc, objv);
if (objc == 1) {
Tcl_DStringInit(&buffer);
for (i=0; i < info->order.len; i++) {
archOpt = (ArchOption*)Tcl_GetHashValue(info->order.list[i]);
val = ItclGetInstanceVar(interp, "itk_option", archOpt->switchName,
contextObj, contextClass);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
Tcl_DStringFree(&buffer);
return TCL_ERROR;
}
Tcl_DStringStartSublist(&buffer);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", token, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
val = ItclGetInstanceVar(interp, "itk_option", archOpt->switchName,
contextObj, contextClass);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
return TCL_ERROR;
}
Tcl_AppendElement(interp, archOpt->switchName);
Tcl_AppendElement(interp,
................................................................................
/*
* Otherwise, it must be a series of "-option value" assignments.
* Look up each option and assign the new value.
*/
for (objc--,objv++; objc > 0; objc-=2, objv+=2) {
char *value;
int code;
// Tcl_Namespace *save = Tcl_GetCurrentNamespace(interp);
token = Tcl_GetString(objv[0]);
if (objc < 2) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"value for \"", token, "\" missing",
(char*)NULL);
return TCL_ERROR;
}
value = Tcl_GetString(objv[1]);
// Itcl_SetCallFrameNamespace(interp, contextObj->iclsPtr->nsPtr);
code = Itk_ArchConfigOption(interp, info, token, value);
// Itcl_SetCallFrameNamespace(interp, save);
if (code != TCL_OK) {
return TCL_ERROR;
}
}
Tcl_ResetResult(interp);
return TCL_OK;
}
................................................................................
CONST char *token;
CONST char *val;
ItclClass *contextClass;
ItclObject *contextObj;
ArchInfo *info;
Tcl_HashEntry *entry;
ArchOption *archOpt;
Tcl_Namespace *save = Tcl_GetCurrentNamespace(interp);
ItclShowArgs(2, "Itk_ArchCgetCmd", objc, objv);
contextClass = NULL;
if (Itcl_GetContext(interp, &contextClass, &contextObj) != TCL_OK ||
!contextObj) {
token = Tcl_GetString(objv[0]);
................................................................................
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
"unknown option \"", token, "\"",
(char*)NULL);
return TCL_ERROR;
}
archOpt = (ArchOption*)Tcl_GetHashValue(entry);
Itcl_SetCallFrameNamespace(interp, contextObj->iclsPtr->nsPtr);
val = Tcl_GetVar2(interp, "itk_option", archOpt->switchName, 0);
Itcl_SetCallFrameNamespace(interp, save);
if (!val) {
Itk_ArchOptAccessError(interp, info, archOpt);
return TCL_ERROR;
}
/*
* Casting away CONST is safe because TCL_VOLATILE guarantees
* CONST treatment.
*/
Tcl_SetResult(interp, (char *) val, TCL_VOLATILE);
return TCL_OK;
}
|
Changes to generic/itkBase.c.
120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 |
if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
return TCL_ERROR;
}
if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
return TCL_ERROR;
};
if (Itcl_InitStubs(interp, "4.0-4.1", 0) == NULL) {
return TCL_ERROR;
}
/*
* Add the "itk_option" ensemble to the itcl class definition parser.
*/
parserNs = Tcl_FindNamespace(interp, "::itcl::parser",
|
| |
120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 |
if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
return TCL_ERROR;
}
if (Tk_InitStubs(interp, TK_VERSION, 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",
|
Changes to generic/itkOption.c.
213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 |
ItclObject *contextObj, /* object being configured */
ClientData cdata, /* class option */
CONST char *newval) /* new value for this option */
{
ItkClassOption *opt = (ItkClassOption*)cdata;
int result = TCL_OK;
ItclMemberCode *mcode;
/*
* If the option has any config code, execute it now.
* Make sure that the namespace context is set up correctly.
*/
mcode = opt->codePtr;
if (mcode && mcode->bodyPtr) {
Tcl_Namespace *saveNsPtr;
//fprintf(stderr, "EXE!%s!\n", Tcl_GetString(mcode->bodyPtr));
Itcl_SetCallFrameResolver(interp, opt->iclsPtr->resolvePtr);
saveNsPtr = Tcl_GetCurrentNamespace(interp);
//fprintf(stderr, "MCNS!%s!\n", saveNsPtr->fullName);
Itcl_SetCallFrameNamespace(interp, opt->iclsPtr->nsPtr);
result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
Itcl_SetCallFrameNamespace(interp, saveNsPtr);
/*
* 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
|
> < > | | < < < > > > | |
213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 |
ItclObject *contextObj, /* object being configured */
ClientData cdata, /* class option */
CONST char *newval) /* 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->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
|
Changes to library/Archetype.itk.
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 |
eval itk_initialize $args
}
destructor {
::itcl::builtin::Archetype delete
}
method cget {option} {
::itcl::builtin::Archetype cget $option
}
method configure {{option ""} args} {
::itcl::builtin::Archetype configure $option {*}$args
}
method config {{option ""} args} {
eval configure $option $args
}
method component {{name ""} args} {
::itcl::builtin::Archetype component $name {*}$args
}
protected method itk_component {option args} {
::itcl::builtin::Archetype itk_component $option {*}$args
}
protected method itk_option {option args} {
::itcl::builtin::Archetype itk_option $option {*}$args
}
protected method itk_initialize {args} {
::itcl::builtin::Archetype itk_initialize {*}$args
}
protected variable itk_option
protected variable itk_component
protected variable itk_interior ""
# ------------------------------------------------------------------
# Options common to all widgets
|
| < | < | < | < | < | < | < | < | < | < | < | < | < < |
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 |
eval itk_initialize $args
}
destructor {
::itcl::builtin::Archetype delete
}
method cget {option} @Archetype-cget
method configure {{option ""} args} @Archetype-configure
method config {{option ""} args} @Archetype-configure
method component {{name ""} args} @Archetype-component
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
protected variable itk_interior ""
# ------------------------------------------------------------------
# Options common to all widgets
|
Changes to library/itk.tcl.
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.
package require -exact Itk 4.0.3
#
# Provide transparent access to all [incr Tk] commands
#
if {$tcl_platform(os) == "MacOS"} {
source -rsrc itk:tclIndex
} else {
lappend auto_path ${itk::library}
|
| |
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.
package require -exact Itk 4.1.0
#
# Provide transparent access to all [incr Tk] commands
#
if {$tcl_platform(os) == "MacOS"} {
source -rsrc itk:tclIndex
} else {
lappend auto_path ${itk::library}
|
Changes to pkgIndex.tcl.in.
1 2 3 4 5 6 |
# Tcl package index file, version 1.0
if {![package vsatisfies [package provide Tcl] 8.6]} return
if {[string length [package provide Itcl]] && (![package vsatisfies [package provide Itcl] 4] || [package vsatisfies [package provide Itcl] 4.1])} return
package ifneeded itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
package ifneeded Itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
|
| |
1 2 3 4 5 6 |
# Tcl package index file, version 1.0
if {![package vsatisfies [package provide Tcl] 8.6]} return
if {[string length [package provide Itcl]] && ![package vsatisfies [package provide Itcl] 4.1]} return
package ifneeded itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
package ifneeded Itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
|
Changes to tests/widget.test.
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
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 ::itk::Archetype {::.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}
|
| |
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
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}
|