summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCmds.c6
-rw-r--r--generic/tkFont.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index cc36d5c..d3dc9a4 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCmds.c,v 1.43 2008/10/05 18:22:21 dkf Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.44 2008/10/05 21:25:07 dkf Exp $
*/
#include "tkInt.h"
@@ -1362,7 +1362,7 @@ Tk_WinfoObjCmd(
xyObj[0] = Tcl_NewIntObj(x);
xyObj[1] = Tcl_NewIntObj(y);
- Tcl_SetObjResult(interp, Tcl_NewListObj(xyObj, 2));
+ Tcl_SetObjResult(interp, Tcl_NewListObj(2, xyObj));
} else if (useX) {
Tcl_SetObjResult(interp, Tcl_NewIntObj(x));
} else {
@@ -1695,7 +1695,7 @@ Tk_WinfoObjCmd(
visInfoPtr = XGetVisualInfo(Tk_Display(tkwin), VisualScreenMask,
&template, &count);
if (visInfoPtr == NULL) {
- Tcl_SetObjResult(interp, "can't find any visuals for screen",
+ Tcl_SetResult(interp, "can't find any visuals for screen",
TCL_STATIC);
return TCL_ERROR;
}
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 76e7667..e0b3b09 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFont.c,v 1.45 2008/10/05 18:22:21 dkf Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.46 2008/10/05 21:23:25 dkf Exp $
*/
#include "tkInt.h"
@@ -716,7 +716,6 @@ Tk_FontObjCmd(
char *string;
Tk_Font tkfont;
int length = 0, skip = 0;
- Tcl_Obj *resultPtr;
if (objc > 4) {
skip = TkGetDisplayOf(interp, objc - 3, objv + 3, &tkwin);
@@ -808,7 +807,7 @@ Tk_FontObjCmd(
}
namedHashPtr = Tcl_NextHashEntry(&search);
}
- Tcl_SetObjResult(interp, resultObj);
+ Tcl_SetObjResult(interp, resultPtr);
break;
}
}