Get rid of pre-C89-isms (esp. CONST vs const).

1 files changed, 94 insertions, 83 deletions

diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 372cbda..1a751ed 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.31 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.32 2008/04/27 22:38:56 dkf Exp $
  */
 
 #include "default.h"
@@ -290,7 +290,7 @@ static char *classNames[] = {"Frame", "Toplevel", "Labelframe"};
  * class of widgets.
  */
 
-static const Tk_OptionSpec * const optionSpecs[] = {
+static const Tk_OptionSpec *const optionSpecs[] = {
     frameOptSpec,
     toplevelOptSpec,
     labelframeOptSpec,
@@ -302,9 +302,9 @@ static const Tk_OptionSpec * const optionSpecs[] = {
 
 static void		ComputeFrameGeometry(Frame *framePtr);
 static int		ConfigureFrame(Tcl_Interp *interp, Frame *framePtr,
-			    int objc, Tcl_Obj *CONST objv[]);
+			    int objc, Tcl_Obj *const objv[]);
 static int		CreateFrame(ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST argv[],
+			    int objc, Tcl_Obj *const argv[],
 			    enum FrameType type, char *appName);
 static void		DestroyFrame(char *memPtr);
 static void		DestroyFramePartly(Frame *framePtr);
@@ -320,7 +320,7 @@ static void		FrameStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static int		FrameWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]);
+			    Tcl_Obj *const objv[]);
 static void		FrameWorldChanged(ClientData instanceData);
 static void		MapFrame(ClientData clientData);
 
@@ -369,7 +369,7 @@ Tk_FrameObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     return CreateFrame(clientData, interp, objc, objv, TYPE_FRAME, NULL);
 }
@@ -379,7 +379,7 @@ Tk_ToplevelObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     return CreateFrame(clientData, interp, objc, objv, TYPE_TOPLEVEL, NULL);
 }
@@ -389,7 +389,7 @@ Tk_LabelframeObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     return CreateFrame(clientData, interp, objc, objv, TYPE_LABELFRAME, NULL);
 }
@@ -448,7 +448,7 @@ CreateFrame(
     ClientData clientData,	/* NULL. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[],	/* Argument objects. */
+    Tcl_Obj *const objv[],	/* Argument objects. */
     enum FrameType type,	/* What widget type to create. */
     char *appName)		/* Should only be non-NULL if there are no
 				 * Main window associated with the
@@ -459,7 +459,8 @@ CreateFrame(
     Frame *framePtr;
     Tk_OptionTable optionTable;
     Tk_Window newWin;
-    CONST char *className, *screenName, *visualName, *colormapName, *arg, *useOption;
+    const char *className, *screenName, *visualName, *colormapName;
+    const char *arg, *useOption;
     int i, c, length, depth;
     unsigned int mask;
     Colormap colormap;
@@ -614,17 +615,17 @@ CreateFrame(
 
     if (type == TYPE_LABELFRAME) {
 	framePtr = (Frame *) ckalloc(sizeof(Labelframe));
-	memset((void *) framePtr, 0, (sizeof(Labelframe)));
+	memset(framePtr, 0, sizeof(Labelframe));
     } else {
 	framePtr = (Frame *) ckalloc(sizeof(Frame));
-	memset((void *) framePtr, 0, (sizeof(Frame)));
+	memset(framePtr, 0, sizeof(Frame));
     }
     framePtr->tkwin		= newWin;
     framePtr->display		= Tk_Display(newWin);
     framePtr->interp		= interp;
     framePtr->widgetCmd		= Tcl_CreateObjCommand(interp,
-	    Tk_PathName(newWin), FrameWidgetObjCmd,
-	    (ClientData) framePtr, FrameCmdDeletedProc);
+	    Tk_PathName(newWin), FrameWidgetObjCmd, framePtr,
+	    FrameCmdDeletedProc);
     framePtr->optionTable = optionTable;
     framePtr->type = type;
     framePtr->colormap = colormap;
@@ -633,6 +634,7 @@ CreateFrame(
 
     if (framePtr->type == TYPE_LABELFRAME) {
 	Labelframe *labelframePtr = (Labelframe *) framePtr;
+
 	labelframePtr->labelAnchor = LABELANCHOR_NW;
 	labelframePtr->textGC = None;
     }
@@ -641,13 +643,13 @@ CreateFrame(
      * Store backreference to frame widget in window structure.
      */
 
