More small changes to use C89 better and manage the result more efficiently.

13 files changed, 187 insertions, 218 deletions

diff --git a/generic/tkButton.c b/generic/tkButton.c
index 2eb889e..8778b1d 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.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: tkButton.c,v 1.32 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.33 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -666,7 +666,7 @@ ButtonCreate(
     Tk_SetClass(tkwin, classNames[type]);
     butPtr = TkpCreateButton(tkwin);
 
-    Tk_SetClassProcs(tkwin, &tkpButtonProcs, (ClientData) butPtr);
+    Tk_SetClassProcs(tkwin, &tkpButtonProcs, butPtr);
 
     /*
      * Initialize the data structure for the button.
@@ -676,7 +676,7 @@ ButtonCreate(
     butPtr->display = Tk_Display(tkwin);
     butPtr->interp = interp;
     butPtr->widgetCmd = Tcl_CreateObjCommand(interp, Tk_PathName(tkwin),
-	    ButtonWidgetObjCmd, (ClientData) butPtr, ButtonCmdDeletedProc);
+	    ButtonWidgetObjCmd, butPtr, ButtonCmdDeletedProc);
     butPtr->type = type;
     butPtr->optionTable = optionTable;
     butPtr->textPtr = NULL;
@@ -741,7 +741,7 @@ ButtonCreate(
 
     Tk_CreateEventHandler(butPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
-	    ButtonEventProc, (ClientData) butPtr);
+	    ButtonEventProc, butPtr);
 
     if (Tk_InitOptions(interp, (char *) butPtr, optionTable, tkwin)
 	    != TCL_OK) {
@@ -753,7 +753,7 @@ ButtonCreate(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(butPtr->tkwin),-1));
+    Tcl_SetObjResult(interp, TkNewWindowObj(butPtr->tkwin));
     return TCL_OK;
 }
 
@@ -782,7 +782,7 @@ ButtonWidgetObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument values. */
 {
-    TkButton *butPtr = (TkButton *) clientData;
+    TkButton *butPtr = clientData;
     int index;
     int result;
     Tcl_Obj *objPtr;
@@ -796,7 +796,7 @@ ButtonWidgetObjCmd(
     if (result != TCL_OK) {
 	return result;
     }
-    Tcl_Preserve((ClientData) butPtr);
+    Tcl_Preserve(butPtr);
 
     switch (map[butPtr->type][index]) {
     case COMMAND_CGET:
@@ -808,9 +808,8 @@ ButtonWidgetObjCmd(
 		butPtr->optionTable, objv[2], butPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
@@ -820,9 +819,8 @@ ButtonWidgetObjCmd(
 		    butPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    result = ConfigureButton(interp, butPtr, objc-2, objv+2);
 	}
@@ -865,7 +863,7 @@ ButtonWidgetObjCmd(
 		    Tk_SetBackgroundFromBorder(butPtr->tkwin,
 			    butPtr->normalBorder);
 		}
-		TkpDisplayButton((ClientData) butPtr);
+		TkpDisplayButton(butPtr);
 
 		/*
 		 * Special note: must cancel any existing idle handler for
@@ -873,7 +871,7 @@ ButtonWidgetObjCmd(
 		 * TkpDisplayButton cleared the REDRAW_PENDING flag.
 		 */
 
-		Tcl_CancelIdleCall(TkpDisplayButton, (ClientData) butPtr);
+		Tcl_CancelIdleCall(TkpDisplayButton, butPtr);
 		XFlush(butPtr->display);
 		Tcl_Sleep(50);
 	    }
@@ -915,11 +913,11 @@ ButtonWidgetObjCmd(
 	}
 	break;
     }
-    Tcl_Release((ClientData) butPtr);
+    Tcl_Release(butPtr);
     return result;
 
   error:
-    Tcl_Release((ClientData) butPtr);
+    Tcl_Release(butPtr);
     return TCL_ERROR;
 }
 
@@ -948,7 +946,7 @@ DestroyButton(
     TkpDestroyButton(butPtr);
 
     if (butPtr->flags & REDRAW_PENDING) {
-	Tcl_CancelIdleCall(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_CancelIdleCall(TkpDisplayButton, butPtr);
     }
 
     /*
@@ -960,7 +958,7 @@ DestroyButton(
     if (butPtr->textVarNamePtr != NULL) {
 	Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->textVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonTextVarProc, (ClientData) butPtr);
+		ButtonTextVarProc, butPtr);
     }
     if (butPtr->image != NULL) {
 	Tk_FreeImage(butPtr->image);
@@ -995,12 +993,12 @@ DestroyButton(
     if (butPtr->selVarNamePtr != NULL) {
 	Tcl_UntraceVar(butPtr->interp, Tcl_GetString(butPtr->selVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonVarProc, (ClientData) butPtr);
+		ButtonVarProc, butPtr);
     }
     Tk_FreeConfigOptions((char *) butPtr, butPtr->optionTable,
 	    butPtr->tkwin);
     butPtr->tkwin = NULL;
-    Tcl_EventuallyFree((ClientData) butPtr, TCL_DYNAMIC);
+    Tcl_EventuallyFree(butPtr, TCL_DYNAMIC);
 }
 
 /*
@@ -1043,12 +1041,12 @@ ConfigureButton(
     if (butPtr->textVarNamePtr != NULL) {
 	Tcl_UntraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonTextVarProc, (ClientData) butPtr);
+		ButtonTextVarProc, butPtr);
     }
     if (butPtr->selVarNamePtr != NULL) {
 	Tcl_UntraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonVarProc, (ClientData) butPtr);
+		ButtonVarProc, butPtr);
     }
 
     /*
@@ -1169,7 +1167,7 @@ ConfigureButton(
 	if (butPtr->imagePtr != NULL) {
 	    image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
 		    Tcl_GetString(butPtr->imagePtr), ButtonImageProc,
-		    (ClientData) butPtr);
+		    butPtr);
 	    if (image == NULL) {
 		continue;
 	    }
@@ -1183,7 +1181,7 @@ ConfigureButton(
 	if (butPtr->selectImagePtr != NULL) {
 	    image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
 		    Tcl_GetString(butPtr->selectImagePtr),
-		    ButtonSelectImageProc, (ClientData) butPtr);
+		    ButtonSelectImageProc, butPtr);
 	    if (image == NULL) {
 		continue;
 	    }
@@ -1197,7 +1195,7 @@ ConfigureButton(
 	if (butPtr->tristateImagePtr != NULL) {
 	    image = Tk_GetImage(butPtr->interp, butPtr->tkwin,
 		    Tcl_GetString(butPtr->tristateImagePtr),
-		    ButtonTristateImageProc, (ClientData) butPtr);
+		    ButtonTristateImageProc, butPtr);
 	    if (image == NULL) {
 		continue;
 	    }
@@ -1284,15 +1282,15 @@ ConfigureButton(
     if (butPtr->textVarNamePtr != NULL) {
 	Tcl_TraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonTextVarProc, (ClientData) butPtr);
+		ButtonTextVarProc, butPtr);
     }
     if (butPtr->selVarNamePtr != NULL) {
 	Tcl_TraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		ButtonVarProc, (ClientData) butPtr);
+		ButtonVarProc, butPtr);
     }
 
-    TkButtonWorldChanged((ClientData) butPtr);
+    TkButtonWorldChanged(butPtr);
     if (error) {
 	Tcl_SetObjResult(interp, errorResult);
 	Tcl_DecrRefCount(errorResult);
@@ -1412,7 +1410,7 @@ TkButtonWorldChanged(
      */
 
     if (Tk_IsMapped(butPtr->tkwin) && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
 }
@@ -1440,7 +1438,7 @@ ButtonEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkButton *butPtr = (TkButton *) clientData;
+    TkButton *butPtr = clientData;
     if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) {
 	goto redraw;
     } else if (eventPtr->type == ConfigureNotify) {
@@ -1471,7 +1469,7 @@ ButtonEventProc(
 
   redraw:
     if ((butPtr->tkwin != NULL) && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
 }
@@ -1498,7 +1496,7 @@ static void
 ButtonCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    TkButton *butPtr = (TkButton *) clientData;
+    TkButton *butPtr = clientData;
 
     /*
      * This function could be invoked either because the window was destroyed
@@ -1593,23 +1591,19 @@ ButtonVarProc(
     const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
-    register TkButton *butPtr = (TkButton *) clientData;
-    char *name;
+    register TkButton *butPtr = clientData;
     const char *value;
     Tcl_Obj *valuePtr;
 
-    name = Tcl_GetString(butPtr->selVarNamePtr);
-
     /*
      * If the variable is being unset, then just re-establish the trace unless
      * the whole interpreter is going away.
      */
 
     if (flags & TCL_TRACE_UNSETS) {
-	butPtr->flags &= ~SELECTED;
-        butPtr->flags &= ~TRISTATED;
+	butPtr->flags &= ~(SELECTED | TRISTATED);
 	if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
-	    Tcl_TraceVar(interp, name,
+	    Tcl_TraceVar(interp, Tcl_GetString(butPtr->selVarNamePtr),
 		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 		    ButtonVarProc, clientData);
 	}
@@ -1621,7 +1615,8 @@ ButtonVarProc(
      * button.
      */
 
-    valuePtr = Tcl_GetVar2Ex(interp, name, NULL, TCL_GLOBAL_ONLY);
+    valuePtr = Tcl_ObjGetVar2(interp, butPtr->selVarNamePtr, NULL,
+	    TCL_GLOBAL_ONLY);
     if (valuePtr == NULL) {
 	value = "";
     } else {
@@ -1648,7 +1643,7 @@ ButtonVarProc(
   redisplay:
     if ((butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin)
 	    && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
     return NULL;
@@ -1680,16 +1675,13 @@ ButtonTextVarProc(
     const char *name2,		/* Not used. */
     int flags)			/* Information about what happened. */
 {
-    TkButton *butPtr = (TkButton *) clientData;
-    char *name;
+    TkButton *butPtr = clientData;
     Tcl_Obj *valuePtr;
 
     if (butPtr->flags & BUTTON_DELETED) {
 	return NULL;
     }
 
-    name = Tcl_GetString(butPtr->textVarNamePtr);
-
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
@@ -1697,16 +1689,17 @@ ButtonTextVarProc(
 
     if (flags & TCL_TRACE_UNSETS) {
 	if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
-	    Tcl_SetVar2Ex(interp, name, NULL, butPtr->textPtr,
-		    TCL_GLOBAL_ONLY);
-	    Tcl_TraceVar(interp, name,
+	    Tcl_ObjSetVar2(interp, butPtr->textVarNamePtr, NULL,
+		    butPtr->textPtr, TCL_GLOBAL_ONLY);
+	    Tcl_TraceVar(interp, Tcl_GetString(butPtr->textVarNamePtr),
 		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 		    ButtonTextVarProc, clientData);
 	}
 	return NULL;
     }
 
-    valuePtr = Tcl_GetVar2Ex(interp, name, NULL, TCL_GLOBAL_ONLY);
+    valuePtr = Tcl_ObjGetVar2(interp, butPtr->textVarNamePtr, NULL,
+	    TCL_GLOBAL_ONLY);
     if (valuePtr == NULL) {
 	valuePtr = Tcl_NewObj();
     }
@@ -1717,7 +1710,7 @@ ButtonTextVarProc(
 
     if ((butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin)
 	    && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
     return NULL;
@@ -1750,12 +1743,12 @@ ButtonImageProc(
 				 * <= 0). */
     int imgWidth, int imgHeight)/* New dimensions of image. */
 {
-    register TkButton *butPtr = (TkButton *) clientData;
+    register TkButton *butPtr = clientData;
 
     if (butPtr->tkwin != NULL) {
 	TkpComputeButtonGeometry(butPtr);
 	if (Tk_IsMapped(butPtr->tkwin) && !(butPtr->flags & REDRAW_PENDING)) {
-	    Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	    Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	    butPtr->flags |= REDRAW_PENDING;
 	}
     }
@@ -1788,7 +1781,7 @@ ButtonSelectImageProc(
 				 * <= 0). */
     int imgWidth, int imgHeight)/* New dimensions of image. */
 {
-    register TkButton *butPtr = (TkButton *) clientData;
+    register TkButton *butPtr = clientData;
 
     /*
      * Don't recompute geometry: it's controlled by the primary image.
@@ -1797,7 +1790,7 @@ ButtonSelectImageProc(
     if ((butPtr->flags & SELECTED) && (butPtr->tkwin != NULL)
 	    && Tk_IsMapped(butPtr->tkwin)
 	    && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
 }
@@ -1829,7 +1822,7 @@ ButtonTristateImageProc(
 				 * <= 0). */
     int imgWidth, int imgHeight)/* New dimensions of image. */
 {
-    register TkButton *butPtr = (TkButton *) clientData;
+    register TkButton *butPtr = clientData;
 
     /*
      * Don't recompute geometry: it's controlled by the primary image.
@@ -1838,7 +1831,7 @@ ButtonTristateImageProc(
     if ((butPtr->flags & TRISTATED) && (butPtr->tkwin != NULL)
 	    && Tk_IsMapped(butPtr->tkwin)
 	    && !(butPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) butPtr);
+	Tcl_DoWhenIdle(TkpDisplayButton, butPtr);
 	butPtr->flags |= REDRAW_PENDING;
     }
 }
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 6cb3a1c..498b277 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkEntry.c,v 1.54 2008/10/28 22:33:06 nijtmans Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.55 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -559,7 +559,7 @@ Tk_EntryObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetResult(interp, Tk_PathName(entryPtr->tkwin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(entryPtr->tkwin));
     return TCL_OK;
 }
 
@@ -612,7 +612,6 @@ EntryWidgetObjCmd(
     switch ((enum entryCmd) cmdIndex) {
     case COMMAND_BBOX: {
 	int index, x, y, width, height;
-	char buf[TCL_INTEGER_SPACE * 4];
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "index");
@@ -626,9 +625,8 @@ EntryWidgetObjCmd(
 	    index--;
 	}
 	Tk_CharBbox(entryPtr->textLayout, index, &x, &y, &width, &height);
-	sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
-		y + entryPtr->layoutY, width, height);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
+		x + entryPtr->layoutX, y + entryPtr->layoutY, width, height));
 	break;
     }
 
@@ -642,9 +640,8 @@ EntryWidgetObjCmd(
 		entryPtr->optionTable, objv[2], entryPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
@@ -655,9 +652,8 @@ EntryWidgetObjCmd(
 		    entryPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
 	}
@@ -1335,12 +1331,10 @@ ConfigureEntry(
 	    code = Tcl_GetDouble(NULL, entryPtr->string, &dvalue);
 	    if (code != TCL_OK) {
 		dvalue = sbPtr->fromValue;
-	    } else {
-		if (dvalue > sbPtr->toValue) {
-		    dvalue = sbPtr->toValue;
-		} else if (dvalue < sbPtr->fromValue) {
-		    dvalue = sbPtr->fromValue;
-		}
+	    } else if (dvalue > sbPtr->toValue) {
+		dvalue = sbPtr->toValue;
+	    } else if (dvalue < sbPtr->fromValue) {
+		dvalue = sbPtr->fromValue;
 	    }
 	    sprintf(sbPtr->formatBuf, sbPtr->valueFormat, dvalue);
 	    EntryValueChanged(entryPtr, sbPtr->formatBuf);
@@ -1968,12 +1962,10 @@ EntryComputeGeometry(
     height = fm.linespace + 2*entryPtr->inset + 2*(YPAD-XPAD);
     if (entryPtr->prefWidth > 0) {
 	width = entryPtr->prefWidth*entryPtr->avgWidth + 2*entryPtr->inset;
+    } else if (totalLength == 0) {
+	width = entryPtr->avgWidth + 2*entryPtr->inset;
     } else {
-	if (totalLength == 0) {
-	    width = entryPtr->avgWidth + 2*entryPtr->inset;
-	} else {
-	    width = totalLength + 2*entryPtr->inset;
-	}
+	width = totalLength + 2*entryPtr->inset;
     }
 
     /*
@@ -2515,36 +2507,26 @@ GetEntryIndex(
 
     length = strlen(string);
 
-    if (string[0] == 'a') {
-	if (strncmp(string, "anchor", length) == 0) {
-	    *indexPtr = entryPtr->selectAnchor;
-	} else {
-	badIndex:
-
-	    /*
-	     * Some of the paths here leave messages in the interp's result,
-	     * so we have to clear it out before storing our own message.
-	     */
-
-	    Tcl_SetResult(interp, NULL, TCL_STATIC);
-	    Tcl_AppendResult(interp, "bad ",
-		    (entryPtr->type == TK_ENTRY) ? "entry" : "spinbox",
-		    " index \"", string, "\"", NULL);
-	    return TCL_ERROR;
+    switch (string[0]) {
+    case 'a':
+	if (strncmp(string, "anchor", length) != 0) {
+	    goto badIndex;
 	}
-    } else if (string[0] == 'e') {
-	if (strncmp(string, "end", length) == 0) {
-	    *indexPtr = entryPtr->numChars;
-	} else {
+	*indexPtr = entryPtr->selectAnchor;
+	break;
+    case 'e':
+	if (strncmp(string, "end", length) != 0) {
 	    goto badIndex;
 	}
-    } else if (string[0] == 'i') {
-	if (strncmp(string, "insert", length) == 0) {
-	    *indexPtr = entryPtr->insertPos;
-	} else {
+	*indexPtr = entryPtr->numChars;
+	break;
+    case 'i':
+	if (strncmp(string, "insert", length) != 0) {
 	    goto badIndex;
 	}
-    } else if (string[0] == 's') {
+	*indexPtr = entryPtr->insertPos;
+	break;
+    case 's':
 	if (entryPtr->selectFirst < 0) {
 	    Tcl_SetResult(interp, NULL, TCL_STATIC);
 	    Tcl_AppendResult(interp, "selection isn't in widget ",
@@ -2561,7 +2543,8 @@ GetEntryIndex(
 	} else {
 	    goto badIndex;
 	}
-    } else if (string[0] == '@') {
+	break;
+    case '@': {
 	int x, roundUp, maxWidth;
 
 	if (Tcl_GetInt(interp, string + 1, &x) != TCL_OK) {
@@ -2572,7 +2555,7 @@ GetEntryIndex(
 	}
 	roundUp = 0;
 	maxWidth = Tk_Width(entryPtr->tkwin) - entryPtr->inset
-	    - entryPtr->xWidth - 1;
+		- entryPtr->xWidth - 1;
 	if (x > maxWidth) {
 	    x = maxWidth;
 	    roundUp = 1;
@@ -2590,7 +2573,9 @@ GetEntryIndex(
 	if (roundUp && (*indexPtr < entryPtr->numChars)) {
 	    *indexPtr += 1;
 	}
-    } else {
+	break;
+    }
+    default:
 	if (Tcl_GetInt(interp, string, indexPtr) != TCL_OK) {
 	    goto badIndex;
 	}
@@ -2601,6 +2586,11 @@ GetEntryIndex(
 	}
     }
     return TCL_OK;
+
+  badIndex:
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad %s index \"%s\"",
+	    (entryPtr->type == TK_ENTRY) ? "entry" : "spinbox", string));
+    return TCL_ERROR;
 }
 
 /*
@@ -3658,7 +3648,6 @@ SpinboxWidgetObjCmd(
     switch ((enum sbCmd) cmdIndex) {
     case SB_CMD_BBOX: {
 	int index, x, y, width, height;
-	char buf[TCL_INTEGER_SPACE * 4];
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "index");
@@ -3672,9 +3661,8 @@ SpinboxWidgetObjCmd(
 	    index--;
 	}
 	Tk_CharBbox(entryPtr->textLayout, index, &x, &y, &width, &height);
-	sprintf(buf, "%d %d %d %d", x + entryPtr->layoutX,
-		y + entryPtr->layoutY, width, height);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
+		x + entryPtr->layoutX, y + entryPtr->layoutY, width, height));
 	break;
     }
 
@@ -3688,9 +3676,8 @@ SpinboxWidgetObjCmd(
 		entryPtr->optionTable, objv[2], entryPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case SB_CMD_CONFIGURE:
@@ -3700,9 +3687,8 @@ SpinboxWidgetObjCmd(
 		    entryPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
 	}
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 64749d1..472c8ca 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.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: tkFrame.c,v 1.35 2008/10/28 22:33:06 nijtmans Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.36 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "default.h"
@@ -418,10 +418,10 @@ TkCreateFrame(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int argc,			/* Number of arguments. */
-    const char *const *argv,		/* Argument strings. */
+    const char *const *argv,	/* Argument strings. */
     int toplevel,		/* Non-zero means create a toplevel window,
 				 * zero means create a frame. */
-    const char *appName)		/* Should only be non-NULL if there is no main
+    const char *appName)	/* Should only be non-NULL if there is no main
 				 * window associated with the interpreter.
 				 * Gives the base name to use for the new
 				 * application. */
@@ -667,7 +667,7 @@ CreateFrame(
     if (type == TYPE_TOPLEVEL) {
 	Tcl_DoWhenIdle(MapFrame, framePtr);
     }
-    Tcl_SetResult(interp, Tk_PathName(newWin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(newWin));
     return TCL_OK;
 
   error:
@@ -934,9 +934,8 @@ ConfigureFrame(
 	    ckfree(oldMenuName);
 	}
 	return TCL_ERROR;
-    } else {
-	Tk_FreeSavedOptions(&savedOptions);
     }
+    Tk_FreeSavedOptions(&savedOptions);
 
     /*
      * A few of the options require additional processing.
@@ -1267,10 +1266,14 @@ ComputeFrameGeometry(
     if ((labelframePtr->labelAnchor >= LABELANCHOR_N) &&
 	    (labelframePtr->labelAnchor <= LABELANCHOR_SW)) {
 	maxWidth -= padding;
-	if (maxWidth < 1) maxWidth = 1;
+	if (maxWidth < 1) {
+	    maxWidth = 1;
+	}
     } else {
 	maxHeight -= padding;
-	if (maxHeight < 1) maxHeight = 1;
+	if (maxHeight < 1) {
+	    maxHeight = 1;
+	}
     }
     if (labelframePtr->labelBox.width > maxWidth) {
 	labelframePtr->labelBox.width = maxWidth;
@@ -1916,8 +1919,8 @@ FrameLostSlaveProc(
 }
 
 void
-TkMapTopFrame (tkwin)
-     Tk_Window tkwin;
+TkMapTopFrame(
+     Tk_Window tkwin)
 {
     Frame *framePtr = ((TkWindow*)tkwin)->instanceData;
     Tk_OptionTable optionTable;
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index e2e1ef0..50427c4 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrid.c,v 1.50 2008/10/17 23:18:37 nijtmans Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.51 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -1353,8 +1353,7 @@ GridSlavesCommand(
 		slavePtr->row+slavePtr->numRows-1 < row)) {
 	    continue;
 	}
-	Tcl_ListObjAppendElement(interp, res,
-		Tcl_NewStringObj(Tk_PathName(slavePtr->tkwin), -1));
+	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(slavePtr->tkwin));
     }
     Tcl_SetObjResult(interp, res);
     return TCL_OK;
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index 54deb14..72141b8 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.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: tkListbox.c,v 1.51 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkListbox.c,v 1.52 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "default.h"
@@ -568,7 +568,7 @@ Tk_ListboxObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetResult(interp, Tk_PathName(listPtr->tkwin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(listPtr->tkwin));
     return TCL_OK;
 }
 
@@ -694,10 +694,9 @@ ListboxWidgetObjCmd(
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		break;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
-		result = TCL_OK;
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
+	    result = TCL_OK;
 	} else {
 	    result = ConfigureListbox(interp, listPtr, objc-2, objv+2, 0);
 	}
@@ -1094,7 +1093,6 @@ ListboxBboxSubCmd(
      */
 
     if ((listPtr->topIndex <= index) && (index < lastVisibleIndex)) {
-	char buf[TCL_INTEGER_SPACE * 4];
 	Tcl_Obj *el;
 	char *stringRep;
 	int pixelWidth, stringLen, x, y, result;
@@ -1116,8 +1114,8 @@ ListboxBboxSubCmd(
 	x = listPtr->inset + listPtr->selBorderWidth - listPtr->xOffset;
 	y = ((index - listPtr->topIndex)*listPtr->lineHeight)
 		+ listPtr->inset + listPtr->selBorderWidth;
-	sprintf(buf, "%d %d %d %d", x, y, pixelWidth, fm.linespace);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
+		x, y, pixelWidth, fm.linespace));
     }
     return TCL_OK;
 }
@@ -1240,7 +1238,7 @@ ListboxXviewSubCmd(
 
     int index, count, type, windowWidth, windowUnits;
     int offset = 0;		/* Initialized to stop gcc warnings. */
-    double fraction, fraction2;
+    double fraction;
 
     windowWidth = Tk_Width(listPtr->tkwin)
 	    - 2*(listPtr->inset + listPtr->selBorderWidth);
@@ -1248,7 +1246,7 @@ ListboxXviewSubCmd(
 	if (listPtr->maxWidth == 0) {
 	    Tcl_SetResult(interp, "0.0 1.0", TCL_STATIC);
 	} else {
-	    char buf[TCL_DOUBLE_SPACE];
+	    double fraction2;
 
 	    fraction = listPtr->xOffset/((double) listPtr->maxWidth);
 	    fraction2 = (listPtr->xOffset + windowWidth)
@@ -1256,10 +1254,8 @@ ListboxXviewSubCmd(
 	    if (fraction2 > 1.0) {
 		fraction2 = 1.0;
 	    }
-	    Tcl_PrintDouble(NULL, fraction, buf);
-	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
-	    Tcl_PrintDouble(NULL, fraction2, buf);
-	    Tcl_AppendResult(interp, " ", buf, NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("%g %g",
+		    fraction, fraction2));
 	}
     } else if (objc == 3) {
 	if (Tcl_GetIntFromObj(interp, objv[2], &index) != TCL_OK) {
@@ -1316,24 +1312,21 @@ ListboxYviewSubCmd(
     Tcl_Obj *const objv[])	/* Array of arguments to the procedure */
 {
     int index, count, type;
-    double fraction, fraction2;
+    double fraction;
 
     if (objc == 2) {
 	if (listPtr->nElements == 0) {
 	    Tcl_SetResult(interp, "0.0 1.0", TCL_STATIC);
 	} else {
-	    char buf[TCL_DOUBLE_SPACE];
+	    double fraction2, numEls = (double) listPtr->nElements;
 
-	    fraction = listPtr->topIndex/((double) listPtr->nElements);
-	    fraction2 = (listPtr->topIndex+listPtr->fullLines)
-		    /((double) listPtr->nElements);
+	    fraction = listPtr->topIndex / numEls;
+	    fraction2 = (listPtr->topIndex+listPtr->fullLines) / numEls;
 	    if (fraction2 > 1.0) {
 		fraction2 = 1.0;
 	    }
-	    Tcl_PrintDouble(NULL, fraction, buf);
-	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
-	    Tcl_PrintDouble(NULL, fraction2, buf);
-	    Tcl_AppendResult(interp, " ", buf, NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf("%g %g",
+		    fraction, fraction2));
 	}
     } else if (objc == 3) {
 	if (GetListboxIndex(interp, listPtr, objv[2], 0, &index) != TCL_OK) {
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 85e1034..646f07e 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMenu.c,v 1.46 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkMenu.c,v 1.47 2008/11/08 22:52:29 dkf Exp $
  */
 
 /*
@@ -633,7 +633,7 @@ MenuCmd(
     	}
     }
 
-    Tcl_SetResult(interp, Tk_PathName(menuPtr->tkwin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(menuPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index dc8ac61..e2c5038 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.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: tkMenubutton.c,v 1.23 2008/10/17 23:18:37 nijtmans Exp $
+ * RCS: @(#) $Id: tkMenubutton.c,v 1.24 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -308,7 +308,7 @@ Tk_MenubuttonObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(mbPtr->tkwin), -1));
+    Tcl_SetObjResult(interp, TkNewWindowObj(mbPtr->tkwin));
     return TCL_OK;
 }
 
@@ -363,9 +363,8 @@ MenuButtonWidgetObjCmd(
 		mbPtr->optionTable, objv[2], mbPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
@@ -375,9 +374,8 @@ MenuButtonWidgetObjCmd(
 		    mbPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    result = ConfigureMenuButton(interp, mbPtr, objc-2, objv+2);
 	}
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 42fe12b..2233a9f 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.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: tkPack.c,v 1.30 2008/10/28 22:33:06 nijtmans Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.31 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -407,6 +407,7 @@ Tk_PackObjCmd(
     case PACK_SLAVES: {
 	Tk_Window master;
 	Packer *masterPtr, *slavePtr;
+	Tcl_Obj *resultObj;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -415,11 +416,14 @@ Tk_PackObjCmd(
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
 	    return TCL_ERROR;
 	}
+	resultObj = Tcl_NewObj();
 	masterPtr = GetPacker(master);
 	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
-	    Tcl_AppendElement(interp, Tk_PathName(slavePtr->tkwin));
+	    Tcl_ListObjAppendElement(NULL, resultObj,
+		    TkNewWindowObj(slavePtr->tkwin));
 	}
+	Tcl_SetObjResult(interp, resultObj);
 	break;
     }
     case PACK_UNPACK: {
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 592d726..8dfcfed 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPanedWindow.c,v 1.36 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.37 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "default.h"
@@ -493,7 +493,7 @@ Tk_PanedWindowObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(pwPtr->tkwin), -1));
+    Tcl_SetObjResult(interp, TkNewWindowObj(pwPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 4989258..3169ba2 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.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: tkPlace.c,v 1.27 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkPlace.c,v 1.28 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -212,7 +212,6 @@ Tk_PlaceObjCmd(
 {
     Tk_Window tkwin;
     Slave *slavePtr;
-    char *string;
     TkDisplay *dispPtr;
     Tk_OptionTable optionTable;
     static const char *const optionStrings[] = {
@@ -237,10 +236,9 @@ Tk_PlaceObjCmd(
      * Handle special shortcut where window name is first argument.
      */
 
-    string = Tcl_GetString(objv[1]);
-    if (string[0] == '.') {
-	tkwin = Tk_NameToWindow(interp, string,	Tk_MainWindow(interp));
-	if (tkwin == NULL) {
+    if (Tcl_GetString(objv[1])[0] == '.') {
+	if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), objv[1],
+		&tkwin) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
@@ -263,9 +261,8 @@ Tk_PlaceObjCmd(
      * possible additional arguments.
      */
 
-    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
-	    Tk_MainWindow(interp));
-    if (tkwin == NULL) {
+    if (TkGetWindowFromObj(interp, Tk_MainWindow(interp), objv[2],
+	    &tkwin) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -348,7 +345,7 @@ Tk_PlaceObjCmd(
 	    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
 		    slavePtr = slavePtr->nextPtr) {
 		Tcl_ListObjAppendElement(interp, listPtr,
-			Tcl_NewStringObj(Tk_PathName(slavePtr->tkwin),-1));
+			TkNewWindowObj(slavePtr->tkwin));
 	    }
 	    Tcl_SetObjResult(interp, listPtr);
 	}
@@ -405,7 +402,7 @@ CreateSlave(
     slavePtr->optionTable = table;
     Tcl_SetHashValue(hPtr, slavePtr);
     Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-	    (ClientData) slavePtr);
+	    slavePtr);
     return slavePtr;
 }
 
@@ -864,8 +861,8 @@ RecomputePlacement(
 
     /*
      * Abort any nested call to RecomputePlacement for this window, since
-     * we'll do everything necessary here, and set up so this call
-     * can be aborted if necessary.
+     * we'll do everything necessary here, and set up so this call can be
+     * aborted if necessary.
      */
 
     if (masterPtr->abortPtr != NULL) {
@@ -1077,13 +1074,15 @@ MasterStructureProc(
     register Slave *slavePtr, *nextPtr;
     TkDisplay *dispPtr = ((TkWindow *) masterPtr->tkwin)->dispPtr;
 
-    if (eventPtr->type == ConfigureNotify) {
+    switch (eventPtr->type) {
+    case ConfigureNotify:
 	if ((masterPtr->slavePtr != NULL)
 		&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
 	    masterPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
 	}
-    } else if (eventPtr->type == DestroyNotify) {
+	return;
+    case DestroyNotify:
 	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
 		slavePtr = nextPtr) {
 	    slavePtr->masterPtr = NULL;
@@ -1100,7 +1099,8 @@ MasterStructureProc(
 	    *masterPtr->abortPtr = 1;
 	}
 	Tcl_EventuallyFree(masterPtr, TCL_DYNAMIC);
-    } else if (eventPtr->type == MapNotify) {
+	return;
+    case MapNotify:
 	/*
 	 * When a master gets mapped, must redo the geometry computation so
 	 * that all of its slaves get remapped.
@@ -1111,7 +1111,8 @@ MasterStructureProc(
 	    masterPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
 	}
-    } else if (eventPtr->type == UnmapNotify) {
+	return;
+    case UnmapNotify:
 	/*
 	 * Unmap all of the slaves when the master gets unmapped, so that they
 	 * don't keep redisplaying themselves.
@@ -1121,6 +1122,7 @@ MasterStructureProc(
 		slavePtr = slavePtr->nextPtr) {
 	    Tk_UnmapWindow(slavePtr->tkwin);
 	}
+	return;
     }
 }
 
diff --git a/generic/tkScale.c b/generic/tkScale.c
index 374cc1e..542fc82 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -16,7 +16,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkScale.c,v 1.32 2008/10/30 23:18:59 nijtmans Exp $
+ * RCS: @(#) $Id: tkScale.c,v 1.33 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "default.h"
@@ -303,7 +303,7 @@ Tk_ScaleObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetResult(interp, Tk_PathName(scalePtr->tkwin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(scalePtr->tkwin));
     return TCL_OK;
 }
 
@@ -357,9 +357,8 @@ ScaleWidgetObjCmd(
 		scalePtr->optionTable, objv[2], scalePtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
@@ -368,17 +367,15 @@ ScaleWidgetObjCmd(
 		    (objc == 3) ? objv[2] : NULL, scalePtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    result = ConfigureScale(interp, scalePtr, objc-2, objv+2);
 	}
 	break;
     case COMMAND_COORDS: {
-	int x, y ;
+	int x, y;
 	double value;
-	char buf[TCL_INTEGER_SPACE * 2];
 
 	if ((objc != 2) && (objc != 3)) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "coords ?value?");
@@ -400,14 +397,12 @@ ScaleWidgetObjCmd(
 	    y = scalePtr->horizTroughY + scalePtr->width/2
 		    + scalePtr->borderWidth;
 	}
-	sprintf(buf, "%d %d", x, y);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d", x, y));
 	break;
     }
     case COMMAND_GET: {
 	double value;
 	int x, y;
-	char buf[TCL_DOUBLE_SPACE];
 
 	if ((objc != 2) && (objc != 4)) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "get ?x y?");
@@ -422,8 +417,7 @@ ScaleWidgetObjCmd(
 	    }
 	    value = TkScalePixelToValue(scalePtr, x, y);
 	}
-	sprintf(buf, scalePtr->format, value);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(scalePtr->format, value));
 	break;
     }
     case COMMAND_IDENTIFY: {
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
index 611da88..64bdc70 100644
--- a/generic/tkScrollbar.c
+++ b/generic/tkScrollbar.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: tkScrollbar.c,v 1.15 2008/10/03 13:13:31 dkf Exp $
+ * RCS: @(#) $Id: tkScrollbar.c,v 1.16 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -196,7 +196,7 @@ Tk_ScrollbarCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetResult(interp, Tk_PathName(scrollPtr->tkwin), TCL_STATIC);
+    Tcl_SetObjResult(interp, TkNewWindowObj(scrollPtr->tkwin));
     return TCL_OK;
 }
 
@@ -299,7 +299,6 @@ ScrollbarWidgetCmd(
     } else if ((c == 'd') && (strncmp(argv[1], "delta", length) == 0)) {
 	int xDelta, yDelta, pixels, length;
 	double fraction;
-	char buf[TCL_DOUBLE_SPACE];
 
 	if (argc != 4) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"",
@@ -324,12 +323,10 @@ ScrollbarWidgetCmd(
 	} else {
 	    fraction = ((double) pixels / (double) length);
 	}
-	Tcl_PrintDouble(NULL, fraction, buf);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fraction));
     } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
 	int x, y, pos, length;
 	double fraction;
-	char buf[TCL_DOUBLE_SPACE];
 
 	if (argc != 4) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"",
@@ -359,8 +356,7 @@ ScrollbarWidgetCmd(
 	} else if (fraction > 1.0) {
 	    fraction = 1.0;
 	}
-	Tcl_PrintDouble(NULL, fraction, buf);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fraction));
     } else if ((c == 'g') && (strncmp(argv[1], "get", length) == 0)) {
 	if (argc != 2) {
 	    Tcl_AppendResult(interp, "wrong # args: should be \"",
@@ -368,18 +364,19 @@ ScrollbarWidgetCmd(
 	    goto error;
 	}
 	if (scrollPtr->flags & NEW_STYLE_COMMANDS) {
-	    char first[TCL_DOUBLE_SPACE], last[TCL_DOUBLE_SPACE];
+	    Tcl_Obj *resObjs[2];
 
-	    Tcl_PrintDouble(NULL, scrollPtr->firstFraction, first);
-	    Tcl_PrintDouble(NULL, scrollPtr->lastFraction, last);
-	    Tcl_AppendResult(interp, first, " ", last, NULL);
+	    resObjs[0] = Tcl_NewDoubleObj(scrollPtr->firstFraction);
+	    resObjs[1] = Tcl_NewDoubleObj(scrollPtr->lastFraction);
+	    Tcl_SetObjResult(interp, Tcl_NewListObj(2, resObjs));
 	} else {
-	    char buf[TCL_INTEGER_SPACE * 4];
+	    Tcl_Obj *resObjs[4];
 
-	    sprintf(buf, "%d %d %d %d", scrollPtr->totalUnits,
-		    scrollPtr->windowUnits, scrollPtr->firstUnit,
-		    scrollPtr->lastUnit);
-	    Tcl_SetResult(interp, buf, TCL_VOLATILE);
+	    resObjs[0] = Tcl_NewIntObj(scrollPtr->totalUnits);
+	    resObjs[1] = Tcl_NewIntObj(scrollPtr->windowUnits);
+	    resObjs[2] = Tcl_NewIntObj(scrollPtr->firstUnit);
+	    resObjs[3] = Tcl_NewIntObj(scrollPtr->lastUnit);
+	    Tcl_SetObjResult(interp, Tcl_NewListObj(4, resObjs));
 	}
     } else if ((c == 'i') && (strncmp(argv[1], "identify", length) == 0)) {
 	int x, y, thing;
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index c7d8d89..755dc04 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.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: tkWinFont.c,v 1.42 2008/11/03 11:09:35 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.43 2008/11/08 22:52:29 dkf Exp $
  */
 
 #include "tkWinInt.h"
@@ -390,7 +390,8 @@ CreateNamedSystemFont(
  */
 
 void
-TkWinSetupSystemFonts(TkMainInfo *mainPtr)
+TkWinSetupSystemFonts(
+    TkMainInfo *mainPtr)
 {
     Tcl_Interp *interp;
     Tk_Window tkwin;
@@ -849,7 +850,7 @@ Tk_MeasureChars(
 	    Tcl_UtfToExternalDString(familyPtr->encoding, start,
 		    (int) (p - start), &runString);
 	    size.cx = 0;
-	    (*familyPtr->getTextExtentPoint32Proc)(hdc,
+	    familyPtr->getTextExtentPoint32Proc(hdc,
 		    Tcl_DStringValue(&runString),
 		    Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
 		    &size);
@@ -877,8 +878,7 @@ Tk_MeasureChars(
 	Tcl_UtfToExternalDString(familyPtr->encoding, start,
 		(int) (p - start), &runString);
 	size.cx = 0;
-	(*familyPtr->getTextExtentPoint32Proc)(hdc,
-		Tcl_DStringValue(&runString),
+	familyPtr->getTextExtentPoint32Proc(hdc, Tcl_DStringValue(&runString),
 		Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
 		&size);
 	Tcl_DStringFree(&runString);
@@ -911,7 +911,7 @@ Tk_MeasureChars(
 		    &dstWrote, NULL);
 	    Tcl_DStringAppend(&runString,buf,dstWrote);
 	    size.cx = 0;
-	    (*familyPtr->getTextExtentPoint32Proc)(hdc,
+	    familyPtr->getTextExtentPoint32Proc(hdc,
 		    Tcl_DStringValue(&runString),
 		    Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
 		    &size);
@@ -1299,10 +1299,10 @@ MultiFontTextOut(
 		familyPtr = lastSubFontPtr->familyPtr;
  		Tcl_UtfToExternalDString(familyPtr->encoding, source,
 			(int) (p - source), &runString);
-		(*familyPtr->textOutProc)(hdc, x-(tm.tmOverhang/2), y,
+		familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
 			Tcl_DStringValue(&runString),
 			Tcl_DStringLength(&runString)>>familyPtr->isWideFont);
-		(*familyPtr->getTextExtentPoint32Proc)(hdc,
+		familyPtr->getTextExtentPoint32Proc(hdc,
 			Tcl_DStringValue(&runString),
 			Tcl_DStringLength(&runString) >> familyPtr->isWideFont,
 			&size);
@@ -1320,7 +1320,7 @@ MultiFontTextOut(
 	familyPtr = lastSubFontPtr->familyPtr;
  	Tcl_UtfToExternalDString(familyPtr->encoding, source,
 		(int) (p - source), &runString);
-	(*familyPtr->textOutProc)(hdc, x-(tm.tmOverhang/2), y,
+	familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
 		Tcl_DStringValue(&runString),
 		Tcl_DStringLength(&runString) >> familyPtr->isWideFont);
 	Tcl_DStringFree(&runString);
@@ -1580,7 +1580,7 @@ AllocFontFamily(
     Tcl_DString faceString;
     Tcl_Encoding encoding;
     char buf[LF_FACESIZE * sizeof(WCHAR)];
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     hFont = SelectObject(hdc, hFont);
@@ -1688,7 +1688,7 @@ FreeFontFamily(
 {
     int i;
     FontFamily **familyPtrPtr;
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+    ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (familyPtr == NULL) {