summaryrefslogtreecommitdiffstats
path: root/generic/tkButton.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 08:44:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-02-22 08:44:24 (GMT)
commitf584bb01ccf547af727096674302e8a6dbae1252 (patch)
treee3dc2cfda6b3b802979347c59b408b18a068b995 /generic/tkButton.c
parent2103923eee4d74b8f49cfdb91a73c3ef32baab5f (diff)
downloadtk-f584bb01ccf547af727096674302e8a6dbae1252.zip
tk-f584bb01ccf547af727096674302e8a6dbae1252.tar.gz
tk-f584bb01ccf547af727096674302e8a6dbae1252.tar.bz2
Replace all Tcl_TraceVar/Tcl_UntraceVar with Tcl_TraceVar2/Tcl_UntraceVar2 calls: The former are just thin wrappers around the latter.
Diffstat (limited to 'generic/tkButton.c')
-rw-r--r--generic/tkButton.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 30d8ae9..b7e314e 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -962,8 +962,8 @@ DestroyButton(
Tcl_DeleteCommandFromToken(butPtr->interp, butPtr->widgetCmd);
if (butPtr->textVarNamePtr != NULL) {
- Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->textVarNamePtr),
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ Tcl_UntraceVar2(butPtr->interp, Tcl_GetString(butPtr->textVarNamePtr),
+ NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ButtonTextVarProc, butPtr);
}
if (butPtr->image != NULL) {
@@ -997,8 +997,8 @@ DestroyButton(
Tk_FreeTextLayout(butPtr->textLayout);
}
if (butPtr->selVarNamePtr != NULL) {
- Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->selVarNamePtr),
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ Tcl_UntraceVar2(butPtr->interp, Tcl_GetString(butPtr->selVarNamePtr),
+ NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ButtonVarProc, butPtr);
}
Tk_FreeConfigOptions((char *) butPtr, butPtr->optionTable,
@@ -1045,13 +1045,13 @@ ConfigureButton(
*/
if (butPtr->textVarNamePtr != NULL) {
- Tcl_UntraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ Tcl_UntraceVar2(interp, Tcl_GetString(butPtr->textVarNamePtr),
+ NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ButtonTextVarProc, butPtr);
}
if (butPtr->selVarNamePtr != NULL) {
- Tcl_UntraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ Tcl_UntraceVar2(interp, Tcl_GetString(butPtr->selVarNamePtr),
+ NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
ButtonVarProc, butPtr);
}