summaryrefslogtreecommitdiffstats
path: root/generic/tkMenubutton.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-14 13:48:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-14 13:48:03 (GMT)
commit0b9e60051d8b56808f7674686838055b264485f1 (patch)
tree94a7466233e7a73007acc61a138d2a1b04aafeca /generic/tkMenubutton.c
parent5da102f8bd2f7296a1786f951e0aedf27941ccb5 (diff)
downloadtk-0b9e60051d8b56808f7674686838055b264485f1.zip
tk-0b9e60051d8b56808f7674686838055b264485f1.tar.gz
tk-0b9e60051d8b56808f7674686838055b264485f1.tar.bz2
Replace various functions calls, for functions which are small wrappers around other functions, to call the wrapped function directly.
Diffstat (limited to 'generic/tkMenubutton.c')
-rw-r--r--generic/tkMenubutton.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index 545401c..6f7869a 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.c
@@ -625,9 +625,9 @@ ConfigureMenuButton(
*/
const char *value;
- value = Tcl_GetVar(interp, mbPtr->textVarName, TCL_GLOBAL_ONLY);
+ value = Tcl_GetVar2(interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY);
if (value == NULL) {
- Tcl_SetVar(interp, mbPtr->textVarName, mbPtr->text,
+ Tcl_SetVar2(interp, mbPtr->textVarName, NULL, mbPtr->text,
TCL_GLOBAL_ONLY);
} else {
if (mbPtr->text != NULL) {
@@ -636,7 +636,7 @@ ConfigureMenuButton(
mbPtr->text = ckalloc(strlen(value) + 1);
strcpy(mbPtr->text, value);
}
- Tcl_TraceVar(interp, mbPtr->textVarName,
+ Tcl_TraceVar2(interp, mbPtr->textVarName, NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
MenuButtonTextVarProc, mbPtr);
}
@@ -888,16 +888,16 @@ MenuButtonTextVarProc(
if (flags & TCL_TRACE_UNSETS) {
if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
- Tcl_SetVar(interp, mbPtr->textVarName, mbPtr->text,
+ Tcl_SetVar2(interp, mbPtr->textVarName, NULL, mbPtr->text,
TCL_GLOBAL_ONLY);
- Tcl_TraceVar(interp, mbPtr->textVarName,
+ Tcl_TraceVar2(interp, mbPtr->textVarName, NULL,
TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
MenuButtonTextVarProc, clientData);
}
return NULL;
}
- value = Tcl_GetVar(interp, mbPtr->textVarName, TCL_GLOBAL_ONLY);
+ value = Tcl_GetVar2(interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY);
if (value == NULL) {
value = "";
}