-    Tk_SetClassProcs(newWin, &frameClass, (ClientData) framePtr);
+    Tk_SetClassProcs(newWin, &frameClass, framePtr);
 
     mask = ExposureMask | StructureNotifyMask | FocusChangeMask;
     if (type == TYPE_TOPLEVEL) {
 	mask |= ActivateMask;
     }
-    Tk_CreateEventHandler(newWin, mask, FrameEventProc, (ClientData) framePtr);
+    Tk_CreateEventHandler(newWin, mask, FrameEventProc, framePtr);
     if ((Tk_InitOptions(interp, (char *) framePtr, optionTable, newWin)
 	    != TCL_OK) ||
 	    (ConfigureFrame(interp, framePtr, objc-2, objv+2) != TCL_OK)) {
@@ -663,7 +665,7 @@ CreateFrame(
 	}
     }
     if (type == TYPE_TOPLEVEL) {
-	Tcl_DoWhenIdle(MapFrame, (ClientData) framePtr);
+	Tcl_DoWhenIdle(MapFrame, framePtr);
     }
     Tcl_SetResult(interp, Tk_PathName(newWin), TCL_STATIC);
     return TCL_OK;
@@ -698,15 +700,15 @@ FrameWidgetObjCmd(
     ClientData clientData,	/* Information about frame widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument objects. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    static CONST char *frameOptions[] = {
+    static const char *frameOptions[] = {
 	"cget", "configure", NULL
     };
     enum options {
 	FRAME_CGET, FRAME_CONFIGURE
     };
-    register Frame *framePtr = (Frame *) clientData;
+    register Frame *framePtr = clientData;
     int result = TCL_OK, index;
     int c, i, length;
     Tcl_Obj *objPtr;
@@ -719,7 +721,7 @@ FrameWidgetObjCmd(
 	    &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    Tcl_Preserve((ClientData) framePtr);
+    Tcl_Preserve(framePtr);
     switch ((enum options) index) {
     case FRAME_CGET:
 	if (objc != 3) {
@@ -732,22 +734,19 @@ FrameWidgetObjCmd(
 	if (objPtr == NULL) {
 	    result = TCL_ERROR;
 	    goto done;
-	} else {
-	    Tcl_SetObjResult(interp, objPtr);
 	}
+	Tcl_SetObjResult(interp, objPtr);
 	break;
     case FRAME_CONFIGURE:
 	if (objc <= 3) {
 	    objPtr = Tk_GetOptionInfo(interp, (char *) framePtr,
-		    framePtr->optionTable,
-		    (objc == 3) ? objv[2] : NULL,
+		    framePtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    framePtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		goto done;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
 	    }
+	    Tcl_SetObjResult(interp, objPtr);
 	} else {
 	    /*
 	     * Don't allow the options -class, -colormap, -container, -screen,
@@ -773,9 +772,9 @@ FrameWidgetObjCmd(
 		    || ((c == 'v')
 			&& (strncmp(arg, "-visual", (unsigned)length) == 0))) {
 
-		    #ifdef SUPPORT_CONFIG_EMBEDDED
+#ifdef SUPPORT_CONFIG_EMBEDDED
 		    if (c == 'u') {
-			CONST char *string = Tcl_GetString(objv[i+1]);
+			const char *string = Tcl_GetString(objv[i+1]);
 			if (TkpUseWindow(interp, framePtr->tkwin,
 				string) != TCL_OK) {
 			    result = TCL_ERROR;
@@ -787,12 +786,12 @@ FrameWidgetObjCmd(
 			result = TCL_ERROR;
 			goto done;
 		    }
-		    #else
+#else
 			Tcl_AppendResult(interp, "can't modify ", arg,
 				" option after widget is created", NULL);
 			result = TCL_ERROR;
 			goto done;
-		    #endif
+#endif
 		}
 	    }
 	    result = ConfigureFrame(interp, framePtr, objc-2, objv+2);
@@ -801,7 +800,7 @@ FrameWidgetObjCmd(
     }
 
   done:
-    Tcl_Release((ClientData) framePtr);
+    Tcl_Release(framePtr);
     return result;
 }
 
@@ -868,8 +867,8 @@ DestroyFramePartly(
 
     if (framePtr->type == TYPE_LABELFRAME && labelframePtr->labelWin != NULL) {
 	Tk_DeleteEventHandler(labelframePtr->labelWin, StructureNotifyMask,
-		FrameStructureProc, (ClientData) framePtr);
-	Tk_ManageGeometry(labelframePtr->labelWin, NULL, (ClientData) NULL);
+		FrameStructureProc, framePtr);
+	Tk_ManageGeometry(labelframePtr->labelWin, NULL, NULL);
 	if (framePtr->tkwin != Tk_Parent(labelframePtr->labelWin)) {
 	    Tk_UnmaintainGeometry(labelframePtr->labelWin, framePtr->tkwin);
 	}
@@ -907,7 +906,7 @@ ConfigureFrame(
     register Frame *framePtr,	/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of valid entries in objv. */
-    Tcl_Obj *CONST objv[])	/* Arguments. */
+    Tcl_Obj *const objv[])	/* Arguments. */
 {
     Tk_SavedOptions savedOptions;
     char *oldMenuName;
@@ -947,7 +946,7 @@ ConfigureFrame(
 	    || ((oldMenuName != NULL) && (framePtr->menuName == NULL))
 	    || ((oldMenuName != NULL) && (framePtr->menuName != NULL)
 	    && strcmp(oldMenuName, framePtr->menuName) != 0))
-	&& framePtr->type == TYPE_TOPLEVEL) {
+	    && framePtr->type == TYPE_TOPLEVEL) {
 	TkSetWindowMenuBar(interp, framePtr->tkwin, oldMenuName,
 		framePtr->menuName);
     }
