Adapt Itcl to TIP #673: Remove deprecated [trace] subcommands

tcltk · Aug 4, 2023 · 5cddcde · 5cddcde
1 parent 6c3ce2a
commit 5cddcde
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/generic/itclBase.c b/generic/itclBase.c
@@ -81,7 +81,7 @@ static const char safeInitScript[] =
 "    set ptr [uplevel [list $class $name] $args]\n"
 "    uplevel [list set itcl-local-$ptr $ptr]\n"
 "    set cmd [uplevel namespace which -command $ptr]\n"
-"    uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n"
+"    uplevel [list trace add variable itcl-local-$ptr unset \"::itcl::delete object $cmd; list\"]\n"
 "    return $ptr\n"
 "}";
 

diff --git a/library/itcl.tcl b/library/itcl.tcl
@@ -32,7 +32,7 @@ proc ::itcl::local {class name args} {
     set ptr [uplevel [list $class $name] $args]
     uplevel [list set itcl-local-$ptr $ptr]
     set cmd [uplevel namespace which -command $ptr]
-    uplevel [list trace variable itcl-local-$ptr u \
+    uplevel [list trace add variable itcl-local-$ptr unset \
         "::itcl::delete_helper $cmd"]
     return $ptr
 }

diff --git a/win/rules.vc b/win/rules.vc
@@ -1369,7 +1369,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # and switches are specific to it.
 # The following macros are defined, names are for historical compatibility:
 # OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS
-# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions
+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration options
 # crt - Compiler switch that selects the appropriate C runtime
 # cdebug - Compiler switches related to debug AND optimizations
 # cwarn - Compiler switches that set warning levels