Attachment "vareval2.patch" to
ticket [2790615f]
added by
hobbs
2009-05-20 07:52:28.
? imgphoto.diff
? newchoose.patch
? vareval2.patch
? doc/man.macros
? generic/tkCanvas.c.photo
? macosx/configure
Index: generic/tkCanvas.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkCanvas.c,v
retrieving revision 1.46.2.2
diff -u -r1.46.2.2 tkCanvas.c
--- generic/tkCanvas.c 11 Oct 2008 06:55:03 -0000 1.46.2.2
+++ generic/tkCanvas.c 20 May 2009 00:50:33 -0000
@@ -5188,22 +5188,22 @@
Tcl_Interp *interp;
int xOrigin, yOrigin, inset, width, height;
int scrollX1, scrollX2, scrollY1, scrollY2;
- char *xScrollCmd, *yScrollCmd;
+ Tcl_Obj *xScrollCmdPtr = NULL, *yScrollCmdPtr = NULL;
/*
- * Save all the relevant values from the canvasPtr, because it might be
- * deleted as part of either of the two calls to Tcl_VarEval below.
+ * Preserve the relevant values from the canvasPtr, because it might be
+ * deleted as part of either of the two calls to eval below.
*/
interp = canvasPtr->interp;
Tcl_Preserve((ClientData) interp);
- xScrollCmd = canvasPtr->xScrollCmd;
- if (xScrollCmd != NULL) {
- Tcl_Preserve((ClientData) xScrollCmd);
+ if (canvasPtr->xScrollCmd != NULL) {
+ xScrollCmdPtr = Tcl_NewStringObj(canvasPtr->xScrollCmd, -1);
+ Tcl_IncrRefCount(xScrollCmdPtr);
}
- yScrollCmd = canvasPtr->yScrollCmd;
- if (yScrollCmd != NULL) {
- Tcl_Preserve((ClientData) yScrollCmd);
+ if (canvasPtr->yScrollCmd != NULL) {
+ yScrollCmdPtr = Tcl_NewStringObj(canvasPtr->yScrollCmd, -1);
+ Tcl_IncrRefCount(yScrollCmdPtr);
}
xOrigin = canvasPtr->xOrigin;
yOrigin = canvasPtr->yOrigin;
@@ -5215,30 +5215,34 @@
scrollY1 = canvasPtr->scrollY1;
scrollY2 = canvasPtr->scrollY2;
canvasPtr->flags &= ~UPDATE_SCROLLBARS;
- if (canvasPtr->xScrollCmd != NULL) {
+ if (xScrollCmdPtr != NULL) {
Tcl_Obj *fractions = ScrollFractions(xOrigin + inset,
xOrigin + width - inset, scrollX1, scrollX2);
- result = Tcl_VarEval(interp, xScrollCmd, " ", Tcl_GetString(fractions),
+ Tcl_AppendStringsToObj(xScrollCmdPtr, " ", Tcl_GetString(fractions),
NULL);
+ result = Tcl_EvalObjEx(interp, xScrollCmdPtr,
+ TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
Tcl_DecrRefCount(fractions);
if (result != TCL_OK) {
Tcl_BackgroundError(interp);
}
Tcl_ResetResult(interp);
- Tcl_Release((ClientData) xScrollCmd);
+ Tcl_DecrRefCount(xScrollCmdPtr);
}
- if (yScrollCmd != NULL) {
+ if (yScrollCmdPtr != NULL) {
Tcl_Obj *fractions = ScrollFractions(yOrigin + inset,
yOrigin + height - inset, scrollY1, scrollY2);
- result = Tcl_VarEval(interp, yScrollCmd, " ", Tcl_GetString(fractions),
+ Tcl_AppendStringsToObj(yScrollCmdPtr, " ", Tcl_GetString(fractions),
NULL);
+ result = Tcl_EvalObjEx(interp, yScrollCmdPtr,
+ TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
Tcl_DecrRefCount(fractions);
if (result != TCL_OK) {
Tcl_BackgroundError(interp);
}
Tcl_ResetResult(interp);
- Tcl_Release((ClientData) yScrollCmd);
+ Tcl_DecrRefCount(yScrollCmdPtr);
}
Tcl_Release((ClientData) interp);
}
Index: generic/tkEntry.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkEntry.c,v
retrieving revision 1.47.2.2
diff -u -r1.47.2.2 tkEntry.c
--- generic/tkEntry.c 9 Oct 2008 15:17:44 -0000 1.47.2.2
+++ generic/tkEntry.c 20 May 2009 00:50:33 -0000
@@ -2934,6 +2934,7 @@
int code;
double first, last;
Tcl_Interp *interp;
+ Tcl_Obj *objPtr;
if (entryPtr->scrollCmd == NULL) {
return;
@@ -2944,8 +2945,10 @@
EntryVisibleRange(entryPtr, &first, &last);
Tcl_PrintDouble(NULL, first, firstStr);
Tcl_PrintDouble(NULL, last, lastStr);
- code = Tcl_VarEval(interp, entryPtr->scrollCmd, " ", firstStr, " ",
- lastStr, NULL);
+ objPtr = Tcl_NewStringObj(entryPtr->scrollCmd, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_AppendStringsToObj(objPtr, " ", firstStr, " ", lastStr, NULL);
+ code = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
if (code != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (horizontal scrolling command executed by ");
@@ -2954,6 +2957,7 @@
Tcl_BackgroundError(interp);
}
Tcl_SetResult(interp, NULL, TCL_STATIC);
+ Tcl_DecrRefCount(objPtr);
Tcl_Release((ClientData) interp);
}
Index: generic/tkListbox.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkListbox.c,v
retrieving revision 1.44.2.3
diff -u -r1.44.2.3 tkListbox.c
--- generic/tkListbox.c 3 Mar 2009 23:54:11 -0000 1.44.2.3
+++ generic/tkListbox.c 20 May 2009 00:50:33 -0000
@@ -408,8 +408,7 @@
static void ListboxScanTo(Listbox *listPtr, int x, int y);
static int ListboxSelect(Listbox *listPtr,
int first, int last, int select);
-static void ListboxUpdateHScrollbar(Listbox *listPtr);
-static void ListboxUpdateVScrollbar(Listbox *listPtr);
+static void ListboxUpdateScrollbar(Listbox *listPtr, int direction);
static int ListboxWidgetObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
@@ -1858,14 +1857,14 @@
Tcl_Preserve((ClientData) listPtr);
if (listPtr->flags & UPDATE_V_SCROLLBAR) {
- ListboxUpdateVScrollbar(listPtr);
+ ListboxUpdateScrollbar(listPtr, UPDATE_V_SCROLLBAR);
if ((listPtr->flags & LISTBOX_DELETED) || !Tk_IsMapped(tkwin)) {
Tcl_Release((ClientData) listPtr);
return;
}
}
if (listPtr->flags & UPDATE_H_SCROLLBAR) {
- ListboxUpdateHScrollbar(listPtr);
+ ListboxUpdateScrollbar(listPtr, UPDATE_H_SCROLLBAR);
if ((listPtr->flags & LISTBOX_DELETED) || !Tk_IsMapped(tkwin)) {
Tcl_Release((ClientData) listPtr);
return;
@@ -3228,75 +3227,11 @@
/*
*----------------------------------------------------------------------
*
- * ListboxUpdateVScrollbar --
+ * ListboxUpdateScrollbar --
*
* This procedure is invoked whenever information has changed in a
- * listbox in a way that would invalidate a vertical scrollbar display.
- * If there is an associated scrollbar, then this command updates it by
- * invoking a Tcl command.
- *
- * Results:
- * None.
- *
- * Side effects:
- * A Tcl command is invoked, and an additional command may be invoked to
- * process errors in the command.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ListboxUpdateVScrollbar(
- register Listbox *listPtr) /* Information about widget. */
-{
- char firstStr[TCL_DOUBLE_SPACE+1], lastStr[TCL_DOUBLE_SPACE+1];
- double first, last;
- int result;
- Tcl_Interp *interp;
-
- if (listPtr->yScrollCmd == NULL) {
- return;
- }
- if (listPtr->nElements == 0) {
- first = 0.0;
- last = 1.0;
- } else {
- first = listPtr->topIndex / (double) listPtr->nElements;
- last = (listPtr->topIndex + listPtr->fullLines)
- / (double) listPtr->nElements;
- if (last > 1.0) {
- last = 1.0;
- }
- }
- firstStr[0] = lastStr[0] = ' ';
- Tcl_PrintDouble(NULL, first, firstStr+1);
- Tcl_PrintDouble(NULL, last, lastStr+1);
-
- /*
- * We must hold onto the interpreter from the listPtr because the data at
- * listPtr might be freed as a result of the Tcl_VarEval.
- */
-
- interp = listPtr->interp;
- Tcl_Preserve(interp);
- result = Tcl_VarEval(interp, listPtr->yScrollCmd, firstStr, lastStr,
- NULL);
- if (result != TCL_OK) {
- Tcl_AddErrorInfo(interp,
- "\n (vertical scrolling command executed by listbox)");
- Tcl_BackgroundError(interp);
- }
- Tcl_Release(interp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ListboxUpdateHScrollbar --
- *
- * This procedure is invoked whenever information has changed in a
- * listbox in a way that would invalidate a horizontal scrollbar display.
- * If there is an associated horizontal scrollbar, then this command
+ * listbox in a way that would invalidate a scrollbar display.
+ * If there is an associated scrollbar, then this command
* updates it by invoking a Tcl command.
*
* Results:
@@ -3310,34 +3245,53 @@
*/
static void
-ListboxUpdateHScrollbar(
- register Listbox *listPtr) /* Information about widget. */
+ListboxUpdateScrollbar(
+ Listbox *listPtr, /* Information about widget. */
+ int direction) /* UPDATE_H_SCROLLBAR | UPDATE_V_SCROLLBAR */
{
- char firstStr[TCL_DOUBLE_SPACE+1], lastStr[TCL_DOUBLE_SPACE+1];
+ char firstStr[TCL_DOUBLE_SPACE], lastStr[TCL_DOUBLE_SPACE];
int result, windowWidth;
double first, last;
Tcl_Interp *interp;
+ Tcl_Obj *objPtr = NULL;
- if (listPtr->xScrollCmd == NULL) {
- return;
- }
- windowWidth = Tk_Width(listPtr->tkwin) - 2*(listPtr->inset
- + listPtr->selBorderWidth);
- if (listPtr->maxWidth == 0) {
- first = 0;
- last = 1.0;
+ if (direction == UPDATE_H_SCROLLBAR) {
+ if (listPtr->xScrollCmd == NULL) {
+ return;
+ }
+ objPtr = Tcl_NewStringObj(listPtr->xScrollCmd, -1);
+ windowWidth = Tk_Width(listPtr->tkwin) - 2*(listPtr->inset
+ + listPtr->selBorderWidth);
+ if (listPtr->maxWidth == 0) {
+ first = 0;
+ last = 1.0;
+ } else {
+ first = listPtr->xOffset / (double)listPtr->maxWidth;
+ last = (listPtr->xOffset + windowWidth) / (double)listPtr->maxWidth;
+ if (last > 1.0) {
+ last = 1.0;
+ }
+ }
} else {
- register double maxWide = (double) listPtr->maxWidth;
-
- first = listPtr->xOffset / maxWide;
- last = (listPtr->xOffset + windowWidth) / maxWide;
- if (last > 1.0) {
+ if (listPtr->yScrollCmd == NULL) {
+ return;
+ }
+ objPtr = Tcl_NewStringObj(listPtr->yScrollCmd, -1);
+ if (listPtr->nElements == 0) {
+ first = 0.0;
last = 1.0;
+ } else {
+ first = listPtr->topIndex / (double) listPtr->nElements;
+ last = (listPtr->topIndex + listPtr->fullLines)
+ / (double) listPtr->nElements;
+ if (last > 1.0) {
+ last = 1.0;
+ }
}
}
- firstStr[0] = lastStr[0] = ' ';
- Tcl_PrintDouble(NULL, first, firstStr+1);
- Tcl_PrintDouble(NULL, last, lastStr+1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_PrintDouble(NULL, first, firstStr);
+ Tcl_PrintDouble(NULL, last, lastStr);
/*
* We must hold onto the interpreter because the data referred to at
@@ -3346,13 +3300,16 @@
interp = listPtr->interp;
Tcl_Preserve(interp);
- result = Tcl_VarEval(interp, listPtr->xScrollCmd, firstStr, lastStr,
- NULL);
+ Tcl_AppendStringsToObj(objPtr, " ", firstStr, " ", lastStr, NULL);
+ result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
if (result != TCL_OK) {
Tcl_AddErrorInfo(interp,
- "\n (horizontal scrolling command executed by listbox)");
+ (direction == UPDATE_H_SCROLLBAR) ?
+ "\n (horizontal scrolling command executed by listbox)" :
+ "\n (vertical scrolling command executed by listbox)");
Tcl_BackgroundError(interp);
}
+ Tcl_DecrRefCount(objPtr);
Tcl_Release(interp);
}
Index: generic/tkMenu.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkMenu.c,v
retrieving revision 1.41.2.2
diff -u -r1.41.2.2 tkMenu.c
--- generic/tkMenu.c 10 Apr 2009 16:16:04 -0000 1.41.2.2
+++ generic/tkMenu.c 20 May 2009 00:50:33 -0000
@@ -1043,9 +1043,10 @@
if (mePtr->type == TEAROFF_ENTRY) {
Tcl_DString ds;
Tcl_DStringInit(&ds);
- Tcl_DStringAppend(&ds, "tk::TearOffMenu ", -1);
- Tcl_DStringAppend(&ds, Tk_PathName(menuPtr->tkwin), -1);
- result = Tcl_Eval(interp, Tcl_DStringValue(&ds));
+ Tcl_DStringAppend(&ds, "tk::TearOffMenu", -1);
+ Tcl_DStringAppendElement(&ds, Tk_PathName(menuPtr->tkwin));
+ result = Tcl_EvalEx(interp, Tcl_DStringValue(&ds),
+ Tcl_DStringLength(&ds), TCL_EVAL_GLOBAL);
Tcl_DStringFree(&ds);
} else if ((mePtr->type == CHECK_BUTTON_ENTRY)
&& (mePtr->namePtr != NULL)) {
@@ -2694,7 +2695,8 @@
Tcl_IncrRefCount(menuDupCommandArray[i]);
}
Tcl_Preserve((ClientData) menuPtr);
- returnResult = Tcl_EvalObjv(menuPtr->interp, 4, menuDupCommandArray, 0);
+ returnResult = Tcl_EvalObjv(menuPtr->interp, 4, menuDupCommandArray,
+ TCL_EVAL_GLOBAL);
for (i = 0; i < 4; i++) {
Tcl_DecrRefCount(menuDupCommandArray[i]);
}
Index: generic/tkTextDisp.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkTextDisp.c,v
retrieving revision 1.68
diff -u -r1.68 tkTextDisp.c
--- generic/tkTextDisp.c 13 Dec 2007 15:24:17 -0000 1.68
+++ generic/tkTextDisp.c 20 May 2009 00:50:33 -0000
@@ -6057,19 +6057,22 @@
dInfoPtr->xScrollFirst = first;
dInfoPtr->xScrollLast = last;
if (textPtr->xScrollCmd != NULL) {
- char buf1[TCL_DOUBLE_SPACE+1];
- char buf2[TCL_DOUBLE_SPACE+1];
-
- buf1[0] = ' ';
- buf2[0] = ' ';
- Tcl_PrintDouble(NULL, first, buf1+1);
- Tcl_PrintDouble(NULL, last, buf2+1);
- code = Tcl_VarEval(interp, textPtr->xScrollCmd, buf1, buf2, NULL);
+ char buf1[TCL_DOUBLE_SPACE];
+ char buf2[TCL_DOUBLE_SPACE];
+ Tcl_Obj *objPtr;
+
+ objPtr = Tcl_NewStringObj(textPtr->xScrollCmd, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_PrintDouble(NULL, first, buf1);
+ Tcl_PrintDouble(NULL, last, buf2);
+ Tcl_AppendStringsToObj(objPtr, " ", buf1, " ", buf2, NULL);
+ code = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
if (code != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (horizontal scrolling command executed by text)");
Tcl_BackgroundError(interp);
}
+ Tcl_DecrRefCount(objPtr);
}
}
@@ -6340,19 +6343,22 @@
dInfoPtr->yScrollFirst = first;
dInfoPtr->yScrollLast = last;
if (textPtr->yScrollCmd != NULL) {
- char buf1[TCL_DOUBLE_SPACE+1];
- char buf2[TCL_DOUBLE_SPACE+1];
-
- buf1[0] = ' ';
- buf2[0] = ' ';
- Tcl_PrintDouble(NULL, first, buf1+1);
- Tcl_PrintDouble(NULL, last, buf2+1);
- code = Tcl_VarEval(interp, textPtr->yScrollCmd, buf1, buf2, NULL);
+ char buf1[TCL_DOUBLE_SPACE];
+ char buf2[TCL_DOUBLE_SPACE];
+ Tcl_Obj *objPtr;
+
+ objPtr = Tcl_NewStringObj(textPtr->yScrollCmd, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_PrintDouble(NULL, first, buf1);
+ Tcl_PrintDouble(NULL, last, buf2);
+ Tcl_AppendStringsToObj(objPtr, " ", buf1, " ", buf2, NULL);
+ code = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
if (code != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (vertical scrolling command executed by text)");
Tcl_BackgroundError(interp);
}
+ Tcl_DecrRefCount(objPtr);
}
}
Index: generic/tkWindow.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkWindow.c,v
retrieving revision 1.89.2.3
diff -u -r1.89.2.3 tkWindow.c
--- generic/tkWindow.c 27 Feb 2009 22:59:30 -0000 1.89.2.3
+++ generic/tkWindow.c 20 May 2009 00:50:33 -0000
@@ -2947,7 +2947,7 @@
CONST char **argv;
char *args[20];
CONST char *argString = NULL;
- Tcl_DString class;
+ Tcl_DString class, ds;
ThreadSpecificData *tsdPtr;
/*
@@ -2995,11 +2995,7 @@
/*
* Get the clearance to start Tk and the "argv" parameters from the
* master.
- */
-
- Tcl_DString ds;
-
- /*
+ *
* Step 1 : find the master and construct the interp name (could be a
* function if new APIs were ok). We could also construct the path
* while walking, but there is no API to get the name of an interp
@@ -3044,7 +3040,8 @@
* path of the slave.
*/
- code = Tcl_Eval(master, Tcl_DStringValue(&ds));
+ code = Tcl_EvalEx(master, Tcl_DStringValue(&ds),
+ Tcl_DStringLength(&ds), TCL_EVAL_GLOBAL);
if (code != TCL_OK) {
/*
* We might want to transfer the error message or not. We don't.
@@ -3180,11 +3177,16 @@
if (geometry != NULL) {
Tcl_SetVar(interp, "geometry", geometry, TCL_GLOBAL_ONLY);
- code = Tcl_VarEval(interp, "wm geometry . ", geometry, NULL);
+ Tcl_DStringInit(&ds);
+ Tcl_DStringAppend(&ds, "wm geometry .", -1);
+ Tcl_DStringAppendElement(&ds, geometry);
+ code = Tcl_EvalEx(interp, Tcl_DStringValue(&ds),
+ Tcl_DStringLength(&ds), TCL_EVAL_GLOBAL);
if (code != TCL_OK) {
goto done;
}
geometry = NULL;
+ Tcl_DStringFree(&ds);
}
if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
@@ -3249,7 +3251,7 @@
* an alternate [tkInit] command before calling Tk_Init().
*/
- code = Tcl_Eval(interp,
+ code = Tcl_EvalEx(interp,
"if {[namespace which -command tkInit] eq \"\"} {\n\
proc tkInit {} {\n\
global tk_library tk_version tk_patchLevel\n\
@@ -3257,7 +3259,7 @@
tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\
}\n\
}\n\
-tkInit");
+tkInit", -1, TCL_EVAL_GLOBAL);
}
if (code == TCL_OK) {
/*
Index: generic/ttk/ttkScroll.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/ttk/ttkScroll.c,v
retrieving revision 1.5.4.1
diff -u -r1.5.4.1 ttkScroll.c
--- generic/ttk/ttkScroll.c 19 Aug 2008 14:48:00 -0000 1.5.4.1
+++ generic/ttk/ttkScroll.c 20 May 2009 00:50:33 -0000
@@ -76,9 +76,10 @@
{
Scrollable *s = h->scrollPtr;
WidgetCore *corePtr = h->corePtr;
- char arg1[TCL_DOUBLE_SPACE + 2];
- char arg2[TCL_DOUBLE_SPACE + 2];
+ char arg1[TCL_DOUBLE_SPACE];
+ char arg2[TCL_DOUBLE_SPACE];
int code;
+ Tcl_Obj *objPtr;
h->flags &= ~SCROLL_UPDATE_REQUIRED;
@@ -86,21 +87,17 @@
return TCL_OK;
}
- arg1[0] = arg2[0] = ' ';
- Tcl_PrintDouble(interp, (double)s->first / s->total, arg1+1);
- Tcl_PrintDouble(interp, (double)s->last / s->total, arg2+1);
+ Tcl_PrintDouble(interp, (double)s->first / s->total, arg1);
+ Tcl_PrintDouble(interp, (double)s->last / s->total, arg2);
Tcl_Preserve(corePtr);
- code = Tcl_VarEval(interp, s->scrollCmd, arg1, arg2, NULL);
- if (WidgetDestroyed(corePtr)) {
- Tcl_Release(corePtr);
- return TCL_ERROR;
- }
- Tcl_Release(corePtr);
-
- if (code != TCL_OK && !Tcl_InterpDeleted(interp)) {
- /* Disable the -scrollcommand, add to stack trace:
- */
+ objPtr = Tcl_NewStringObj(s->scrollCmd, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_AppendStringsToObj(objPtr, " ", arg1, " ", arg2, NULL);
+ code = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
+ if (!WidgetDestroyed(corePtr) && (code != TCL_OK)
+ && !Tcl_InterpDeleted(interp)) {
+ /* Disable the -scrollcommand, add to stack trace: */
ckfree(s->scrollCmd);
s->scrollCmd = 0;
@@ -109,6 +106,8 @@
Tcl_AddErrorInfo(interp, Tk_PathName(h->corePtr->tkwin));
Tcl_AddErrorInfo(interp, ")");
}
+ Tcl_DecrRefCount(objPtr);
+ Tcl_Release(corePtr);
return code;
}
Index: macosx/tkMacOSXScale.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/macosx/tkMacOSXScale.c,v
retrieving revision 1.15
diff -u -r1.15 tkMacOSXScale.c
--- macosx/tkMacOSXScale.c 13 Dec 2007 15:27:10 -0000 1.15
+++ macosx/tkMacOSXScale.c 20 May 2009 00:50:33 -0000
@@ -145,7 +145,6 @@
Tk_Window tkwin = scalePtr->tkwin;
Tcl_Interp *interp = scalePtr->interp;
int result;
- char string[PRINT_CHARS];
MacScale *macScalePtr = (MacScale *) clientData;
Rect r;
WindowRef windowRef;
@@ -169,13 +168,20 @@
Tcl_Preserve((ClientData) scalePtr);
if ((scalePtr->flags & INVOKE_COMMAND) && (scalePtr->command != NULL)) {
+ Tcl_Obj *objPtr;
+ char string[PRINT_CHARS];
+
Tcl_Preserve((ClientData) interp);
sprintf(string, scalePtr->format, scalePtr->value);
- result = Tcl_VarEval(interp, scalePtr->command, " ", string, NULL);
+ objPtr = Tcl_NewStringObj(scalePtr->command, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_AppendStringsToObj(objPtr, " ", string, NULL);
+ result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
if (result != TCL_OK) {
Tcl_AddErrorInfo(interp, "\n (command executed by scale)");
Tcl_BackgroundError(interp);
}
+ Tcl_DecrRefCount(objPtr);
Tcl_Release((ClientData) interp);
}
scalePtr->flags &= ~INVOKE_COMMAND;
Index: unix/tkUnixScale.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/tkUnixScale.c,v
retrieving revision 1.13
diff -u -r1.13 tkUnixScale.c
--- unix/tkUnixScale.c 13 Dec 2007 15:28:51 -0000 1.13
+++ unix/tkUnixScale.c 20 May 2009 00:50:33 -0000
@@ -537,7 +537,6 @@
Tcl_Interp *interp = scalePtr->interp;
Pixmap pixmap;
int result;
- char string[PRINT_CHARS];
XRectangle drawnArea;
scalePtr->flags &= ~REDRAW_PENDING;
@@ -551,14 +550,20 @@
Tcl_Preserve((ClientData) scalePtr);
if ((scalePtr->flags & INVOKE_COMMAND) && (scalePtr->command != NULL)) {
+ Tcl_Obj *objPtr;
+ char string[PRINT_CHARS];
+
Tcl_Preserve((ClientData) interp);
sprintf(string, scalePtr->format, scalePtr->value);
- result = Tcl_VarEval(interp, scalePtr->command, " ", string,
- (char *) NULL);
+ objPtr = Tcl_NewStringObj(scalePtr->command, -1);
+ Tcl_IncrRefCount(objPtr);
+ Tcl_AppendStringsToObj(objPtr, " ", string, NULL);
+ result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
if (result != TCL_OK) {
Tcl_AddErrorInfo(interp, "\n (command executed by scale)");
Tcl_BackgroundError(interp);
}
+ Tcl_DecrRefCount(objPtr);
Tcl_Release((ClientData) interp);
}
scalePtr->flags &= ~INVOKE_COMMAND;