@@ -981,7 +980,7 @@ ConfigureFrame(
 	if (oldWindow != labelframePtr->labelWin) {
 	    if (oldWindow != NULL) {
 		Tk_DeleteEventHandler(oldWindow, StructureNotifyMask,
-			FrameStructureProc, (ClientData) framePtr);
+			FrameStructureProc, framePtr);
 		Tk_ManageGeometry(oldWindow, NULL, (ClientData) NULL);
 		Tk_UnmaintainGeometry(oldWindow, framePtr->tkwin);
 		Tk_UnmapWindow(oldWindow);
@@ -1003,7 +1002,7 @@ ConfigureFrame(
 		    }
 		    sibling = ancestor;
 		    if (Tk_IsTopLevel(ancestor)) {
-			badWindow:
+		    badWindow:
 			Tcl_AppendResult(interp, "can't use ",
 				Tk_PathName(labelframePtr->labelWin),
 				" as label in this frame", NULL);
@@ -1018,10 +1017,9 @@ ConfigureFrame(
 		    goto badWindow;
 		}
 		Tk_CreateEventHandler(labelframePtr->labelWin,
-			StructureNotifyMask, FrameStructureProc,
-			(ClientData) framePtr);
+			StructureNotifyMask, FrameStructureProc, framePtr);
 		Tk_ManageGeometry(labelframePtr->labelWin, &frameGeomType,
-			(ClientData) framePtr);
+			framePtr);
 
 		/*
 		 * If the frame is not parent to the label, make sure the
@@ -1035,8 +1033,7 @@ ConfigureFrame(
 	}
     }
 
-    FrameWorldChanged((ClientData) framePtr);
-
+    FrameWorldChanged(framePtr);
     return TCL_OK;
 }
 
@@ -1062,8 +1059,8 @@ static void
 FrameWorldChanged(
     ClientData instanceData)	/* Information about widget. */
 {
-    Frame *framePtr = (Frame *) instanceData;
-    Labelframe *labelframePtr = (Labelframe *) framePtr;
+    Frame *framePtr = instanceData;
+    Labelframe *labelframePtr = instanceData;
     Tk_Window tkwin = framePtr->tkwin;
     XGCValues gcValues;
     GC gc;
@@ -1102,14 +1099,17 @@ FrameWorldChanged(
 	if (anyTextLabel) {
 	    labelText = Tcl_GetString(labelframePtr->textPtr);
 	    Tk_FreeTextLayout(labelframePtr->textLayout);
-	    labelframePtr->textLayout = Tk_ComputeTextLayout(labelframePtr->tkfont,
+	    labelframePtr->textLayout =
+		    Tk_ComputeTextLayout(labelframePtr->tkfont,
 		    labelText, -1, 0, TK_JUSTIFY_CENTER, 0,
-		    &labelframePtr->labelReqWidth, &labelframePtr->labelReqHeight);
+		    &labelframePtr->labelReqWidth,
+		    &labelframePtr->labelReqHeight);
 	    labelframePtr->labelReqWidth += 2 * LABELSPACING;
 	    labelframePtr->labelReqHeight += 2 * LABELSPACING;
 	} else if (anyWindowLabel) {
 	    labelframePtr->labelReqWidth = Tk_ReqWidth(labelframePtr->labelWin);
-	    labelframePtr->labelReqHeight = Tk_ReqHeight(labelframePtr->labelWin);
+	    labelframePtr->labelReqHeight =
+		    Tk_ReqHeight(labelframePtr->labelWin);
 	}
 
 	/*
@@ -1202,7 +1202,7 @@ FrameWorldChanged(
 
     if (Tk_IsMapped(tkwin)) {
 	if (!(framePtr->flags & REDRAW_PENDING)) {
-	    Tcl_DoWhenIdle(DisplayFrame, (ClientData) framePtr);
+	    Tcl_DoWhenIdle(DisplayFrame, framePtr);
 	}
 	framePtr->flags |= REDRAW_PENDING;
     }
@@ -1239,7 +1239,9 @@ ComputeFrameGeometry(
      * We have nothing to do here unless there is a label.
      */
 
-    if (framePtr->type != TYPE_LABELFRAME) return;
+    if (framePtr->type != TYPE_LABELFRAME) {
+	return;
+    }
     if (labelframePtr->textPtr == NULL && labelframePtr->labelWin == NULL) {
 	return;
     }
@@ -1371,7 +1373,7 @@ static void
 DisplayFrame(
     ClientData clientData)	/* Information about widget. */
 {
-    register Frame *framePtr = (Frame *) clientData;
+    register Frame *framePtr = clientData;
     register Tk_Window tkwin = framePtr->tkwin;
     int bdX1, bdY1, bdX2, bdY2, hlWidth;
     Pixmap pixmap;
@@ -1408,7 +1410,9 @@ DisplayFrame(
      * If -background is set to "", no interior is drawn.
      */
 
-    if (framePtr->border == NULL) return;
+    if (framePtr->border == NULL) {
+	return;
+    }
 
     if (framePtr->type != TYPE_LABELFRAME) {
 	/*
@@ -1539,7 +1543,8 @@ DisplayFrame(
 			|| (labelframePtr->labelBox.height !=
 				Tk_Height(labelframePtr->labelWin))) {
 		    Tk_MoveResizeWindow(labelframePtr->labelWin,
-			    labelframePtr->labelBox.x, labelframePtr->labelBox.y,
+			    labelframePtr->labelBox.x,
+			    labelframePtr->labelBox.y,
 			    labelframePtr->labelBox.width,
 			    labelframePtr->labelBox.height);
 		}
@@ -1552,7 +1557,6 @@ DisplayFrame(
 	    }
 	}
 
-
 #ifndef TK_NO_DOUBLE_BUFFERING
 	/*
 	 * Everything's been redisplayed; now copy the pixmap onto the screen
@@ -1594,7 +1598,7 @@ FrameEventProc(
     ClientData clientData,	/* Information about window. */
     register XEvent *eventPtr)	/* Information about event. */
 {
-    register Frame *framePtr = (Frame *) clientData;
+    register Frame *framePtr = clientData;
 
     if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) {
 	goto redraw;
@@ -1628,15 +1632,15 @@ FrameEventProc(
 
 	    Tk_DeleteEventHandler(framePtr->tkwin,
 		    ExposureMask|StructureNotifyMask|FocusChangeMask,
-		    FrameEventProc, (ClientData) framePtr);
+		    FrameEventProc, framePtr);
 	    framePtr->tkwin = NULL;
 	    Tcl_DeleteCommandFromToken(framePtr->interp, framePtr->widgetCmd);
 	}
 	if (framePtr->flags & REDRAW_PENDING) {
-	    Tcl_CancelIdleCall(DisplayFrame, (ClientData) framePtr);
+	    Tcl_CancelIdleCall(DisplayFrame, framePtr);
 	}
-	Tcl_CancelIdleCall(MapFrame, (ClientData) framePtr);
-	Tcl_EventuallyFree((ClientData) framePtr, DestroyFrame);
+	Tcl_CancelIdleCall(MapFrame, framePtr);
+	Tcl_EventuallyFree(framePtr, DestroyFrame);
     } else if (eventPtr->type == FocusIn) {
 	if (eventPtr->xfocus.detail != NotifyInferior) {
 	    framePtr->flags |= GOT_FOCUS;
@@ -1659,7 +1663,7 @@ FrameEventProc(
 
   redraw:
     if ((framePtr->tkwin != NULL) && !(framePtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(DisplayFrame, (ClientData) framePtr);
+	Tcl_DoWhenIdle(DisplayFrame, framePtr);
 	framePtr->flags |= REDRAW_PENDING;
     }
 }
@@ -1686,7 +1690,7 @@ static void
 FrameCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    Frame *framePtr = (Frame *) clientData;
+    Frame *framePtr = clientData;
     Tk_Window tkwin = framePtr->tkwin;
 
     if (framePtr->menuName != NULL) {
@@ -1737,7 +1741,7 @@ static void
 MapFrame(
     ClientData clientData)		/* Pointer to frame structure. */
 {
-    Frame *framePtr = (Frame *) clientData;
+    Frame *framePtr = clientData;
 
     /*
      * Wait for all other background events to be processed before mapping
@@ -1746,7 +1750,7 @@ MapFrame(
      * doesn't get a false idea of its desired geometry.
      */
 
-    Tcl_Preserve((ClientData) framePtr);
+    Tcl_Preserve(framePtr);
     while (1) {
 	if (Tcl_DoOneEvent(TCL_IDLE_EVENTS) == 0) {
 	    break;
@@ -1758,12 +1762,12 @@ MapFrame(
 	 */
 
 	if (framePtr->tkwin == NULL) {
-	    Tcl_Release((ClientData) framePtr);
+	    Tcl_Release(framePtr);
 	    return;
 	}
     }
     Tk_MapWindow(framePtr->tkwin);
-    Tcl_Release((ClientData) framePtr);
+    Tcl_Release(framePtr);
 }
 
 /*
@@ -1792,8 +1796,8 @@ TkInstallFrameMenu(
     TkWindow *winPtr = (TkWindow *) tkwin;
 
     if (winPtr->mainPtr != NULL) {
-	Frame *framePtr;
-	framePtr = (Frame*) winPtr->instanceData;
+	Frame *framePtr = (Frame *) winPtr->instanceData;
+
 	if (framePtr == NULL) {
 	    Tcl_Panic("TkInstallFrameMenu couldn't get frame pointer");
 	}
@@ -1825,7 +1829,7 @@ FrameStructureProc(
     ClientData clientData,	/* Pointer to record describing frame. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Labelframe *labelframePtr = (Labelframe *) clientData;
+    Labelframe *labelframePtr = clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	/*
@@ -1835,7 +1839,7 @@ FrameStructureProc(
 
 	if (labelframePtr->frame.type == TYPE_LABELFRAME) {
 	    labelframePtr->labelWin = NULL;
-	    FrameWorldChanged((ClientData) labelframePtr);
+	    FrameWorldChanged(labelframePtr);
 	}
     }
 }
@@ -1863,9 +1867,9 @@ FrameRequestProc(
     ClientData clientData,	/* Pointer to record for frame. */
     Tk_Window tkwin)		/* Window that changed its desired size. */
 {
-    Frame *framePtr = (Frame *) clientData;
+    Frame *framePtr = clientData;
 
-    FrameWorldChanged((ClientData) framePtr);
+    FrameWorldChanged(framePtr);
 }
 
 /*
@@ -1891,8 +1895,8 @@ FrameLostSlaveProc(
 				 * stolen away. */
     Tk_Window tkwin)		/* Tk's handle for the slave window. */
 {
-    Frame *framePtr = (Frame *) clientData;
-    Labelframe *labelframePtr = (Labelframe *) clientData;
+    Frame *framePtr = clientData;
+    Labelframe *labelframePtr = clientData;
 
     /*
      * This should only happen in a labelframe but it doesn't hurt to be
@@ -1901,14 +1905,14 @@ FrameLostSlaveProc(
 
     if (labelframePtr->frame.type == TYPE_LABELFRAME) {
 	Tk_DeleteEventHandler(labelframePtr->labelWin, StructureNotifyMask,
-		FrameStructureProc, (ClientData) labelframePtr);
+		FrameStructureProc, labelframePtr);
 	if (framePtr->tkwin != Tk_Parent(labelframePtr->labelWin)) {
 	    Tk_UnmaintainGeometry(labelframePtr->labelWin, framePtr->tkwin);
 	}
 	Tk_UnmapWindow(labelframePtr->labelWin);
 	labelframePtr->labelWin = NULL;
     }
-    FrameWorldChanged((ClientData) framePtr);
+    FrameWorldChanged(framePtr);
 }
 
 void
@@ -1917,24 +1921,31 @@ TkMapTopFrame (tkwin)
 {
     Frame *framePtr = ((TkWindow*)tkwin)->instanceData;
     Tk_OptionTable optionTable;
+
     if (Tk_IsTopLevel(tkwin) && framePtr->type == TYPE_FRAME) {
 	framePtr->type = TYPE_TOPLEVEL;
-	Tcl_DoWhenIdle(MapFrame, (ClientData)framePtr);
+	Tcl_DoWhenIdle(MapFrame, framePtr);
 	if (framePtr->menuName != NULL) {
 	    TkSetWindowMenuBar(framePtr->interp, framePtr->tkwin, NULL,
-			       framePtr->menuName);
+		    framePtr->menuName);
 	}
     } else if (!Tk_IsTopLevel(tkwin) && framePtr->type == TYPE_TOPLEVEL) {
 	framePtr->type = TYPE_FRAME;
     } else {
-	/* Not a frame or toplevel, skip it */
+	/*
+	 * Not a frame or toplevel, skip it.
+	 */
+
 	return;
     }
+
     /*
-     * The option table has already been created so 
-     * the cached pointer will be returned.
+     * The option table has already been created so the cached pointer will be
+     * returned.
      */
-    optionTable = Tk_CreateOptionTable(framePtr->interp, optionSpecs[framePtr->type]);
+
+    optionTable = Tk_CreateOptionTable(framePtr->interp,
+	    optionSpecs[framePtr->type]);
     framePtr->optionTable = optionTable;
 }
 
@@ -1961,7 +1972,7 @@ TkMapTopFrame (tkwin)
 Tk_Window
 TkToplevelWindowForCommand(
     Tcl_Interp *interp,
-    CONST char *cmdName)
+    const char *cmdName)
 {
     Tcl_CmdInfo cmdInfo;
     Frame *framePtr;
@@ -1972,7 +1983,7 @@ TkToplevelWindowForCommand(
     if (cmdInfo.objProc != FrameWidgetObjCmd) {
 	return NULL;
     }
-    framePtr = (Frame *) cmdInfo.objClientData;
+    framePtr = cmdInfo.objClientData;
     if (framePtr->type != TYPE_TOPLEVEL) {
 	return NULL;
     }