Ttk and Aqua done

7 files changed, 493 insertions, 425 deletions

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 0c94712..2610e3a 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -394,7 +394,8 @@ TkMacOSXIconBitmapObjCmd(
     }
     name = Tcl_GetStringFromObj(objv[i++], &len);
     if (!len) {
-	Tcl_AppendResult(interp, "empty bitmap name", NULL);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("empty bitmap name", -1));
+	Tcl_SetErrorCode(interp, "TK", "MACBITMAP", "BAD", NULL);
 	goto end;
     }
     if (Tcl_GetIntFromObj(interp, objv[i++], &ib.width) != TCL_OK) {
@@ -409,19 +410,23 @@ TkMacOSXIconBitmapObjCmd(
     }
     value = Tcl_GetStringFromObj(objv[i++], &len);
     if (!len) {
-	Tcl_AppendResult(interp, "empty bitmap value", NULL);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("empty bitmap value", -1));
+	Tcl_SetErrorCode(interp, "TK", "MACBITMAP", "EMPTY", NULL);
 	goto end;
     }
 #if 0
     if ((kind == ICON_TYPE || kind == ICON_SYSTEM)) {
 	Tcl_DString ds;
  	Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
+
 	Tcl_UtfToExternalDString(encoding, value, -1, &ds);
 	len = Tcl_DStringLength(&ds);
 	Tcl_DStringFree(&ds);
 	Tcl_FreeEncoding(encoding);
 	if (len > 4) {
-	    Tcl_AppendResult(interp, "invalid bitmap value", NULL);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		    "invalid bitmap value", -1));
+	    Tcl_SetErrorCode(interp, "TK", "MACBITMAP", "INVALID", NULL);
 	    goto end;
 	}
     }
@@ -441,7 +446,7 @@ TkMacOSXIconBitmapObjCmd(
     }
     *iconBitmap = ib;
     result = TCL_OK;
-end:
+  end:
     return result;
 }
 
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index 92d6590..07a8419 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -137,9 +137,11 @@ TkSelGetSelection(
 	}
 	result = proc(clientData, interp, string ? [string UTF8String] : "");
     } else {
-	Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection),
-		" selection doesn't exist or form \"",
-		Tk_GetAtomName(tkwin, target), "\" not defined", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"%s selection doesn't exist or form \"%s\" not defined",
+		Tk_GetAtomName(tkwin, selection),
+		Tk_GetAtomName(tkwin, target)));
+	Tcl_SetErrorCode(interp, "TK", "SELECTION", "EXISTS", NULL);
     }
     return result;
 }
diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index a333adf..24793de 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -391,7 +391,9 @@ TkGetCursorByName(
     }
     if (!macCursorPtr || (!macCursorPtr->macCursor &&
 	    macCursorPtr->type != NONE)) {
-	Tcl_AppendResult(interp, "bad cursor spec \"", string, "\"", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"bad cursor spec \"%s\"", string));
+	Tcl_SetErrorCode(interp, "TK", "VALUE", "CURSOR", NULL);
 	if (macCursorPtr) {
 	    ckfree(macCursorPtr);
 	    macCursorPtr = NULL;
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 23b3de5..334b9fd 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -257,16 +257,16 @@ Tk_ChooseColorObjCmd(
 
     for (i = 1; i < objc; i += 2) {
 	int index;
-	const char *option, *value;
+	const char *value;
 
 	if (Tcl_GetIndexFromObj(interp, objv[i], colorOptionStrings, "option",
 		TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 	if (i + 1 == objc) {
-	    option = Tcl_GetString(objv[i]);
-	    Tcl_AppendResult(interp, "value for \"", option, "\" missing",
-		    NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "COLORDIALOG", "VALUE", NULL);
 	    goto end;
 	}
 	value = Tcl_GetString(objv[i + 1]);
@@ -378,8 +378,9 @@ Tk_GetOpenFileObjCmd(
 	    goto end;
 	}
 	if (i + 1 == objc) {
-	    str = Tcl_GetString(objv[i]);
-	    Tcl_AppendResult(interp, "value for \"", str, "\" missing", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "FILEDIALOG", "VALUE", NULL);
 	    goto end;
 	}
 	switch (index) {
@@ -556,9 +557,9 @@ Tk_GetSaveFileObjCmd(
 	    goto end;
 	}
 	if (i + 1 == objc) {
-	    str = Tcl_GetString(objv[i]);
-	    Tcl_AppendResult(interp, "value for \"", str, "\" missing",
-		    NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "FILEDIALOG", "VALUE", NULL);
 	    goto end;
 	}
 	switch (index) {
@@ -726,8 +727,9 @@ Tk_ChooseDirectoryObjCmd(
 	    goto end;
 	}
 	if (i + 1 == objc) {
-	    str = Tcl_GetString(objv[i]);
-	    Tcl_AppendResult(interp, "value for \"", str, "\" missing", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "DIRDIALOG", "VALUE", NULL);
 	    goto end;
 	}
 	switch (index) {
@@ -942,8 +944,9 @@ Tk_MessageBoxObjCmd(
 	    goto end;
 	}
 	if (i + 1 == objc) {
-	    str = Tcl_GetString(objv[i]);
-	    Tcl_AppendResult(interp, "value for \"", str, "\" missing", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "MSGBOX", "VALUE", NULL);
 	    goto end;
 	}
 	switch (index) {
@@ -1024,6 +1027,7 @@ Tk_MessageBoxObjCmd(
 	if (!defaultNativeButtonIndex) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj("Illegal default option", -1));
+	    Tcl_SetErrorCode(interp, "TK", "MSGBOX", "DEFAULT", NULL);
 	    goto end;
 	}
     }
@@ -1366,99 +1370,99 @@ FontchooserConfigureCmd(
 	    return TCL_OK;
 	}
 	if (i + 1 == objc) {
-	    Tcl_AppendResult(interp, "value for \"",
-		    Tcl_GetString(objv[i]), "\" missing", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "FONTDIALOG", "VALUE", NULL);
 	    return TCL_ERROR;
 	}
 	switch (optionIndex) {
-	    case FontchooserVisible: {
-		const char *msg = "cannot change read-only option "
-			"\"-visible\": use the show or hide command";
+	case FontchooserVisible: {
+	    const char *msg = "cannot change read-only option "
+		    "\"-visible\": use the show or hide command";
 
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, sizeof(msg)-1));
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(msg, -1));
+	    Tcl_SetErrorCode(interp, "TK", "FONTDIALOG", "READONLY", NULL);
+	    return TCL_ERROR;
+	}
+	case FontchooserParent: {
+	    Tk_Window parent = Tk_NameToWindow(interp,
+		    Tcl_GetString(objv[i+1]), tkwin);
+
+	    if (parent == None) {
 		return TCL_ERROR;
 	    }
-	    case FontchooserParent: {
-		Tk_Window parent = Tk_NameToWindow(interp,
-			Tcl_GetString(objv[i+1]), tkwin);
-
-		if (parent == None) {
-		    return TCL_ERROR;
-		}
-		if (fcdPtr->parent) {
-		    Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
-			    FontchooserParentEventHandler, fcdPtr);
-		}
-		fcdPtr->parent = parent;
-		Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
+	    if (fcdPtr->parent) {
+		Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask,
 			FontchooserParentEventHandler, fcdPtr);
-		break;
 	    }
-	    case FontchooserTitle:
-		if (fcdPtr->titleObj) {
-		    Tcl_DecrRefCount(fcdPtr->titleObj);
-		}
-		Tcl_GetStringFromObj(objv[i+1], &len);
-		if (len) {
-		    fcdPtr->titleObj = objv[i+1];
-		    if (Tcl_IsShared(fcdPtr->titleObj)) {
-			fcdPtr->titleObj = Tcl_DuplicateObj(fcdPtr->titleObj);
-		    }
-		    Tcl_IncrRefCount(fcdPtr->titleObj);
-		} else {
-		    fcdPtr->titleObj = NULL;
+	    fcdPtr->parent = parent;
+	    Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
+		    FontchooserParentEventHandler, fcdPtr);
+	    break;
+	}
+	case FontchooserTitle:
+	    if (fcdPtr->titleObj) {
+		Tcl_DecrRefCount(fcdPtr->titleObj);
+	    }
+	    Tcl_GetStringFromObj(objv[i+1], &len);
+	    if (len) {
+		fcdPtr->titleObj = objv[i+1];
+		if (Tcl_IsShared(fcdPtr->titleObj)) {
+		    fcdPtr->titleObj = Tcl_DuplicateObj(fcdPtr->titleObj);
 		}
-		break;
-	    case FontchooserFont:
-		Tcl_GetStringFromObj(objv[i+1], &len);
-		if (len) {
-		    Tk_Font f = Tk_AllocFontFromObj(interp, tkwin, objv[i+1]);
-
-		    if (!f) {
-			return TCL_ERROR;
-		    }
-		    [fontPanelFont autorelease];
-		    fontPanelFont = [TkMacOSXNSFontForFont(f) retain];
-		    [fontPanelFontAttributes setDictionary:
-			    TkMacOSXNSFontAttributesForFont(f)];
-		    [fontPanelFontAttributes removeObjectsForKeys:[NSArray
-			    arrayWithObjects:NSFontAttributeName,
-			    NSLigatureAttributeName, NSKernAttributeName,
-			    nil]];
-		    Tk_FreeFont(f);
-		} else {
-		    [fontPanelFont release];
-		    fontPanelFont = nil;
-		    [fontPanelFontAttributes removeAllObjects];
+		Tcl_IncrRefCount(fcdPtr->titleObj);
+	    } else {
+		fcdPtr->titleObj = NULL;
+	    }
+	    break;
+	case FontchooserFont:
+	    Tcl_GetStringFromObj(objv[i+1], &len);
+	    if (len) {
+		Tk_Font f = Tk_AllocFontFromObj(interp, tkwin, objv[i+1]);
+
+		if (!f) {
+		    return TCL_ERROR;
 		}
+		[fontPanelFont autorelease];
+		fontPanelFont = [TkMacOSXNSFontForFont(f) retain];
+		[fontPanelFontAttributes setDictionary:
+			TkMacOSXNSFontAttributesForFont(f)];
+		[fontPanelFontAttributes removeObjectsForKeys:[NSArray
+			arrayWithObjects:NSFontAttributeName,
+			NSLigatureAttributeName, NSKernAttributeName, nil]];
+		Tk_FreeFont(f);
+	    } else {
+		[fontPanelFont release];
+		fontPanelFont = nil;
+		[fontPanelFontAttributes removeAllObjects];
+	    }
 
-		NSFontManager *fm = [NSFontManager sharedFontManager];
-		NSFontPanel *fp = [fm fontPanel:NO];
+	    NSFontManager *fm = [NSFontManager sharedFontManager];
+	    NSFontPanel *fp = [fm fontPanel:NO];
 
-		[fp setPanelFont:fontPanelFont isMultiple:NO];
-		[fm setSelectedFont:fontPanelFont isMultiple:NO];
-		[fm setSelectedAttributes:fontPanelFontAttributes
-			isMultiple:NO];
-		if ([fp isVisible]) {
-		    TkSendVirtualEvent(fcdPtr->parent,
-			    "TkFontchooserFontChanged");
-		}
-		break;
-	    case FontchooserCmd:
-		if (fcdPtr->cmdObj) {
-		    Tcl_DecrRefCount(fcdPtr->cmdObj);
-		}
-		Tcl_GetStringFromObj(objv[i+1], &len);
-		if (len) {
-		    fcdPtr->cmdObj = objv[i+1];
-		    if (Tcl_IsShared(fcdPtr->cmdObj)) {
-			fcdPtr->cmdObj = Tcl_DuplicateObj(fcdPtr->cmdObj);
-		    }
-		    Tcl_IncrRefCount(fcdPtr->cmdObj);
-		} else {
-		    fcdPtr->cmdObj = NULL;
+	    [fp setPanelFont:fontPanelFont isMultiple:NO];
+	    [fm setSelectedFont:fontPanelFont isMultiple:NO];
+	    [fm setSelectedAttributes:fontPanelFontAttributes
+		    isMultiple:NO];
+	    if ([fp isVisible]) {
+		TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserFontChanged");
+	    }
+	    break;
+	case FontchooserCmd:
+	    if (fcdPtr->cmdObj) {
+		Tcl_DecrRefCount(fcdPtr->cmdObj);
+	    }
+	    Tcl_GetStringFromObj(objv[i+1], &len);
+	    if (len) {
+		fcdPtr->cmdObj = objv[i+1];
+		if (Tcl_IsShared(fcdPtr->cmdObj)) {
+		    fcdPtr->cmdObj = Tcl_DuplicateObj(fcdPtr->cmdObj);
 		}
-		break;
+		Tcl_IncrRefCount(fcdPtr->cmdObj);
+	    } else {
+		fcdPtr->cmdObj = NULL;
+	    }
+	    break;
 	}
     }
     return TCL_OK;
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index d6ce254..8499faa 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -208,8 +208,9 @@ TkpUseWindow(
     Container *containerPtr;
 
     if (winPtr->window != None) {
-	Tcl_AppendResult(interp, "can't modify container after widget is "
-		"created", NULL);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		"can't modify container after widget is created", -1));
+	Tcl_SetErrorCode(interp, "TK", "EMBED", "CREATION", NULL);
 	return TCL_ERROR;
     }
 
@@ -229,8 +230,10 @@ TkpUseWindow(
     usePtr = (TkWindow *) Tk_IdToWindow(winPtr->display, (Window) parent);
     if (usePtr != NULL) {
 	if (!(usePtr->flags & TK_CONTAINER)) {
-	    Tcl_AppendResult(interp, "window \"", usePtr->pathName,
-		    "\" doesn't have -container option set", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "window \"%s\" doesn't have -container option set",
+		    usePtr->pathName));
+	    Tcl_SetErrorCode(interp, "TK", "EMBED", "TARGET", NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -305,15 +308,17 @@ TkpUseWindow(
 
     if (containerPtr == NULL) {
 	/*
-	 * If someone has registered an in process embedding handler, then
+	 * If someone has registered an in-process embedding handler, then
 	 * see if it can handle this window...
 	 */
 
 	if (tkMacOSXEmbedHandler == NULL ||
 		tkMacOSXEmbedHandler->registerWinProc((long) parent,
 		(Tk_Window) winPtr) != TCL_OK) {
-	    Tcl_AppendResult(interp, "The window ID ", string,
-		    " does not correspond to a valid Tk Window.", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "The window ID %s does not correspond to a valid Tk Window",
+		    string));
+	    Tcl_SetErrorCode(interp, "TK", "EMBED", "HANDLE", NULL);
 	    return TCL_ERROR;
 	}
 
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 1131ccc..2aad32e 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -406,6 +406,7 @@ SetWindowSizeLimits(
 	    wmPtr->maxAspect.x && wmPtr->minAspect.y == wmPtr->maxAspect.y) {
 	NSSize aspect = NSMakeSize(wmPtr->minAspect.x, wmPtr->minAspect.y);
 	CGFloat ratio = aspect.width/aspect.height;
+
 	[macWindow setContentAspectRatio:aspect];
 	if ((CGFloat)minWidth/(CGFloat)minHeight > ratio) {
 	    minHeight = lround(minWidth / ratio);
@@ -457,7 +458,6 @@ static TkWindow*
 FrontWindowAtPoint(
     int x, int y)
 {
-
     NSPoint p = NSMakePoint(x, tkMacOSXZeroScreenHeight - y);
     NSWindow *win = nil;
     NSInteger windowCount;
@@ -469,6 +469,7 @@ FrontWindowAtPoint(
 	NSWindowList(windowCount, windowNumbers);
 	for (NSInteger index = 0; index < windowCount; index++) {
 	    NSWindow *w = [NSApp windowWithWindowNumber:windowNumbers[index]];
+
 	    if (w && NSMouseInRect(p, [w frame], NO)) {
 		win = w;
 		break;
@@ -547,7 +548,7 @@ TkWmNewWindow(
     wmPtr->configHeight = -1;
     wmPtr->vRoot = None;
     wmPtr->protPtr = NULL;
-    wmPtr->cmdArgv = NULL;
+    wmPtr->commandObj = NULL;
     wmPtr->clientMachine = NULL;
     wmPtr->flags = WM_NEVER_MAPPED;
     wmPtr->macClass = kDocumentWindowClass;
@@ -755,8 +756,8 @@ TkWmDeadWindow(
 	wmPtr->protPtr = protPtr->nextPtr;
 	Tcl_EventuallyFree(protPtr, TCL_DYNAMIC);
     }
-    if (wmPtr->cmdArgv != NULL) {
-	ckfree(wmPtr->cmdArgv);
+    if (wmPtr->commandObj != NULL) {
+	Tcl_DecrRefCount(wmPtr->commandObj);
     }
     if (wmPtr->clientMachine != NULL) {
 	ckfree(wmPtr->clientMachine);
@@ -773,6 +774,7 @@ TkWmDeadWindow(
      */
 
     NSWindow *window = wmPtr->window;
+
     if (window && !Tk_IsEmbedded(winPtr) ) {
 	[[window parentWindow] removeChildWindow:window];
 	[window close];
@@ -898,8 +900,9 @@ Tk_WmObjCmd(
     }
     if (!Tk_IsTopLevel(winPtr)
 	    && (index != WMOPT_MANAGE) && (index != WMOPT_FORGET)) {
-	Tcl_AppendResult(interp, "window \"", winPtr->pathName,
-		"\" isn't a top-level window", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window \"%s\" isn't a top-level window", winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WM", "TOPLEVEL", NULL);
 	return TCL_ERROR;
     }
 
@@ -1032,6 +1035,7 @@ WmAspectCmd(
 		(denom2 <= 0)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "aspect number can't be <= 0", -1));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ASPECT", NULL);
 	    return TCL_ERROR;
 	}
 	wmPtr->minAspect.x = numer1;
@@ -1271,7 +1275,7 @@ WmAttributesCmd(
     macWindow = TkMacOSXDrawableWindow(winPtr->window);
 
     if (objc == 3) {		/* wm attributes $win */
-	Tcl_Obj *result = Tcl_NewListObj(0,0);
+	Tcl_Obj *result = Tcl_NewObj();
 
 	for (attribute = 0; attribute < _WMATT_LAST_ATTRIBUTE; ++attribute) {
 	    Tcl_ListObjAppendElement(NULL, result,
@@ -1282,7 +1286,7 @@ WmAttributesCmd(
 	Tcl_SetObjResult(interp, result);
     } else if (objc == 4)  {	/* wm attributes $win -attribute */
 	if (Tcl_GetIndexFromObj(interp, objv[3], WmAttributeNames,
-		    "attribute", 0, &attribute) != TCL_OK) {
+		"attribute", 0, &attribute) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, WmGetAttribute(winPtr, macWindow, attribute));
@@ -1475,38 +1479,34 @@ WmCommandCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
-    char *argv3;
-    int cmdArgc;
-    const char **cmdArgv;
+    int len;
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?value?");
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	if (wmPtr->cmdArgv != NULL) {
-	    argv3 = Tcl_Merge(wmPtr->cmdArgc, wmPtr->cmdArgv);
-	    Tcl_SetResult(interp, argv3, TCL_VOLATILE);
-	    ckfree(argv3);
+	if (wmPtr->commandObj != NULL) {
+	    Tcl_SetObjResult(interp, wmPtr->commandObj);
 	}
 	return TCL_OK;
     }
-    argv3 = Tcl_GetString(objv[3]);
-    if (argv3[0] == 0) {
-	if (wmPtr->cmdArgv != NULL) {
-	    ckfree(wmPtr->cmdArgv);
-	    wmPtr->cmdArgv = NULL;
+    if (Tcl_GetString(objv[3])[0] == 0) {
+	if (wmPtr->commandObj != NULL) {
+	    Tcl_DecrRefCount(wmPtr->commandObj);
+	    wmPtr->commandObj = NULL;
 	}
 	return TCL_OK;
     }
-    if (Tcl_SplitList(interp, argv3, &cmdArgc, &cmdArgv) != TCL_OK) {
+    if (Tcl_ListObjLength(interp, objv[3], &len) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (wmPtr->cmdArgv != NULL) {
-	ckfree(wmPtr->cmdArgv);
+    if (wmPtr->commandObj != NULL) {
+	Tcl_DecrRefCount(wmPtr->commandObj);
     }
-    wmPtr->cmdArgc = cmdArgc;
-    wmPtr->cmdArgv = cmdArgv;
+    wmPtr->commandObj = Tcl_DuplicateObj(objv[3]);
+    Tcl_IncrRefCount(wmPtr->commandObj);
+    Tcl_InvalidateStringRep(wmPtr->commandObj);
     return TCL_OK;
 }
 
@@ -1541,18 +1541,21 @@ WmDeiconifyCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
+
     if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't deiconify %s: it is an icon for %s",
 		Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
+	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", NULL);
 	return TCL_ERROR;
-    }
-    if (winPtr->flags & TK_EMBEDDED) {
+    } else if (winPtr->flags & TK_EMBEDDED) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't deiconify %s: it is an embedded window",
 		winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "EMBEDDED", NULL);
 	return TCL_ERROR;
     }
+
     TkpWmSetState(winPtr, TkMacOSXIsWindowZoomed(winPtr) ?
 	    ZoomState : NormalState);
     return TCL_OK;
@@ -1595,8 +1598,8 @@ WmFocusmodelCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	Tcl_SetResult(interp, (wmPtr->hints.input ? "passive" : "active"),
-		TCL_STATIC);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		wmPtr->hints.input ? "passive" : "active", -1));
 	return TCL_OK;
     }
 
@@ -1637,18 +1640,17 @@ WmForgetCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-
-    register Tk_Window frameWin = (Tk_Window)winPtr;
+    register Tk_Window frameWin = (Tk_Window) winPtr;
 
     if (Tk_IsTopLevel(frameWin)) {
-
 	MacDrawable *macWin = (MacDrawable *) winPtr->parentPtr->window;
+
     	TkFocusJoin(winPtr);
     	Tk_UnmapWindow(frameWin); 
-	TkWmDeadWindow(macWin);
+	TkWmDeadWindow((TkWindow *) macWin);
 	RemapWindows(winPtr, macWin);
        
-	winPtr->flags &=~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
+	winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
 
 	/*
          * Flags (above) must be cleared before calling TkMapTopFrame (below).
@@ -1656,7 +1658,9 @@ WmForgetCmd(
 
 	TkMapTopFrame(frameWin);
     } else {
-    	/* Already not managed by wm - ignore it */
+    	/*
+	 * Already not managed by wm - ignore it.
+	 */
     }
     return TCL_OK;
 }
@@ -1736,8 +1740,6 @@ WmGeometryCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	char buf[16 + TCL_INTEGER_SPACE * 4];
-
 	xSign = (wmPtr->flags & WM_NEGATIVE_X) ? '-' : '+';
 	ySign = (wmPtr->flags & WM_NEGATIVE_Y) ? '-' : '+';
 	if (wmPtr->gridWin != NULL) {
@@ -1790,6 +1792,7 @@ WmGridCmd(
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     int reqWidth, reqHeight, widthInc, heightInc;
+    char *errorMsg;
 
     if ((objc != 3) && (objc != 7)) {
 	Tcl_WrongNumArgs(interp, 2, objv,
@@ -1831,20 +1834,17 @@ WmGridCmd(
 	    return TCL_ERROR;
 	}
 	if (reqWidth < 0) {
-	    Tcl_SetResult(interp, "baseWidth can't be < 0", TCL_STATIC);
-	    return TCL_ERROR;
-	}
-	if (reqHeight < 0) {
-	    Tcl_SetResult(interp, "baseHeight can't be < 0", TCL_STATIC);
-	    return TCL_ERROR;
-	}
-	if (widthInc <= 0) {
-	    Tcl_SetResult(interp, "widthInc can't be <= 0", TCL_STATIC);
-	    return TCL_ERROR;
-	}
-	if (heightInc <= 0) {
-	    Tcl_SetResult(interp, "heightInc can't be <= 0", TCL_STATIC);
-	    return TCL_ERROR;
+	    errorMsg = "baseWidth can't be < 0";
+	    goto error;
+	} else if (reqHeight < 0) {
+	    errorMsg = "baseHeight can't be < 0";
+	    goto error;
+	} else if (widthInc <= 0) {
+	    errorMsg = "widthInc can't be <= 0";
+	    goto error;
+	} else if (heightInc <= 0) {
+	    errorMsg = "heightInc can't be <= 0";
+	    goto error;
 	}
 	Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
 		heightInc);
@@ -1852,6 +1852,11 @@ WmGridCmd(
     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
     WmUpdateGeom(wmPtr, winPtr);
     return TCL_OK;
+
+  error:
+    Tcl_SetObjResult(interp, Tcl_NewStringObj(errorMsg, -1));
+    Tcl_SetErrorCode(interp, "TK", "WM", "GRID", NULL);
+    return TCL_ERROR;
 }
 
 /*
@@ -1890,10 +1895,11 @@ WmGroupCmd(
     }
     if (objc == 3) {
 	if (wmPtr->hints.flags & WindowGroupHint) {
-	    Tcl_SetResult(interp, wmPtr->leaderName, TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(wmPtr->leaderName, -1));
 	}
 	return TCL_OK;
     }
+
     argv3 = Tcl_GetStringFromObj(objv[3], &length);
     if (*argv3 == '\0') {
 	wmPtr->hints.flags &= ~WindowGroupHint;
@@ -2016,26 +2022,33 @@ WmIconifyCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
+
     if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
-	Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName,
-		"\": override-redirect flag is set", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't iconify \"%s\": override-redirect flag is set",
+		winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT",
+		NULL);
 	return TCL_ERROR;
-    }
-    if (wmPtr->master != None) {
-	Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName,
-		"\": it is a transient", NULL);
+    } else if (wmPtr->master != None) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't iconify \"%s\": it is a transient", winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL);
 	return TCL_ERROR;
-    }
-    if (wmPtr->iconFor != NULL) {
-	Tcl_AppendResult(interp, "can't iconify ", winPtr->pathName,
-		": it is an icon for ", Tk_PathName(wmPtr->iconFor), NULL);
+    } else if (wmPtr->iconFor != NULL) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't iconify %s: it is an icon for %s",
+		winPtr->pathName, Tk_PathName(wmPtr->iconFor)));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL);
 	return TCL_ERROR;
-    }
-    if (winPtr->flags & TK_EMBEDDED) {
-	Tcl_AppendResult(interp, "can't iconify ", winPtr->pathName,
-		": it is an embedded window", NULL);
+    } else if (winPtr->flags & TK_EMBEDDED) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't iconify %s: it is an embedded window",
+		winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL);
 	return TCL_ERROR;
     }
+
     TkpWmSetState(winPtr, IconicState);
     return TCL_OK;
 }
@@ -2073,6 +2086,7 @@ WmIconmaskCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?bitmap?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	if (wmPtr->hints.flags & IconMaskHint) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -2081,6 +2095,7 @@ WmIconmaskCmd(
 	}
 	return TCL_OK;
     }
+
     argv3 = Tcl_GetString(objv[3]);
     if (*argv3 == '\0') {
 	if (wmPtr->hints.icon_mask != None) {
@@ -2201,8 +2216,10 @@ WmIconphotoCmd(
     for (i = 3 + isDefault; i < objc; i++) {
 	photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i]));
 	if (photo == NULL) {
-	    Tcl_AppendResult(interp, "can't use \"", Tcl_GetString(objv[i]),
-		    "\" as iconphoto: not a photo image", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't use \"%s\" as iconphoto: not a photo image",
+		    Tcl_GetString(objv[i])));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", NULL);
 	    return TCL_ERROR;
 	}
 	Tk_PhotoGetSize(photo, &width, &height);
@@ -2248,6 +2265,7 @@ WmIconpositionCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?x y?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	if (wmPtr->hints.flags & IconPositionHint) {
 	    Tcl_Obj *results[2];
@@ -2258,6 +2276,7 @@ WmIconpositionCmd(
 	}
 	return TCL_OK;
     }
+
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->hints.flags &= ~IconPositionHint;
     } else {
@@ -2305,12 +2324,14 @@ WmIconwindowCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?pathName?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	if (wmPtr->icon != NULL) {
 	    Tcl_SetObjResult(interp, TkNewWindowObj(wmPtr->icon));
 	}
 	return TCL_OK;
     }
+
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->hints.flags &= ~IconWindowHint;
 	if (wmPtr->icon != NULL) {
@@ -2324,19 +2345,24 @@ WmIconwindowCmd(
 	    return TCL_ERROR;
 	}
 	if (!Tk_IsTopLevel(tkwin2)) {
-	    Tcl_AppendResult(interp, "can't use ", Tcl_GetString(objv[3]),
-		    " as icon window: not at top level", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't use %s as icon window: not at top level",
+		    Tk_PathName(tkwin2)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "TOPLEVEL",
+		    NULL);
 	    return TCL_ERROR;
 	}
 	wmPtr2 = ((TkWindow *) tkwin2)->wmInfoPtr;
 	if (wmPtr2->iconFor != NULL) {
-	    Tcl_AppendResult(interp, Tcl_GetString(objv[3]),
-		    " is already an icon for ",
-		    Tk_PathName(wmPtr2->iconFor), NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "%s is already an icon for %s",
+		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 	if (wmPtr->icon != NULL) {
 	    WmInfo *wmPtr3 = ((TkWindow *) wmPtr->icon)->wmInfoPtr;
+
 	    wmPtr3->iconFor = NULL;
 	}
 	Tk_MakeWindowExist(tkwin2);
@@ -2380,18 +2406,18 @@ WmManageCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-
-    register Tk_Window frameWin = (Tk_Window)winPtr;
+    register Tk_Window frameWin = (Tk_Window) winPtr;
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
-    char *oldClass = (char*)Tk_Class(frameWin);
 
     if (!Tk_IsTopLevel(frameWin)) {
 	MacDrawable *macWin = (MacDrawable *) winPtr->window;
 
 	if (!Tk_IsManageable(frameWin)) {
-	    Tcl_AppendResult(interp, "window \"",
-		Tk_PathName(frameWin), "\" is not manageable: must be "
-		"a frame, labelframe or toplevel", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "window \"%s\" is not manageable: must be a"
+		    " frame, labelframe or toplevel",
+		    Tk_PathName(frameWin)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "MANAGE", NULL);
 	    return TCL_ERROR;
 	}
 	TkFocusSplit(winPtr);
@@ -2450,6 +2476,7 @@ WmMaxsizeCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	Tcl_Obj *results[2];
 
@@ -2459,6 +2486,7 @@ WmMaxsizeCmd(
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, results));
 	return TCL_OK;
     }
+
     if ((Tcl_GetIntFromObj(interp, objv[3], &width) != TCL_OK)
 	    || (Tcl_GetIntFromObj(interp, objv[4], &height) != TCL_OK)) {
 	return TCL_ERROR;
@@ -2502,6 +2530,7 @@ WmMinsizeCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	Tcl_Obj *results[2];
 
@@ -2511,6 +2540,7 @@ WmMinsizeCmd(
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, results));
 	return TCL_OK;
     }
+
     if ((Tcl_GetIntFromObj(interp, objv[3], &width) != TCL_OK)
 	    || (Tcl_GetIntFromObj(interp, objv[4], &height) != TCL_OK)) {
 	return TCL_ERROR;
@@ -2554,11 +2584,13 @@ WmOverrideredirectCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
 		Tk_Attributes((Tk_Window) winPtr)->override_redirect));
 	return TCL_OK;
     }
+
     if (Tcl_GetBooleanFromObj(interp, objv[3], &boolean) != TCL_OK) {
 	return TCL_ERROR;
     }
@@ -2604,14 +2636,16 @@ WmPositionfromCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?user/program?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	if (wmPtr->sizeHintsFlags & USPosition) {
-	    Tcl_SetResult(interp, "user", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("user", -1));
 	} else if (wmPtr->sizeHintsFlags & PPosition) {
-	    Tcl_SetResult(interp, "program", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("program", -1));
 	}
 	return TCL_OK;
     }
+
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->sizeHintsFlags &= ~(USPosition|PPosition);
     } else {
@@ -2667,6 +2701,7 @@ WmProtocolCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?name? ?command?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	/*
 	 * Return a list of all defined protocols for the window.
@@ -2679,6 +2714,7 @@ WmProtocolCmd(
 	}
 	return TCL_OK;
     }
+
     protocol = Tk_InternAtom((Tk_Window) winPtr, Tcl_GetString(objv[3]));
     if (objc == 4) {
 	/*
@@ -2759,6 +2795,7 @@ WmResizableCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?width height?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	Tcl_Obj *results[2];
 
@@ -2767,6 +2804,7 @@ WmResizableCmd(
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, results));
 	return TCL_OK;
     }
+
     if ((Tcl_GetBooleanFromObj(interp, objv[3], &width) != TCL_OK)
 	    || (Tcl_GetBooleanFromObj(interp, objv[4], &height) != TCL_OK)) {
 	return TCL_ERROR;
@@ -2836,11 +2874,12 @@ WmSizefromCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?user|program?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	if (wmPtr->sizeHintsFlags & USSize) {
-	    Tcl_SetResult(interp, "user", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("user", -1));
 	} else if (wmPtr->sizeHintsFlags & PSize) {
-	    Tcl_SetResult(interp, "program", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("program", -1));
 	}
 	return TCL_OK;
     }
@@ -2923,20 +2962,22 @@ WmStackorderCmd(
 	}
 
 	if (!Tk_IsTopLevel(winPtr2)) {
-	    Tcl_AppendResult(interp, "window \"", winPtr2->pathName,
-		    "\" isn't a top-level window", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "window \"%s\" isn't a top-level window",
+		    winPtr2->pathName));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "TOPLEVEL", NULL);
 	    return TCL_ERROR;
 	}
 
 	if (!Tk_IsMapped(winPtr)) {
-	    Tcl_AppendResult(interp, "window \"", winPtr->pathName,
-		    "\" isn't mapped", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "window \"%s\" isn't mapped", winPtr->pathName));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", NULL);
 	    return TCL_ERROR;
-	}
-
-	if (!Tk_IsMapped(winPtr2)) {
-	    Tcl_AppendResult(interp, "window \"", winPtr2->pathName,
-		    "\" isn't mapped", NULL);
+	} else if (!Tk_IsMapped(winPtr2)) {
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "window \"%s\" isn't mapped", winPtr2->pathName));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", NULL);
 	    return TCL_ERROR;
 	}
 
@@ -2947,7 +2988,9 @@ WmStackorderCmd(
 
 	windows = TkWmStackorderToplevel(winPtr->mainPtr->winPtr);
 	if (windows == NULL) {
-	    Tcl_AppendResult(interp, "TkWmStackorderToplevel failed", NULL);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
+		    "TkWmStackorderToplevel failed", -1));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "FAIL", NULL);
 	    return TCL_ERROR;
 	}
 
@@ -2961,8 +3004,7 @@ WmStackorderCmd(
 	}
 	if (index1 == -1) {
 	    Tcl_Panic("winPtr window not found");
-	}
-	if (index2 == -1) {
+	} else if (index2 == -1) {
 	    Tcl_Panic("winPtr2 window not found");
 	}
 
@@ -2980,7 +3022,6 @@ WmStackorderCmd(
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(result));
 	return TCL_OK;
     }
-    return TCL_OK;
 }
 
 /*
@@ -3019,21 +3060,25 @@ WmStateCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?state?");
 	return TCL_ERROR;
     }
+
     if (objc == 4) {
 	if (wmPtr->iconFor != NULL) {
-	    Tcl_AppendResult(interp, "can't change state of ",
-		    Tcl_GetString(objv[2]), ": it is an icon for ",
-		    Tk_PathName(wmPtr->iconFor), NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't change state of %s: it is an icon for %s",
+		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 	if (winPtr->flags & TK_EMBEDDED) {
-	    Tcl_AppendResult(interp, "can't change state of ",
-		    winPtr->pathName, ": it is an embedded window", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't change state of %s: it is an embedded window",
+		    winPtr->pathName));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "EMBEDDED", NULL);
 	    return TCL_ERROR;
 	}
 
 	if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0,
-				&index) != TCL_OK) {
+		&index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
@@ -3046,13 +3091,19 @@ WmStateCmd(
 	     */
 	} else if (index == OPT_ICONIC) {
 	    if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
-		Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName,
-			"\": override-redirect flag is set", NULL);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"can't iconify \"%s\": override-redirect flag is set",
+			winPtr->pathName));
+		Tcl_SetErrorCode(interp, "TK", "WM", "STATE",
+			"OVERRIDE_REDIRECT", NULL);
 		return TCL_ERROR;
 	    }
 	    if (wmPtr->master != None) {
-		Tcl_AppendResult(interp, "can't iconify \"", winPtr->pathName,
-			"\": it is a transient", NULL);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"can't iconify \"%s\": it is a transient",
+			winPtr->pathName));
+		Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "TRANSIENT",
+			NULL);
 		return TCL_ERROR;
 	    }
 	    TkpWmSetState(winPtr, IconicState);
@@ -3062,7 +3113,7 @@ WmStateCmd(
 	    TkpWmSetState(winPtr, ZoomState);
 	}
     } else if (wmPtr->iconFor != NULL) {
-	Tcl_SetResult(interp, "icon", TCL_STATIC);
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("icon", -1));
     } else {
 	if (wmPtr->hints.initial_state == NormalState ||
 		wmPtr->hints.initial_state == ZoomState) {
@@ -3071,16 +3122,16 @@ WmStateCmd(
 	}
 	switch (wmPtr->hints.initial_state) {
 	case NormalState:
-	    Tcl_SetResult(interp, "normal", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("normal", -1));
 	    break;
 	case IconicState:
-	    Tcl_SetResult(interp, "iconic", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("iconic", -1));
 	    break;
 	case WithdrawnState:
-	    Tcl_SetResult(interp, "withdrawn", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("withdrawn", -1));
 	    break;
 	case ZoomState:
-	    Tcl_SetResult(interp, "zoomed", TCL_STATIC);
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("zoomed", -1));
 	    break;
 	}
     }
@@ -3120,11 +3171,13 @@ WmTitleCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?newTitle?");
 	return TCL_ERROR;
     }
+
     if (objc == 3) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		wmPtr->titleUid ? wmPtr->titleUid : winPtr->nameUid, -1));
 	return TCL_OK;
     }
+
     argv3 = Tcl_GetStringFromObj(objv[3], &length);
     wmPtr->titleUid = Tk_GetUid(argv3);
     if (!(wmPtr->flags & WM_NEVER_MAPPED) && !Tk_IsEmbedded(winPtr)) {
@@ -3188,9 +3241,10 @@ WmTransientCmd(
 	Tk_MakeWindowExist(master);
 
 	if (wmPtr->iconFor != NULL) {
-	    Tcl_AppendResult(interp, "can't make \"", Tcl_GetString(objv[2]),
-		    "\" a transient: it is an icon for ",
-		    Tk_PathName(wmPtr->iconFor), NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't make \"%s\" a transient: it is an icon for %s",
+		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3198,15 +3252,17 @@ WmTransientCmd(
 
 	/* Under some circumstances, wmPtr2 is NULL here */
 	if (wmPtr2 != NULL && wmPtr2->iconFor != NULL) {
-	    Tcl_AppendResult(interp, "can't make \"", Tcl_GetString(objv[3]),
-		    "\" a master: it is an icon for ",
-		    Tk_PathName(wmPtr2->iconFor), NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't make \"%s\" a master: it is an icon for %s",
+		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 
 	if ((TkWindow *) master == winPtr) {
-	    Tcl_AppendResult(interp, "can't make \"", Tk_PathName(winPtr),
-		    "\" its own master", NULL);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "can't make \"%s\" its own master", Tk_PathName(winPtr)));
+	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3253,9 +3309,12 @@ WmWithdrawCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
+
     if (wmPtr->iconFor != NULL) {
-	Tcl_AppendResult(interp, "can't withdraw ", Tcl_GetString(objv[2]),
-		": it is an icon for ", Tk_PathName(wmPtr->iconFor), NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"can't withdraw %s: it is an icon for %s",
+		Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
+	Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL);
 	return TCL_ERROR;
     }
     TkpWmSetState(winPtr, WithdrawnState);
@@ -3910,7 +3969,9 @@ ParseGeometry(
     return TCL_OK;
 
   error:
-    Tcl_AppendResult(interp, "bad geometry specifier \"", string, "\"", NULL);
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	    "bad geometry specifier \"%s\"", string));
+    Tcl_SetErrorCode(interp, "TK", "VALUE", "GEOMETRY", NULL);
     return TCL_ERROR;
 }
 
@@ -4247,7 +4308,7 @@ UpdateVRootGeometry(
 
     wmPtr->flags &= ~WM_VROOT_OFFSET_STALE;
     if (wmPtr->vRoot == None) {
-	noVRoot:
+    noVRoot:
 	wmPtr->vRootX = wmPtr->vRootY = 0;
 	wmPtr->vRootWidth = DisplayWidth(winPtr->display, winPtr->screenNum);
 	wmPtr->vRootHeight = DisplayHeight(winPtr->display, winPtr->screenNum);
@@ -4978,77 +5039,64 @@ TkUnsupported1ObjCmd(
     };
     Tk_Window tkwin = clientData;
     TkWindow *winPtr;
-    int index;
+    int index, i;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg ...?");
 	return TCL_ERROR;
     }
 
-    /* Iterate through objc/objv to set correct background color and toggle opacity of window. */
-    int i;
-    for (i= 0; i < objc; i++) {
+    /*
+     * Iterate through objc/objv to set correct background color and toggle
+     * opacity of window.
+     */
 
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*black*") == 1) {
-    	    colorName = [NSColor blackColor];  // use #000000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*dark*") == 1) {
+    for (i= 0; i < objc; i++) {
+    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*black*")) {
+    	    colorName = [NSColor blackColor];	// use #000000 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*dark*")) {
     	    colorName = [NSColor darkGrayColor]; //use #545454 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*light*") == 1) {
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*light*")) {
     	    colorName = [NSColor lightGrayColor]; //use #ababab in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*white*")) {
+    	    colorName = [NSColor whiteColor];	//use #ffffff in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "gray*")) {
+    	    colorName = [NSColor grayColor];	//use #7f7f7f in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*red*")) {
+    	    colorName = [NSColor redColor];	//use #ff0000 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*green*")) {
+    	    colorName = [NSColor greenColor];	//use #00ff00 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*blue*")) {
+    	    colorName = [NSColor blueColor];	//use #0000ff in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*cyan*")) {
+    	    colorName = [NSColor cyanColor];	//use #00ffff in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*yellow*")) {
+    	    colorName = [NSColor yellowColor];	//use #ffff00 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*magenta*")) {
+    	    colorName = [NSColor magentaColor];	//use #ff00ff in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*orange*")) {
+    	    colorName = [NSColor orangeColor];	//use #ff8000 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*purple*")) {
+    	    colorName = [NSColor purpleColor];	//use #800080 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*brown*")){
+    	    colorName = [NSColor brownColor];	//use #996633 in Tk scripts to match
+    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*clear*")) {
+    	    colorName = [NSColor clearColor];	//use systemTransparent in Tk scripts to match
     	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*white*") == 1) {
-    	    colorName = [NSColor whiteColor]; //use #ffffff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "gray*") == 1) {
-    	    colorName = [NSColor grayColor]; //use  #7f7f7f in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*red*") == 1) {
-    	    colorName = [NSColor redColor]; //use #ff0000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*green*") == 1) {
-    	    colorName = [NSColor greenColor]; //use #00ff00 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*blue*") == 1) {
-    	    colorName = [NSColor blueColor]; //use #0000ff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*cyan*") == 1) {
-    	    colorName = [NSColor cyanColor]; //use  #00ffff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*yellow*") == 1) {
-    	    colorName = [NSColor yellowColor]; //use  #ffff00 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*magenta*") == 1) {
-    	    colorName = [NSColor magentaColor]; //use #ff00ff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*orange*") == 1) {
-    	    colorName = [NSColor orangeColor]; //use  #ff8000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*purple*") == 1) {
-    	    colorName = [NSColor purpleColor]; //use  #800080 in Tk scripts to match
-    	}
-    	if  (Tcl_StringMatch(Tcl_GetString(objv[i]), "*brown*") == 1){
-    	    colorName = [NSColor brownColor]; //use #996633 in Tk scripts to match
-    	}
-    	if  (Tcl_StringMatch(Tcl_GetString(objv[i]), "*clear*") == 1) {
-    	    colorName = [NSColor clearColor]; //use systemTransparent in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*") == 1) {
-    	    opaqueTag=@"YES";
+    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*")) {
+    	    opaqueTag = @"YES";
     	}
     }
 
-  
     winPtr = (TkWindow *)
 	    Tk_NameToWindow(interp, Tcl_GetString(objv[2]), tkwin);
     if (winPtr == NULL) {
 	return TCL_ERROR;
     }
     if (!(winPtr->flags & TK_TOP_LEVEL)) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, "window \"", winPtr->pathName,
-		"\" isn't a top-level window", NULL);
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"window \"%s\" isn't a top-level window", winPtr->pathName));
+	Tcl_SetErrorCode(interp, "TK", "WINDOWSTYLE", "TOPLEVEL", NULL);
 	return TCL_ERROR;
     }
 
@@ -5123,7 +5171,10 @@ WmWinStyle(
 	{ NULL }
     };
 
-    /* Map window attributes. Color and opacity are mapped to NULL; these are parsed from the objv in TkUnsupported1ObjCmd.*/
+    /*
+     * Map window attributes. Color and opacity are mapped to NULL; these are
+     * parsed from the objv in TkUnsupported1ObjCmd.
+     */
 
     static const struct StrIntMap attrMap[] = {
 	{ "closeBox",		kWindowCloseBoxAttribute		     },
@@ -5154,21 +5205,21 @@ WmWinStyle(
 	{ "moveToActiveSpace",	tkMoveToActiveSpaceAttribute		     },
 	{ "nonActivating",	tkNonactivatingPanelAttribute		     },
 	{ "hud",		tkHUDWindowAttribute			     },
-	{ "black",		NULL			                     },
-	{ "dark",		NULL			                     },
-	{ "light",		NULL			                     },
-	{ "gray",		NULL			                     },
-	{ "red",		NULL 			                     },
-	{ "green",		NULL                			     },
-	{ "blue",		NULL           			             },
-	{ "cyan",		NULL			                     },
-	{ "yellow",		NULL			                     },
-	{ "magenta",		NULL  			                     },
-	{ "orange",		NULL 			                     },
-	{ "purple",		NULL			                     },
-	{ "brown",		NULL			                     },
-	{ "clear",		NULL			                     },
-	{ "opacity",		NULL			                     },
+	{ "black",		0			                     },
+	{ "dark",		0			                     },
+	{ "light",		0			                     },
+	{ "gray",		0			                     },
+	{ "red",		0 			                     },
+	{ "green",		0                			     },
+	{ "blue",		0           			             },
+	{ "cyan",		0			                     },
+	{ "yellow",		0			                     },
+	{ "magenta",		0  			                     },
+	{ "orange",		0 			                     },
+	{ "purple",		0			                     },
+	{ "brown",		0			                     },
+	{ "clear",		0			                     },
+	{ "opacity",		0			                     },
 	{ NULL }
     };
 
@@ -5196,7 +5247,7 @@ WmWinStyle(
 	    UInt64 intValue = compositeAttrMap[i].intValue;
 
 	    if (intValue && (attributes & intValue) == intValue) {
-		Tcl_ListObjAppendElement(interp, attributeList,
+		Tcl_ListObjAppendElement(NULL, attributeList,
 			Tcl_NewStringObj(compositeAttrMap[i].strValue,
 			-1));
 		attributes &= ~intValue;
@@ -5205,11 +5256,11 @@ WmWinStyle(
 	}
 	for (i = 0; attrMap[i].strValue != NULL; i++) {
 	    if (attributes & attrMap[i].intValue) {
-		Tcl_ListObjAppendElement(interp, attributeList,
+		Tcl_ListObjAppendElement(NULL, attributeList,
 			Tcl_NewStringObj(attrMap[i].strValue, -1));
 	    }
 	}
-	Tcl_ListObjAppendElement(interp, newResult, attributeList);
+	Tcl_ListObjAppendElement(NULL, newResult, attributeList);
 	Tcl_SetObjResult(interp, newResult);
     } else {
 	int attrObjc;
@@ -5422,7 +5473,7 @@ TkMacOSXMakeRealWindowExist(
     /* Set background color and opacity of window if those flags are set.  */
     if (colorName != NULL) {
     	[window setBackgroundColor: colorName];
-    	 }
+    }
 
     if (opaqueTag != NULL) {
     	[window setOpaque: opaqueTag];
@@ -6281,10 +6332,11 @@ TkMacOSXMakeFullscreen(
 	if ((wmPtr->maxWidth > 0 && wmPtr->maxWidth < screenWidth)
 		|| (wmPtr->maxHeight > 0 && wmPtr->maxHeight < screenHeight)) {
 	    if (interp) {
-		Tcl_AppendResult(interp,
-			"can't set fullscreen attribute for \"",
-			winPtr->pathName,
-			"\": max width/height is too small", NULL);
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"can't set fullscreen attribute for \"%s\": max"
+			" width/height is too small", winPtr->pathName));
+		Tcl_SetErrorCode(interp, "TK", "FULLSCREEN",
+			"CONSTRAINT_FAILURE", NULL);
 	    }
 	    result = TCL_ERROR;
 	    wmPtr->flags &= ~WM_FULLSCREEN;
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index bfc7fac..d98010f 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -6,8 +6,8 @@
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #ifndef _TKMACWM
@@ -17,25 +17,23 @@
 #include "tkMenu.h"
 
 /*
- * A data structure of the following type holds information for
- * each window manager protocol (such as WM_DELETE_WINDOW) for
- * which a handler (i.e. a Tcl command) has been defined for a
- * particular top-level window.
+ * A data structure of the following type holds information for each window
+ * manager protocol (such as WM_DELETE_WINDOW) for which a handler (i.e. a Tcl
+ * command) has been defined for a particular top-level window.
  */
 
 typedef struct ProtocolHandler {
     Atom protocol;		/* Identifies the protocol. */
     struct ProtocolHandler *nextPtr;
-				/* Next in list of protocol handlers for
-				 * the same top-level window, or NULL for
-				 * end of list. */
+				/* Next in list of protocol handlers for the
+				 * same top-level window, or NULL for end of
+				 * list. */
     Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
-    char command[4];		/* Tcl command to invoke when a client
-				 * message for this protocol arrives.
-				 * The actual size of the structure varies
-				 * to accommodate the needs of the actual
-				 * command. THIS MUST BE THE LAST FIELD OF
-				 * THE STRUCTURE. */
+    char command[4];		/* Tcl command to invoke when a client message
+				 * for this protocol arrives. The actual size
+				 * of the structure varies to accommodate the
+				 * needs of the actual command. THIS MUST BE
+				 * THE LAST FIELD OF THE STRUCTURE. */
 } ProtocolHandler;
 
 #define HANDLER_SIZE(cmdLength) \
@@ -47,84 +45,80 @@ typedef struct ProtocolHandler {
  */
 
 typedef struct TkWmInfo {
-    TkWindow *winPtr;		/* Pointer to main Tk information for
-				 * this window. */
+    TkWindow *winPtr;		/* Pointer to main Tk information for this
+				 * window. */
     Window reparent;		/* If the window has been reparented, this
 				 * gives the ID of the ancestor of the window
-				 * that is a child of the root window (may
-				 * not be window's immediate parent). If
-				 * the window isn't reparented, this has the
-				 * value None. */
-    Tk_Uid titleUid;		/* Title to display in window caption. If
-				 * NULL, use name of widget. */
+				 * that is a child of the root window (may not
+				 * be window's immediate parent). If the window
+				 * isn't reparented, this has the value
+				 * None. */
+    Tk_Uid titleUid;		/* Title to display in window caption. If NULL,
+				 * use name of widget. */
     char *iconName;		/* Name to display in icon. */
-    Window master;		/* Master window for TRANSIENT_FOR property,
-				 * or None. */
-    XWMHints hints;		/* Various pieces of information for
-				 * window manager. */
+    Window master;		/* Master window for TRANSIENT_FOR property, or
+				 * None. */
+    XWMHints hints;		/* Various pieces of information for window
+				 * manager. */
     char *leaderName;		/* Path name of leader of window group
 				 * (corresponds to hints.window_group).
-				 * Malloc-ed. Note:  this field doesn't
-				 * get updated if leader is destroyed. */
-    char *masterWindowName;	/* Path name of window specified as master
-				 * in "wm transient" command, or NULL.
-				 * Malloc-ed. Note:  this field doesn't
-				 * get updated if masterWindowName is
-				 * destroyed. */
-    Tk_Window icon;		/* Window to use as icon for this window,
-				 * or NULL. */
+				 * Malloc-ed. Note: this field doesn't get
+				 * updated if leader is destroyed. */
+    char *masterWindowName;	/* Path name of window specified as master in
+				 * "wm transient" command, or NULL. Malloc-ed.
+				 * Note: this field doesn't get updated if
+				 * masterWindowName is destroyed. */
+    Tk_Window icon;		/* Window to use as icon for this window, or
+				 * NULL. */
     Tk_Window iconFor;		/* Window for which this window is icon, or
 				 * NULL if this isn't an icon for anyone. */
 
     /*
-     * Information used to construct an XSizeHints structure for
-     * the window manager:
+     * Information used to construct an XSizeHints structure for the window
+     * manager:
      */
 
-    int sizeHintsFlags;		/* Flags word for XSizeHints structure.
-				 * If the PBaseSize flag is set then the
-				 * window is gridded; otherwise it isn't
-				 * gridded. */
-    int minWidth, minHeight;	/* Minimum dimensions of window, in
-				 * grid units, not pixels. */
-    int maxWidth, maxHeight;	/* Maximum dimensions of window, in
-				 * grid units, not pixels. */
-    Tk_Window gridWin;		/* Identifies the window that controls
-				 * gridding for this top-level, or NULL if
-				 * the top-level isn't currently gridded. */
-    int widthInc, heightInc;	/* Increments for size changes (# pixels
-				 * per step). */
+    int sizeHintsFlags;		/* Flags word for XSizeHints structure. If the
+				 * PBaseSize flag is set then the window is
+				 * gridded; otherwise it isn't gridded. */
+    int minWidth, minHeight;	/* Minimum dimensions of window, in grid units,
+				 * not pixels. */
+    int maxWidth, maxHeight;	/* Maximum dimensions of window, in grid units,
+				 * not pixels. */
+    Tk_Window gridWin;		/* Identifies the window that controls gridding
+				 * for this top-level, or NULL if the top-level
+				 * isn't currently gridded. */
+    int widthInc, heightInc;	/* Increments for size changes (# pixels per
+				 * step). */
     struct {
 	int x;			/* numerator */
 	int y;			/* denominator */
     } minAspect, maxAspect;	/* Min/max aspect ratios for window. */
     int reqGridWidth, reqGridHeight;
-				/* The dimensions of the window (in
-				 * grid units) requested through
-				 * the geometry manager. */
+				/* The dimensions of the window (in grid units)
+				 * requested through the geometry manager. */
     int gravity;		/* Desired window gravity. */
 
     /*
      * Information used to manage the size and location of a window.
      */
 
-    int width, height;		/* Desired dimensions of window, specified
-				 * in grid units. These values are
-				 * set by the "wm geometry" command and by
-				 * ConfigureNotify events (for when wm
-				 * resizes window). -1 means user hasn't
-				 * requested dimensions. */
+    int width, height;		/* Desired dimensions of window, specified in
+				 * grid units. These values are set by the "wm
+				 * geometry" command and by ConfigureNotify
+				 * events (for when wm resizes window). -1
+				 * means user hasn't requested dimensions. */
     int x, y;			/* Desired X and Y coordinates for window.
-				 * These values are set by "wm geometry",
-				 * plus by ConfigureNotify events (when wm
-				 * moves window). These numbers are
-				 * different than the numbers stored in
-				 * winPtr->changes because (a) they could be
-				 * measured from the right or bottom edge
-				 * of the screen (see WM_NEGATIVE_X and
-				 * WM_NEGATIVE_Y flags) and (b) if the window
-				 * has been reparented then they refer to the
-				 * parent rather than the window itself. */
+				 * These values are set by "wm geometry", plus
+				 * by ConfigureNotify events (when wm moves
+				 * window). These numbers are different than
+				 * the numbers stored in winPtr->changes
+				 * because (a) they could be measured from the
+				 * right or bottom edge of the screen (see
+				 * WM_NEGATIVE_X and WM_NEGATIVE_Y flags) and
+				 * (b) if the window has been reparented then
+				 * they refer to the parent rather than the
+				 * window itself. */
     int parentWidth, parentHeight;
 				/* Width and height of reparent, in pixels
 				 * *including border*. If window hasn't been
@@ -140,29 +134,29 @@ typedef struct TkWmInfo {
 				 * switched into fullscreen state, */
     int configWidth, configHeight;
 				/* Dimensions passed to last request that we
-				 * issued to change geometry of window. Used
-				 * to eliminate redundant resize operations. */
+				 * issued to change geometry of window. Used to
+				 * eliminate redundant resize operations. */
 
     /*
-     * Information about the virtual root window for this top-level,
-     * if there is one.
+     * Information about the virtual root window for this top-level, if there
+     * is one.
      */
 
-    Window vRoot;		/* Virtual root window for this top-level,
-				 * or None if there is no virtual root
-				 * window (i.e. just use the screen's root). */
-    int vRootX, vRootY;		/* Position of the virtual root inside the
-				 * root window. If the WM_VROOT_OFFSET_STALE
-				 * flag is set then this information may be
-				 * incorrect and needs to be refreshed from
-				 * the X server. If vRoot is None then these
-				 * values are both 0. */
+    Window vRoot;		/* Virtual root window for this top-level, or
+				 * None if there is no virtual root window
+				 * (i.e. just use the screen's root). */
+    int vRootX, vRootY;		/* Position of the virtual root inside the root
+				 * window. If the WM_VROOT_OFFSET_STALE flag is
+				 * set then this information may be incorrect
+				 * and needs to be refreshed from the OS. If
+				 * vRoot is None then these values are both
+				 * 0. */
     unsigned int vRootWidth, vRootHeight;
-				/* Dimensions of the virtual root window.
-				 * If vRoot is None, gives the dimensions
-				 * of the containing screen. This information
-				 * is never stale, even though vRootX and
-				 * vRootY can be. */
+				/* Dimensions of the virtual root window. If
+				 * vRoot is None, gives the dimensions of the
+				 * containing screen. This information is never
+				 * stale, even though vRootX and vRootY can
+				 * be. */
 
     /*
      * List of children of the toplevel which have private colormaps.
@@ -175,11 +169,10 @@ typedef struct TkWmInfo {
      * Miscellaneous information.
      */
 
-    ProtocolHandler *protPtr;	/* First in list of protocol handlers for
-				 * this window (NULL means none). */
-    int cmdArgc;		/* Number of elements in cmdArgv below. */
-    const char **cmdArgv;		/* Array of strings to store in the
-				 * WM_COMMAND property. NULL means nothing
+    ProtocolHandler *protPtr;	/* First in list of protocol handlers for this
+				 * window (NULL means none). */
+    Tcl_Obj *commandObj;	/* The command (guaranteed to be a list) for
+				 * the WM_COMMAND property. NULL means nothing
 				 * available. */
     char *clientMachine;	/* String to store in WM_CLIENT_MACHINE
 				 * property, or NULL. */
@@ -188,6 +181,7 @@ typedef struct TkWmInfo {
     /*
      * Macintosh information.
      */
+
     WindowClass macClass;
     UInt64 attributes, configAttributes;
     TkWindow *scrollWinPtr;	/* Ptr to scrollbar handling grow widget. */
@@ -195,19 +189,18 @@ typedef struct TkWmInfo {
     NSWindow *window;
 } WmInfo;
 
-
 /*
  * Flag values for WmInfo structures:
  *
- * WM_NEVER_MAPPED -		non-zero means window has never been
- *				mapped; need to update all info when
- *				window is first mapped.
+ * WM_NEVER_MAPPED -		non-zero means window has never been mapped;
+ *				need to update all info when window is first
+ *				mapped.
  * WM_UPDATE_PENDING -		non-zero means a call to UpdateGeometryInfo
- *				has already been scheduled for this
- *				window; no need to schedule another one.
+ *				has already been scheduled for this window; no
+ *				need to schedule another one.
  * WM_NEGATIVE_X -		non-zero means x-coordinate is measured in
- *				pixels from right edge of screen, rather
- *				than from left edge.
+ *				pixels from right edge of screen, rather than
+ *				from left edge.
  * WM_NEGATIVE_Y -		non-zero means y-coordinate is measured in
  *				pixels up from bottom of screen, rather than
  *				down from top.
@@ -218,27 +211,24 @@ typedef struct TkWmInfo {
  * WM_VROOT_OFFSET_STALE -	non-zero means that (x,y) offset information
  *				about the virtual root window is stale and
  *				needs to be fetched fresh from the X server.
- * WM_ABOUT_TO_MAP -		non-zero means that the window is about to
- *				be mapped by TkWmMapWindow. This is used
- *				by UpdateGeometryInfo to modify its behavior.
- * WM_MOVE_PENDING -		non-zero means the application has requested
- *				a new position for the window, but it hasn't
- *				been reflected through the window manager
- *				yet.
- * WM_COLORMAPS_EXPLICIT -	non-zero means the colormap windows were
- *				set explicitly via "wm colormapwindows".
+ * WM_ABOUT_TO_MAP -		non-zero means that the window is about to be
+ *				mapped by TkWmMapWindow. This is used by
+ *				UpdateGeometryInfo to modify its behavior.
+ * WM_MOVE_PENDING -		non-zero means the application has requested a
+ *				new position for the window, but it hasn't
+ *				been reflected through the window manager yet.
+ * WM_COLORMAPS_EXPLICIT -	non-zero means the colormap windows were set
+ *				explicitly via "wm colormapwindows".
  * WM_ADDED_TOPLEVEL_COLORMAP - non-zero means that when "wm colormapwindows"
  *				was called the top-level itself wasn't
- *				specified, so we added it implicitly at
- *				the end of the list.
+ *				specified, so we added it implicitly at the
+ *				end of the list.
  * WM_WIDTH_NOT_RESIZABLE -	non-zero means that we're not supposed to
  *				allow the user to change the width of the
- *				window (controlled by "wm resizable"
- *				command).
+ *				window (controlled by "wm resizable" command).
  * WM_HEIGHT_NOT_RESIZABLE -	non-zero means that we're not supposed to
  *				allow the user to change the height of the
- *				window (controlled by "wm resizable"
- *				command).
+ *				window (controlled by "wm resizable" command).
  */
 
 #define WM_NEVER_MAPPED			0x0001
@@ -258,5 +248,13 @@ typedef struct TkWmInfo {
 #define WM_FULLSCREEN			0x4000
 #define WM_TRANSPARENT			0x8000
 
-#endif
-
+#endif /* _TKMACWM */
+
+/*
+ * Local Variables:
+ * mode: objc
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */