Letting CONST die a slow and graceful death, since NO_CONST was

broken since 8.4 and no-one complained about it.

11 files changed, 896 insertions, 896 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 9ff3c87..540a925 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -10,8 +10,8 @@
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: tk.decls,v 1.39 2008/04/02 21:31:17 das Exp $
+#
+# RCS: @(#) $Id: tk.decls,v 1.40 2008/10/22 20:56:43 nijtmans Exp $
 
 library tk
 
@@ -50,8 +50,8 @@ declare 4 generic {
 	    int relief)
 }
 declare 5 generic {
-    void Tk_AddOption(Tk_Window tkwin, CONST char *name,
-	    CONST char *value, int priority)
+    void Tk_AddOption(Tk_Window tkwin, const char *name,
+	    const char *value, int priority)
 }
 declare 6 generic {
     void Tk_BindEvent(Tk_BindingTable bindingTable,
@@ -69,7 +69,7 @@ declare 8 generic {
 }
 declare 9 generic {
     int Tk_CanvasGetCoord(Tcl_Interp *interp,
-	    Tk_Canvas canvas, CONST char *str, double *doublePtr)
+	    Tk_Canvas canvas, const char *str, double *doublePtr)
 }
 declare 10 generic {
     Tk_CanvasTextInfo *Tk_CanvasGetTextInfo(Tk_Canvas canvas)
@@ -103,7 +103,7 @@ declare 17 generic {
 }
 declare 18 generic {
     int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 19 generic {
     char * Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
@@ -137,12 +137,12 @@ declare 26 generic {
 declare 27 generic {
     int Tk_ConfigureInfo(Tcl_Interp *interp,
 	    Tk_Window tkwin, Tk_ConfigSpec *specs,
-	    char *widgRec, CONST char *argvName, int flags)
+	    char *widgRec, const char *argvName, int flags)
 }
 declare 28 generic {
     int Tk_ConfigureValue(Tcl_Interp *interp,
 	    Tk_Window tkwin, Tk_ConfigSpec *specs,
-	    char *widgRec, CONST char *argvName, int flags)
+	    char *widgRec, const char *argvName, int flags)
 }
 declare 29 generic {
     int Tk_ConfigureWidget(Tcl_Interp *interp,
@@ -156,7 +156,7 @@ declare 30 generic {
 }
 declare 31 generic {
     Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font,
-	    CONST char *str, int numChars, int wrapLength,
+	    const char *str, int numChars, int wrapLength,
 	    Tk_Justify justify, int flags, int *widthPtr,
 	    int *heightPtr)
 }
@@ -166,7 +166,7 @@ declare 32 generic {
 declare 33 generic {
     unsigned long Tk_CreateBinding(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    CONST char *eventStr, CONST char *command, int append)
+	    const char *eventStr, const char *command, int append)
 }
 declare 34 generic {
     Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp)
@@ -201,15 +201,15 @@ declare 41 generic {
 }
 declare 42 generic {
     Tk_Window Tk_CreateWindow(Tcl_Interp *interp,
-	    Tk_Window parent, CONST char *name, CONST char *screenName)
+	    Tk_Window parent, const char *name, const char *screenName)
 }
 declare 43 generic {
     Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, Tk_Window tkwin,
-	    CONST char *pathName, CONST char *screenName)
+	    const char *pathName, const char *screenName)
 }
 declare 44 generic {
-    int Tk_DefineBitmap(Tcl_Interp *interp, CONST char *name,
-	    CONST char *source, int width, int height)
+    int Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+	    const char *source, int width, int height)
 }
 declare 45 generic {
     void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor)
@@ -220,7 +220,7 @@ declare 46 generic {
 declare 47 generic {
     int Tk_DeleteBinding(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    CONST char *eventStr)
+	    const char *eventStr)
 }
 declare 48 generic {
     void Tk_DeleteBindingTable(Tk_BindingTable bindingTable)
@@ -237,7 +237,7 @@ declare 51 generic {
     void Tk_DeleteGenericHandler(Tk_GenericProc *proc, ClientData clientData)
 }
 declare 52 generic {
-    void Tk_DeleteImage(Tcl_Interp *interp, CONST char *name)
+    void Tk_DeleteImage(Tcl_Interp *interp, const char *name)
 }
 declare 53 generic {
     void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, Atom target)
@@ -264,7 +264,7 @@ declare 58 generic {
 }
 declare 59 generic {
     void Tk_DrawChars(Display *display, Drawable drawable, GC gc,
-	    Tk_Font tkfont, CONST char *source, int numBytes, int x, int y)
+	    Tk_Font tkfont, const char *source, int numBytes, int x, int y)
 }
 declare 60 generic {
     void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, int width,
@@ -288,7 +288,7 @@ declare 63 generic {
 	    int relief)
 }
 declare 64 generic {
-    Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, CONST char *imageName)
+    Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, const char *imageName)
 }
 declare 65 generic {
     Font Tk_FontId(Tk_Font font)
@@ -346,7 +346,7 @@ declare 81 generic {
 }
 declare 82 generic {
     int Tk_GetAnchor(Tcl_Interp *interp,
-	    CONST char *str, Tk_Anchor *anchorPtr)
+	    const char *str, Tk_Anchor *anchorPtr)
 }
 declare 83 generic {
     CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom)
@@ -354,17 +354,17 @@ declare 83 generic {
 declare 84 generic {
     CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    CONST char *eventStr)
+	    const char *eventStr)
 }
 declare 85 generic {
-    Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, CONST char * str)
+    Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char * str)
 }
 declare 86 generic {
     Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *source, int width, int height)
+	    Tk_Window tkwin, const char *source, int width, int height)
 }
 declare 87 generic {
-    int Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str, int *capPtr)
+    int Tk_GetCapStyle(Tcl_Interp *interp, const char *str, int *capPtr)
 }
 declare 88 generic {
     XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name)
@@ -374,7 +374,7 @@ declare 89 generic {
 }
 declare 90 generic {
     Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin,
-	    CONST char *str)
+	    const char *str)
 }
 declare 91 generic {
     Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,
@@ -382,13 +382,13 @@ declare 91 generic {
 }
 declare 92 generic {
     Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *source, CONST char *mask,
+	    Tk_Window tkwin, const char *source, const char *mask,
 	    int width, int height, int xHot, int yHot,
 	    Tk_Uid fg, Tk_Uid bg)
 }
 declare 93 generic {
     Tk_Font Tk_GetFont(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *str)
+	    Tk_Window tkwin, const char *str)
 }
 declare 94 generic {
     Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr)
@@ -400,40 +400,40 @@ declare 96 generic {
     GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr)
 }
 declare 97 generic {
-    Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, CONST char *name,
+    Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, const char *name,
 	    Tk_ImageChangedProc *changeProc, ClientData clientData)
 }
 declare 98 generic {
     ClientData Tk_GetImageMasterData(Tcl_Interp *interp,
-	    CONST char *name, Tk_ImageType **typePtrPtr)
+	    const char *name, Tk_ImageType **typePtrPtr)
 }
 declare 99 generic {
     Tk_ItemType * Tk_GetItemTypes(void)
 }
 declare 100 generic {
-    int Tk_GetJoinStyle(Tcl_Interp *interp, CONST char *str, int *joinPtr)
+    int Tk_GetJoinStyle(Tcl_Interp *interp, const char *str, int *joinPtr)
 }
 declare 101 generic {
     int Tk_GetJustify(Tcl_Interp *interp,
-	    CONST char *str, Tk_Justify *justifyPtr)
+	    const char *str, Tk_Justify *justifyPtr)
 }
 declare 102 generic {
     int Tk_GetNumMainWindows(void)
 }
 declare 103 generic {
-    Tk_Uid Tk_GetOption(Tk_Window tkwin, CONST char *name,
-	    CONST char *className)
+    Tk_Uid Tk_GetOption(Tk_Window tkwin, const char *name,
+	    const char *className)
 }
 declare 104 generic {
     int Tk_GetPixels(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *str, int *intPtr)
+	    Tk_Window tkwin, const char *str, int *intPtr)
 }
 declare 105 generic {
     Pixmap Tk_GetPixmap(Display *display, Drawable d,
 	    int width, int height, int depth)
 }
 declare 106 generic {
-    int Tk_GetRelief(Tcl_Interp *interp, CONST char *name, int *reliefPtr)
+    int Tk_GetRelief(Tcl_Interp *interp, const char *name, int *reliefPtr)
 }
 declare 107 generic {
     void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, int *yPtr)
@@ -444,7 +444,7 @@ declare 108 generic {
 }
 declare 109 generic {
     int Tk_GetScreenMM(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *str, double *doublePtr)
+	    Tk_Window tkwin, const char *str, double *doublePtr)
 }
 declare 110 generic {
     int Tk_GetSelection(Tcl_Interp *interp,
@@ -452,11 +452,11 @@ declare 110 generic {
 	    Tk_GetSelProc *proc, ClientData clientData)
 }
 declare 111 generic {
-    Tk_Uid Tk_GetUid(CONST char *str)
+    Tk_Uid Tk_GetUid(const char *str)
 }
 declare 112 generic {
     Visual * Tk_GetVisual(Tcl_Interp *interp,
-	    Tk_Window tkwin, CONST char *str, int *depthPtr,
+	    Tk_Window tkwin, const char *str, int *depthPtr,
 	    Colormap *colormapPtr)
 }
 declare 113 generic {
@@ -480,7 +480,7 @@ declare 118 generic {
     int Tk_Init(Tcl_Interp *interp)
 }
 declare 119 generic {
-    Atom Tk_InternAtom(Tk_Window tkwin, CONST char *name)
+    Atom Tk_InternAtom(Tk_Window tkwin, const char *name)
 }
 declare 120 generic {
     int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, int y,
@@ -498,14 +498,14 @@ declare 123 generic {
 }
 declare 124 generic {
     void Tk_ManageGeometry(Tk_Window tkwin,
-	    CONST Tk_GeomMgr *mgrPtr, ClientData clientData)
+	    const Tk_GeomMgr *mgrPtr, ClientData clientData)
 }
 declare 125 generic {
     void Tk_MapWindow(Tk_Window tkwin)
 }
 declare 126 generic {
     int Tk_MeasureChars(Tk_Font tkfont,
-	    CONST char *source, int numBytes, int maxPixels,
+	    const char *source, int numBytes, int maxPixels,
 	    int flags, int *lengthPtr)
 }
 declare 127 generic {
@@ -553,7 +553,7 @@ declare 140 generic {
 }
 declare 141 generic {
     Tk_Window Tk_NameToWindow(Tcl_Interp *interp,
-	    CONST char *pathName, Tk_Window tkwin)
+	    const char *pathName, Tk_Window tkwin)
 }
 declare 142 generic {
     void Tk_OwnSelection(Tk_Window tkwin,
@@ -622,13 +622,13 @@ declare 159 generic {
     int Tk_SafeInit(Tcl_Interp *interp)
 }
 declare 160 generic {
-    CONST char * Tk_SetAppName(Tk_Window tkwin, CONST char *name)
+    const char * Tk_SetAppName(Tk_Window tkwin, const char *name)
 }
 declare 161 generic {
     void Tk_SetBackgroundFromBorder(Tk_Window tkwin, Tk_3DBorder border)
 }
 declare 162 generic {
-    void Tk_SetClass(Tk_Window tkwin, CONST char *className)
+    void Tk_SetClass(Tk_Window tkwin, const char *className)
 }
 declare 163 generic {
     void Tk_SetGrid(Tk_Window tkwin, int reqWidth, int reqHeight,
@@ -673,7 +673,7 @@ declare 175 generic {
     void Tk_TextLayoutToPostscript(Tcl_Interp *interp, Tk_TextLayout layout)
 }
 declare 176 generic {
-    int Tk_TextWidth(Tk_Font font, CONST char *str, int numBytes)
+    int Tk_TextWidth(Tk_Font font, const char *str, int numBytes)
 }
 declare 177 generic {
     void Tk_UndefineCursor(Tk_Window window)
@@ -681,7 +681,7 @@ declare 177 generic {
 declare 178 generic {
     void Tk_UnderlineChars(Display *display,
 	    Drawable drawable, GC gc, Tk_Font tkfont,
-	    CONST char *source, int x, int y, int firstByte,
+	    const char *source, int x, int y, int firstByte,
 	    int lastByte)
 }
 declare 179 generic {
@@ -730,7 +730,7 @@ declare 189 generic {
 }
 declare 190 generic {
     Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp,
-	    CONST Tk_OptionSpec *templatePtr)
+	    const Tk_OptionSpec *templatePtr)
 }
 declare 191 generic {
     void  Tk_DeleteOptionTable(Tk_OptionTable optionTable)
@@ -801,7 +801,7 @@ declare 209 generic {
 }
 declare 210 generic {
     int	 Tk_GetScrollInfoObj(Tcl_Interp *interp,
-	    int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr)
+	    int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr)
 }
 declare 211 generic {
     int	 Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
@@ -817,7 +817,7 @@ declare 213 generic {
 declare 214 generic {
     int	 Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
 	    Tk_OptionTable optionTable, int objc,
-	    Tcl_Obj *CONST objv[], Tk_Window tkwin,
+	    Tcl_Obj *const objv[], Tk_Window tkwin,
 	    Tk_SavedOptions *savePtr, int *maskPtr)
 }
 declare 215 generic {
@@ -835,11 +835,11 @@ declare 217 generic {
 #}
 
 #declare 219 generic {
-#    VOID *Tk_GetCanvasVisitor(Tcl_Interp *interp, CONST char *name)
+#    VOID *Tk_GetCanvasVisitor(Tcl_Interp *interp, const char *name)
 #}
 
 declare 220 generic {
-    int Tk_GetDash(Tcl_Interp *interp, CONST char *value, Tk_Dash *dash)
+    int Tk_GetDash(Tcl_Interp *interp, const char *value, Tk_Dash *dash)
 }
 declare 221 generic {
     void Tk_CreateOutline(Tk_Outline *outline)
@@ -925,7 +925,7 @@ declare 240 generic {
 #
 declare 241 generic {
     Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp,
-	    Tk_Window parent, CONST char *screenName)
+	    Tk_Window parent, const char *screenName)
 }
 declare 242 generic {
     void Tk_SetClassProcs(Tk_Window tkwin,
@@ -965,31 +965,31 @@ declare 248 generic {
 
 # Style engine
 declare 249 generic {
-    Tk_StyleEngine Tk_RegisterStyleEngine(CONST char *name,
+    Tk_StyleEngine Tk_RegisterStyleEngine(const char *name,
 	    Tk_StyleEngine parent)
 }
 declare 250 generic {
-    Tk_StyleEngine Tk_GetStyleEngine(CONST char *name)
+    Tk_StyleEngine Tk_GetStyleEngine(const char *name)
 }
 declare 251 generic {
     int Tk_RegisterStyledElement(Tk_StyleEngine engine,
 	    Tk_ElementSpec *templatePtr)
 }
 declare 252 generic {
-    int Tk_GetElementId(CONST char *name)
+    int Tk_GetElementId(const char *name)
 }
 declare 253 generic {
-    Tk_Style Tk_CreateStyle(CONST char *name, Tk_StyleEngine engine,
+    Tk_Style Tk_CreateStyle(const char *name, Tk_StyleEngine engine,
 	    ClientData clientData)
 }
 declare 254 generic {
-    Tk_Style Tk_GetStyle(Tcl_Interp *interp, CONST char *name)
+    Tk_Style Tk_GetStyle(Tcl_Interp *interp, const char *name)
 }
 declare 255 generic {
     void Tk_FreeStyle(Tk_Style style)
 }
 declare 256 generic {
-    CONST char * Tk_NameOfStyle(Tk_Style style)
+    const char * Tk_NameOfStyle(Tk_Style style)
 }
 declare 257 generic {
     Tk_Style  Tk_AllocStyleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
@@ -1154,6 +1154,6 @@ declare 10 aqua {
 # Public functions that are not accessible via the stubs table.
 
 export {
-    CONST char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, CONST char *version,
+    const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
 	    int exact)
 }
diff --git a/generic/tk.h b/generic/tk.h
index d8eb505..e7a57f8 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -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: tk.h,v 1.118 2008/10/17 23:18:37 nijtmans Exp $
+ * RCS: @(#) $Id: tk.h,v 1.119 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TK
@@ -888,7 +888,7 @@ typedef enum {
 } Tk_State;
 
 typedef struct Tk_SmoothMethod {
-    char *name;
+    const char *name;
     int (*coordProc) (Tk_Canvas canvas, double *pointPtr, int numPoints,
 	    int numSteps, XPoint xPoints[], double dblPoints[]);
     void (*postscriptProc) (Tcl_Interp *interp, Tk_Canvas canvas,
@@ -1006,7 +1006,7 @@ typedef void	Tk_ItemDCharsProc (Tk_Canvas canvas, Tk_Item *itemPtr,
 #ifndef __NO_OLD_CONFIG
 
 typedef struct Tk_ItemType {
-    CONST char *name; /* The name of this type of item, such as
+    const char *name; /* The name of this type of item, such as
 				 * "line". */
     int itemSize;		/* Total amount of space needed for item's
 				 * record. */
@@ -1201,7 +1201,7 @@ typedef int (Tk_ImagePostscriptProc) (ClientData clientData,
  */
 
 struct Tk_ImageType {
-    CONST char *name; /* Name of image type. */
+    const char *name; /* Name of image type. */
     Tk_ImageCreateProc *createProc;
 				/* Procedure to call to create a new image of
 				 * this type. */
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index abf2739..f6c8067 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -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: tkDecls.h,v 1.34 2008/04/08 15:00:37 das Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.35 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKDECLS
@@ -44,56 +44,56 @@ EXTERN XColor *		Tk_3DBorderColor (Tk_3DBorder border);
 #ifndef Tk_3DBorderGC_TCL_DECLARED
 #define Tk_3DBorderGC_TCL_DECLARED
 /* 2 */
-EXTERN GC		Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border, 
+EXTERN GC		Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border,
 				int which);
 #endif
 #ifndef Tk_3DHorizontalBevel_TCL_DECLARED
 #define Tk_3DHorizontalBevel_TCL_DECLARED
 /* 3 */
-EXTERN void		Tk_3DHorizontalBevel (Tk_Window tkwin, 
-				Drawable drawable, Tk_3DBorder border, int x, 
-				int y, int width, int height, int leftIn, 
+EXTERN void		Tk_3DHorizontalBevel (Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height, int leftIn,
 				int rightIn, int topBevel, int relief);
 #endif
 #ifndef Tk_3DVerticalBevel_TCL_DECLARED
 #define Tk_3DVerticalBevel_TCL_DECLARED
 /* 4 */
-EXTERN void		Tk_3DVerticalBevel (Tk_Window tkwin, 
-				Drawable drawable, Tk_3DBorder border, int x, 
-				int y, int width, int height, int leftBevel, 
+EXTERN void		Tk_3DVerticalBevel (Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height, int leftBevel,
 				int relief);
 #endif
 #ifndef Tk_AddOption_TCL_DECLARED
 #define Tk_AddOption_TCL_DECLARED
 /* 5 */
-EXTERN void		Tk_AddOption (Tk_Window tkwin, CONST char * name, 
-				CONST char * value, int priority);
+EXTERN void		Tk_AddOption (Tk_Window tkwin, const char * name,
+				const char * value, int priority);
 #endif
 #ifndef Tk_BindEvent_TCL_DECLARED
 #define Tk_BindEvent_TCL_DECLARED
 /* 6 */
-EXTERN void		Tk_BindEvent (Tk_BindingTable bindingTable, 
-				XEvent * eventPtr, Tk_Window tkwin, 
+EXTERN void		Tk_BindEvent (Tk_BindingTable bindingTable,
+				XEvent * eventPtr, Tk_Window tkwin,
 				int numObjects, ClientData * objectPtr);
 #endif
 #ifndef Tk_CanvasDrawableCoords_TCL_DECLARED
 #define Tk_CanvasDrawableCoords_TCL_DECLARED
 /* 7 */
-EXTERN void		Tk_CanvasDrawableCoords (Tk_Canvas canvas, double x, 
-				double y, short * drawableXPtr, 
+EXTERN void		Tk_CanvasDrawableCoords (Tk_Canvas canvas, double x,
+				double y, short * drawableXPtr,
 				short * drawableYPtr);
 #endif
 #ifndef Tk_CanvasEventuallyRedraw_TCL_DECLARED
 #define Tk_CanvasEventuallyRedraw_TCL_DECLARED
 /* 8 */
-EXTERN void		Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1, 
+EXTERN void		Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef Tk_CanvasGetCoord_TCL_DECLARED
 #define Tk_CanvasGetCoord_TCL_DECLARED
 /* 9 */
-EXTERN int		Tk_CanvasGetCoord (Tcl_Interp * interp, 
-				Tk_Canvas canvas, CONST char * str, 
+EXTERN int		Tk_CanvasGetCoord (Tcl_Interp * interp,
+				Tk_Canvas canvas, const char * str,
 				double * doublePtr);
 #endif
 #ifndef Tk_CanvasGetTextInfo_TCL_DECLARED
@@ -104,33 +104,33 @@ EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo (Tk_Canvas canvas);
 #ifndef Tk_CanvasPsBitmap_TCL_DECLARED
 #define Tk_CanvasPsBitmap_TCL_DECLARED
 /* 11 */
-EXTERN int		Tk_CanvasPsBitmap (Tcl_Interp * interp, 
-				Tk_Canvas canvas, Pixmap bitmap, int x, 
+EXTERN int		Tk_CanvasPsBitmap (Tcl_Interp * interp,
+				Tk_Canvas canvas, Pixmap bitmap, int x,
 				int y, int width, int height);
 #endif
 #ifndef Tk_CanvasPsColor_TCL_DECLARED
 #define Tk_CanvasPsColor_TCL_DECLARED
 /* 12 */
-EXTERN int		Tk_CanvasPsColor (Tcl_Interp * interp, 
+EXTERN int		Tk_CanvasPsColor (Tcl_Interp * interp,
 				Tk_Canvas canvas, XColor * colorPtr);
 #endif
 #ifndef Tk_CanvasPsFont_TCL_DECLARED
 #define Tk_CanvasPsFont_TCL_DECLARED
 /* 13 */
-EXTERN int		Tk_CanvasPsFont (Tcl_Interp * interp, 
+EXTERN int		Tk_CanvasPsFont (Tcl_Interp * interp,
 				Tk_Canvas canvas, Tk_Font font);
 #endif
 #ifndef Tk_CanvasPsPath_TCL_DECLARED
 #define Tk_CanvasPsPath_TCL_DECLARED
 /* 14 */
-EXTERN void		Tk_CanvasPsPath (Tcl_Interp * interp, 
-				Tk_Canvas canvas, double * coordPtr, 
+EXTERN void		Tk_CanvasPsPath (Tcl_Interp * interp,
+				Tk_Canvas canvas, double * coordPtr,
 				int numPoints);
 #endif
 #ifndef Tk_CanvasPsStipple_TCL_DECLARED
 #define Tk_CanvasPsStipple_TCL_DECLARED
 /* 15 */
-EXTERN int		Tk_CanvasPsStipple (Tcl_Interp * interp, 
+EXTERN int		Tk_CanvasPsStipple (Tcl_Interp * interp,
 				Tk_Canvas canvas, Pixmap bitmap);
 #endif
 #ifndef Tk_CanvasPsY_TCL_DECLARED
@@ -146,16 +146,16 @@ EXTERN void		Tk_CanvasSetStippleOrigin (Tk_Canvas canvas, GC gc);
 #ifndef Tk_CanvasTagsParseProc_TCL_DECLARED
 #define Tk_CanvasTagsParseProc_TCL_DECLARED
 /* 18 */
-EXTERN int		Tk_CanvasTagsParseProc (ClientData clientData, 
-				Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * value, char * widgRec, 
+EXTERN int		Tk_CanvasTagsParseProc (ClientData clientData,
+				Tcl_Interp * interp, Tk_Window tkwin,
+				const char * value, char * widgRec,
 				int offset);
 #endif
 #ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED
 #define Tk_CanvasTagsPrintProc_TCL_DECLARED
 /* 19 */
-EXTERN char *		Tk_CanvasTagsPrintProc (ClientData clientData, 
-				Tk_Window tkwin, char * widgRec, int offset, 
+EXTERN char *		Tk_CanvasTagsPrintProc (ClientData clientData,
+				Tk_Window tkwin, char * widgRec, int offset,
 				Tcl_FreeProc ** freeProcPtr);
 #endif
 #ifndef Tk_CanvasTkwin_TCL_DECLARED
@@ -166,22 +166,22 @@ EXTERN Tk_Window	Tk_CanvasTkwin (Tk_Canvas canvas);
 #ifndef Tk_CanvasWindowCoords_TCL_DECLARED
 #define Tk_CanvasWindowCoords_TCL_DECLARED
 /* 21 */
-EXTERN void		Tk_CanvasWindowCoords (Tk_Canvas canvas, double x, 
-				double y, short * screenXPtr, 
+EXTERN void		Tk_CanvasWindowCoords (Tk_Canvas canvas, double x,
+				double y, short * screenXPtr,
 				short * screenYPtr);
 #endif
 #ifndef Tk_ChangeWindowAttributes_TCL_DECLARED
 #define Tk_ChangeWindowAttributes_TCL_DECLARED
 /* 22 */
-EXTERN void		Tk_ChangeWindowAttributes (Tk_Window tkwin, 
-				unsigned long valueMask, 
+EXTERN void		Tk_ChangeWindowAttributes (Tk_Window tkwin,
+				unsigned long valueMask,
 				XSetWindowAttributes * attsPtr);
 #endif
 #ifndef Tk_CharBbox_TCL_DECLARED
 #define Tk_CharBbox_TCL_DECLARED
 /* 23 */
-EXTERN int		Tk_CharBbox (Tk_TextLayout layout, int index, 
-				int * xPtr, int * yPtr, int * widthPtr, 
+EXTERN int		Tk_CharBbox (Tk_TextLayout layout, int index,
+				int * xPtr, int * yPtr, int * widthPtr,
 				int * heightPtr);
 #endif
 #ifndef Tk_ClearSelection_TCL_DECLARED
@@ -192,68 +192,68 @@ EXTERN void		Tk_ClearSelection (Tk_Window tkwin, Atom selection);
 #ifndef Tk_ClipboardAppend_TCL_DECLARED
 #define Tk_ClipboardAppend_TCL_DECLARED
 /* 25 */
-EXTERN int		Tk_ClipboardAppend (Tcl_Interp * interp, 
-				Tk_Window tkwin, Atom target, Atom format, 
+EXTERN int		Tk_ClipboardAppend (Tcl_Interp * interp,
+				Tk_Window tkwin, Atom target, Atom format,
 				char* buffer);
 #endif
 #ifndef Tk_ClipboardClear_TCL_DECLARED
 #define Tk_ClipboardClear_TCL_DECLARED
 /* 26 */
-EXTERN int		Tk_ClipboardClear (Tcl_Interp * interp, 
+EXTERN int		Tk_ClipboardClear (Tcl_Interp * interp,
 				Tk_Window tkwin);
 #endif
 #ifndef Tk_ConfigureInfo_TCL_DECLARED
 #define Tk_ConfigureInfo_TCL_DECLARED
 /* 27 */
-EXTERN int		Tk_ConfigureInfo (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				char * widgRec, CONST char * argvName, 
+EXTERN int		Tk_ConfigureInfo (Tcl_Interp * interp,
+				Tk_Window tkwin, Tk_ConfigSpec * specs,
+				char * widgRec, const char * argvName,
 				int flags);
 #endif
 #ifndef Tk_ConfigureValue_TCL_DECLARED
 #define Tk_ConfigureValue_TCL_DECLARED
 /* 28 */
-EXTERN int		Tk_ConfigureValue (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				char * widgRec, CONST char * argvName, 
+EXTERN int		Tk_ConfigureValue (Tcl_Interp * interp,
+				Tk_Window tkwin, Tk_ConfigSpec * specs,
+				char * widgRec, const char * argvName,
 				int flags);
 #endif
 #ifndef Tk_ConfigureWidget_TCL_DECLARED
 #define Tk_ConfigureWidget_TCL_DECLARED
 /* 29 */
-EXTERN int		Tk_ConfigureWidget (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				int argc, CONST84 char ** argv, 
+EXTERN int		Tk_ConfigureWidget (Tcl_Interp * interp,
+				Tk_Window tkwin, Tk_ConfigSpec * specs,
+				int argc, CONST84 char ** argv,
 				char * widgRec, int flags);
 #endif
 #ifndef Tk_ConfigureWindow_TCL_DECLARED
 #define Tk_ConfigureWindow_TCL_DECLARED
 /* 30 */
-EXTERN void		Tk_ConfigureWindow (Tk_Window tkwin, 
-				unsigned int valueMask, 
+EXTERN void		Tk_ConfigureWindow (Tk_Window tkwin,
+				unsigned int valueMask,
 				XWindowChanges * valuePtr);
 #endif
 #ifndef Tk_ComputeTextLayout_TCL_DECLARED
 #define Tk_ComputeTextLayout_TCL_DECLARED
 /* 31 */
-EXTERN Tk_TextLayout	Tk_ComputeTextLayout (Tk_Font font, CONST char * str, 
-				int numChars, int wrapLength, 
-				Tk_Justify justify, int flags, 
+EXTERN Tk_TextLayout	Tk_ComputeTextLayout (Tk_Font font, const char * str,
+				int numChars, int wrapLength,
+				Tk_Justify justify, int flags,
 				int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_CoordsToWindow_TCL_DECLARED
 #define Tk_CoordsToWindow_TCL_DECLARED
 /* 32 */
-EXTERN Tk_Window	Tk_CoordsToWindow (int rootX, int rootY, 
+EXTERN Tk_Window	Tk_CoordsToWindow (int rootX, int rootY,
 				Tk_Window tkwin);
 #endif
 #ifndef Tk_CreateBinding_TCL_DECLARED
 #define Tk_CreateBinding_TCL_DECLARED
 /* 33 */
-EXTERN unsigned long	Tk_CreateBinding (Tcl_Interp * interp, 
-				Tk_BindingTable bindingTable, 
-				ClientData object, CONST char * eventStr, 
-				CONST char * command, int append);
+EXTERN unsigned long	Tk_CreateBinding (Tcl_Interp * interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char * eventStr,
+				const char * command, int append);
 #endif
 #ifndef Tk_CreateBindingTable_TCL_DECLARED
 #define Tk_CreateBindingTable_TCL_DECLARED
@@ -263,22 +263,22 @@ EXTERN Tk_BindingTable	Tk_CreateBindingTable (Tcl_Interp * interp);
 #ifndef Tk_CreateErrorHandler_TCL_DECLARED
 #define Tk_CreateErrorHandler_TCL_DECLARED
 /* 35 */
-EXTERN Tk_ErrorHandler	Tk_CreateErrorHandler (Display * display, int errNum, 
-				int request, int minorCode, 
-				Tk_ErrorProc * errorProc, 
+EXTERN Tk_ErrorHandler	Tk_CreateErrorHandler (Display * display, int errNum,
+				int request, int minorCode,
+				Tk_ErrorProc * errorProc,
 				ClientData clientData);
 #endif
 #ifndef Tk_CreateEventHandler_TCL_DECLARED
 #define Tk_CreateEventHandler_TCL_DECLARED
 /* 36 */
-EXTERN void		Tk_CreateEventHandler (Tk_Window token, 
-				unsigned long mask, Tk_EventProc * proc, 
+EXTERN void		Tk_CreateEventHandler (Tk_Window token,
+				unsigned long mask, Tk_EventProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tk_CreateGenericHandler_TCL_DECLARED
 #define Tk_CreateGenericHandler_TCL_DECLARED
 /* 37 */
-EXTERN void		Tk_CreateGenericHandler (Tk_GenericProc * proc, 
+EXTERN void		Tk_CreateGenericHandler (Tk_GenericProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tk_CreateImageType_TCL_DECLARED
@@ -300,29 +300,29 @@ EXTERN void		Tk_CreatePhotoImageFormat (
 #ifndef Tk_CreateSelHandler_TCL_DECLARED
 #define Tk_CreateSelHandler_TCL_DECLARED
 /* 41 */
-EXTERN void		Tk_CreateSelHandler (Tk_Window tkwin, Atom selection, 
-				Atom target, Tk_SelectionProc * proc, 
+EXTERN void		Tk_CreateSelHandler (Tk_Window tkwin, Atom selection,
+				Atom target, Tk_SelectionProc * proc,
 				ClientData clientData, Atom format);
 #endif
 #ifndef Tk_CreateWindow_TCL_DECLARED
 #define Tk_CreateWindow_TCL_DECLARED
 /* 42 */
-EXTERN Tk_Window	Tk_CreateWindow (Tcl_Interp * interp, 
-				Tk_Window parent, CONST char * name, 
-				CONST char * screenName);
+EXTERN Tk_Window	Tk_CreateWindow (Tcl_Interp * interp,
+				Tk_Window parent, const char * name,
+				const char * screenName);
 #endif
 #ifndef Tk_CreateWindowFromPath_TCL_DECLARED
 #define Tk_CreateWindowFromPath_TCL_DECLARED
 /* 43 */
-EXTERN Tk_Window	Tk_CreateWindowFromPath (Tcl_Interp * interp, 
-				Tk_Window tkwin, CONST char * pathName, 
-				CONST char * screenName);
+EXTERN Tk_Window	Tk_CreateWindowFromPath (Tcl_Interp * interp,
+				Tk_Window tkwin, const char * pathName,
+				const char * screenName);
 #endif
 #ifndef Tk_DefineBitmap_TCL_DECLARED
 #define Tk_DefineBitmap_TCL_DECLARED
 /* 44 */
-EXTERN int		Tk_DefineBitmap (Tcl_Interp * interp, 
-				CONST char * name, CONST char * source, 
+EXTERN int		Tk_DefineBitmap (Tcl_Interp * interp,
+				const char * name, const char * source,
 				int width, int height);
 #endif
 #ifndef Tk_DefineCursor_TCL_DECLARED
@@ -333,15 +333,15 @@ EXTERN void		Tk_DefineCursor (Tk_Window window, Tk_Cursor cursor);
 #ifndef Tk_DeleteAllBindings_TCL_DECLARED
 #define Tk_DeleteAllBindings_TCL_DECLARED
 /* 46 */
-EXTERN void		Tk_DeleteAllBindings (Tk_BindingTable bindingTable, 
+EXTERN void		Tk_DeleteAllBindings (Tk_BindingTable bindingTable,
 				ClientData object);
 #endif
 #ifndef Tk_DeleteBinding_TCL_DECLARED
 #define Tk_DeleteBinding_TCL_DECLARED
 /* 47 */
-EXTERN int		Tk_DeleteBinding (Tcl_Interp * interp, 
-				Tk_BindingTable bindingTable, 
-				ClientData object, CONST char * eventStr);
+EXTERN int		Tk_DeleteBinding (Tcl_Interp * interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char * eventStr);
 #endif
 #ifndef Tk_DeleteBindingTable_TCL_DECLARED
 #define Tk_DeleteBindingTable_TCL_DECLARED
@@ -356,26 +356,26 @@ EXTERN void		Tk_DeleteErrorHandler (Tk_ErrorHandler handler);
 #ifndef Tk_DeleteEventHandler_TCL_DECLARED
 #define Tk_DeleteEventHandler_TCL_DECLARED
 /* 50 */
-EXTERN void		Tk_DeleteEventHandler (Tk_Window token, 
-				unsigned long mask, Tk_EventProc * proc, 
+EXTERN void		Tk_DeleteEventHandler (Tk_Window token,
+				unsigned long mask, Tk_EventProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tk_DeleteGenericHandler_TCL_DECLARED
 #define Tk_DeleteGenericHandler_TCL_DECLARED
 /* 51 */
-EXTERN void		Tk_DeleteGenericHandler (Tk_GenericProc * proc, 
+EXTERN void		Tk_DeleteGenericHandler (Tk_GenericProc * proc,
 				ClientData clientData);
 #endif
 #ifndef Tk_DeleteImage_TCL_DECLARED
 #define Tk_DeleteImage_TCL_DECLARED
 /* 52 */
-EXTERN void		Tk_DeleteImage (Tcl_Interp * interp, 
-				CONST char * name);
+EXTERN void		Tk_DeleteImage (Tcl_Interp * interp,
+				const char * name);
 #endif
 #ifndef Tk_DeleteSelHandler_TCL_DECLARED
 #define Tk_DeleteSelHandler_TCL_DECLARED
 /* 53 */
-EXTERN void		Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection, 
+EXTERN void		Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection,
 				Atom target);
 #endif
 #ifndef Tk_DestroyWindow_TCL_DECLARED
@@ -391,67 +391,67 @@ EXTERN CONST84_RETURN char * Tk_DisplayName (Tk_Window tkwin);
 #ifndef Tk_DistanceToTextLayout_TCL_DECLARED
 #define Tk_DistanceToTextLayout_TCL_DECLARED
 /* 56 */
-EXTERN int		Tk_DistanceToTextLayout (Tk_TextLayout layout, int x, 
+EXTERN int		Tk_DistanceToTextLayout (Tk_TextLayout layout, int x,
 				int y);
 #endif
 #ifndef Tk_Draw3DPolygon_TCL_DECLARED
 #define Tk_Draw3DPolygon_TCL_DECLARED
 /* 57 */
-EXTERN void		Tk_Draw3DPolygon (Tk_Window tkwin, Drawable drawable, 
-				Tk_3DBorder border, XPoint * pointPtr, 
-				int numPoints, int borderWidth, 
+EXTERN void		Tk_Draw3DPolygon (Tk_Window tkwin, Drawable drawable,
+				Tk_3DBorder border, XPoint * pointPtr,
+				int numPoints, int borderWidth,
 				int leftRelief);
 #endif
 #ifndef Tk_Draw3DRectangle_TCL_DECLARED
 #define Tk_Draw3DRectangle_TCL_DECLARED
 /* 58 */
-EXTERN void		Tk_Draw3DRectangle (Tk_Window tkwin, 
-				Drawable drawable, Tk_3DBorder border, int x, 
-				int y, int width, int height, 
+EXTERN void		Tk_Draw3DRectangle (Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height,
 				int borderWidth, int relief);
 #endif
 #ifndef Tk_DrawChars_TCL_DECLARED
 #define Tk_DrawChars_TCL_DECLARED
 /* 59 */
-EXTERN void		Tk_DrawChars (Display * display, Drawable drawable, 
-				GC gc, Tk_Font tkfont, CONST char * source, 
+EXTERN void		Tk_DrawChars (Display * display, Drawable drawable,
+				GC gc, Tk_Font tkfont, const char * source,
 				int numBytes, int x, int y);
 #endif
 #ifndef Tk_DrawFocusHighlight_TCL_DECLARED
 #define Tk_DrawFocusHighlight_TCL_DECLARED
 /* 60 */
-EXTERN void		Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc, 
+EXTERN void		Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc,
 				int width, Drawable drawable);
 #endif
 #ifndef Tk_DrawTextLayout_TCL_DECLARED
 #define Tk_DrawTextLayout_TCL_DECLARED
 /* 61 */
-EXTERN void		Tk_DrawTextLayout (Display * display, 
-				Drawable drawable, GC gc, 
-				Tk_TextLayout layout, int x, int y, 
+EXTERN void		Tk_DrawTextLayout (Display * display,
+				Drawable drawable, GC gc,
+				Tk_TextLayout layout, int x, int y,
 				int firstChar, int lastChar);
 #endif
 #ifndef Tk_Fill3DPolygon_TCL_DECLARED
 #define Tk_Fill3DPolygon_TCL_DECLARED
 /* 62 */
-EXTERN void		Tk_Fill3DPolygon (Tk_Window tkwin, Drawable drawable, 
-				Tk_3DBorder border, XPoint * pointPtr, 
-				int numPoints, int borderWidth, 
+EXTERN void		Tk_Fill3DPolygon (Tk_Window tkwin, Drawable drawable,
+				Tk_3DBorder border, XPoint * pointPtr,
+				int numPoints, int borderWidth,
 				int leftRelief);
 #endif
 #ifndef Tk_Fill3DRectangle_TCL_DECLARED
 #define Tk_Fill3DRectangle_TCL_DECLARED
 /* 63 */
-EXTERN void		Tk_Fill3DRectangle (Tk_Window tkwin, 
-				Drawable drawable, Tk_3DBorder border, int x, 
-				int y, int width, int height, 
+EXTERN void		Tk_Fill3DRectangle (Tk_Window tkwin,
+				Drawable drawable, Tk_3DBorder border, int x,
+				int y, int width, int height,
 				int borderWidth, int relief);
 #endif
 #ifndef Tk_FindPhoto_TCL_DECLARED
 #define Tk_FindPhoto_TCL_DECLARED
 /* 64 */
-EXTERN Tk_PhotoHandle	Tk_FindPhoto (Tcl_Interp * interp, 
-				CONST char * imageName);
+EXTERN Tk_PhotoHandle	Tk_FindPhoto (Tcl_Interp * interp,
+				const char * imageName);
 #endif
 #ifndef Tk_FontId_TCL_DECLARED
 #define Tk_FontId_TCL_DECLARED
@@ -476,7 +476,7 @@ EXTERN void		Tk_FreeColor (XColor * colorPtr);
 #ifndef Tk_FreeColormap_TCL_DECLARED
 #define Tk_FreeColormap_TCL_DECLARED
 /* 69 */
-EXTERN void		Tk_FreeColormap (Display * display, 
+EXTERN void		Tk_FreeColormap (Display * display,
 				Colormap colormap);
 #endif
 #ifndef Tk_FreeCursor_TCL_DECLARED
@@ -502,8 +502,8 @@ EXTERN void		Tk_FreeImage (Tk_Image image);
 #ifndef Tk_FreeOptions_TCL_DECLARED
 #define Tk_FreeOptions_TCL_DECLARED
 /* 74 */
-EXTERN void		Tk_FreeOptions (Tk_ConfigSpec * specs, 
-				char * widgRec, Display * display, 
+EXTERN void		Tk_FreeOptions (Tk_ConfigSpec * specs,
+				char * widgRec, Display * display,
 				int needFlags);
 #endif
 #ifndef Tk_FreePixmap_TCL_DECLARED
@@ -529,26 +529,26 @@ EXTERN GC		Tk_GCForColor (XColor * colorPtr, Drawable drawable);
 #ifndef Tk_GeometryRequest_TCL_DECLARED
 #define Tk_GeometryRequest_TCL_DECLARED
 /* 79 */
-EXTERN void		Tk_GeometryRequest (Tk_Window tkwin, int reqWidth, 
+EXTERN void		Tk_GeometryRequest (Tk_Window tkwin, int reqWidth,
 				int reqHeight);
 #endif
 #ifndef Tk_Get3DBorder_TCL_DECLARED
 #define Tk_Get3DBorder_TCL_DECLARED
 /* 80 */
-EXTERN Tk_3DBorder	Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin, 
+EXTERN Tk_3DBorder	Tk_Get3DBorder (Tcl_Interp * interp, Tk_Window tkwin,
 				Tk_Uid colorName);
 #endif
 #ifndef Tk_GetAllBindings_TCL_DECLARED
 #define Tk_GetAllBindings_TCL_DECLARED
 /* 81 */
-EXTERN void		Tk_GetAllBindings (Tcl_Interp * interp, 
-				Tk_BindingTable bindingTable, 
+EXTERN void		Tk_GetAllBindings (Tcl_Interp * interp,
+				Tk_BindingTable bindingTable,
 				ClientData object);
 #endif
 #ifndef Tk_GetAnchor_TCL_DECLARED
 #define Tk_GetAnchor_TCL_DECLARED
 /* 82 */
-EXTERN int		Tk_GetAnchor (Tcl_Interp * interp, CONST char * str, 
+EXTERN int		Tk_GetAnchor (Tcl_Interp * interp, const char * str,
 				Tk_Anchor * anchorPtr);
 #endif
 #ifndef Tk_GetAtomName_TCL_DECLARED
@@ -559,66 +559,66 @@ EXTERN CONST84_RETURN char * Tk_GetAtomName (Tk_Window tkwin, Atom atom);
 #ifndef Tk_GetBinding_TCL_DECLARED
 #define Tk_GetBinding_TCL_DECLARED
 /* 84 */
-EXTERN CONST84_RETURN char * Tk_GetBinding (Tcl_Interp * interp, 
-				Tk_BindingTable bindingTable, 
-				ClientData object, CONST char * eventStr);
+EXTERN CONST84_RETURN char * Tk_GetBinding (Tcl_Interp * interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char * eventStr);
 #endif
 #ifndef Tk_GetBitmap_TCL_DECLARED
 #define Tk_GetBitmap_TCL_DECLARED
 /* 85 */
-EXTERN Pixmap		Tk_GetBitmap (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str);
+EXTERN Pixmap		Tk_GetBitmap (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str);
 #endif
 #ifndef Tk_GetBitmapFromData_TCL_DECLARED
 #define Tk_GetBitmapFromData_TCL_DECLARED
 /* 86 */
-EXTERN Pixmap		Tk_GetBitmapFromData (Tcl_Interp * interp, 
-				Tk_Window tkwin, CONST char * source, 
+EXTERN Pixmap		Tk_GetBitmapFromData (Tcl_Interp * interp,
+				Tk_Window tkwin, const char * source,
 				int width, int height);
 #endif
 #ifndef Tk_GetCapStyle_TCL_DECLARED
 #define Tk_GetCapStyle_TCL_DECLARED
 /* 87 */
-EXTERN int		Tk_GetCapStyle (Tcl_Interp * interp, 
-				CONST char * str, int * capPtr);
+EXTERN int		Tk_GetCapStyle (Tcl_Interp * interp,
+				const char * str, int * capPtr);
 #endif
 #ifndef Tk_GetColor_TCL_DECLARED
 #define Tk_GetColor_TCL_DECLARED
 /* 88 */
-EXTERN XColor *		Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin, 
+EXTERN XColor *		Tk_GetColor (Tcl_Interp * interp, Tk_Window tkwin,
 				Tk_Uid name);
 #endif
 #ifndef Tk_GetColorByValue_TCL_DECLARED
 #define Tk_GetColorByValue_TCL_DECLARED
 /* 89 */
-EXTERN XColor *		Tk_GetColorByValue (Tk_Window tkwin, 
+EXTERN XColor *		Tk_GetColorByValue (Tk_Window tkwin,
 				XColor * colorPtr);
 #endif
 #ifndef Tk_GetColormap_TCL_DECLARED
 #define Tk_GetColormap_TCL_DECLARED
 /* 90 */
-EXTERN Colormap		Tk_GetColormap (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str);
+EXTERN Colormap		Tk_GetColormap (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str);
 #endif
 #ifndef Tk_GetCursor_TCL_DECLARED
 #define Tk_GetCursor_TCL_DECLARED
 /* 91 */
-EXTERN Tk_Cursor	Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin, 
+EXTERN Tk_Cursor	Tk_GetCursor (Tcl_Interp * interp, Tk_Window tkwin,
 				Tk_Uid str);
 #endif
 #ifndef Tk_GetCursorFromData_TCL_DECLARED
 #define Tk_GetCursorFromData_TCL_DECLARED
 /* 92 */
-EXTERN Tk_Cursor	Tk_GetCursorFromData (Tcl_Interp * interp, 
-				Tk_Window tkwin, CONST char * source, 
-				CONST char * mask, int width, int height, 
+EXTERN Tk_Cursor	Tk_GetCursorFromData (Tcl_Interp * interp,
+				Tk_Window tkwin, const char * source,
+				const char * mask, int width, int height,
 				int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
 #endif
 #ifndef Tk_GetFont_TCL_DECLARED
 #define Tk_GetFont_TCL_DECLARED
 /* 93 */
-EXTERN Tk_Font		Tk_GetFont (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str);
+EXTERN Tk_Font		Tk_GetFont (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str);
 #endif
 #ifndef Tk_GetFontFromObj_TCL_DECLARED
 #define Tk_GetFontFromObj_TCL_DECLARED
@@ -628,28 +628,28 @@ EXTERN Tk_Font		Tk_GetFontFromObj (Tk_Window tkwin, Tcl_Obj * objPtr);
 #ifndef Tk_GetFontMetrics_TCL_DECLARED
 #define Tk_GetFontMetrics_TCL_DECLARED
 /* 95 */
-EXTERN void		Tk_GetFontMetrics (Tk_Font font, 
+EXTERN void		Tk_GetFontMetrics (Tk_Font font,
 				Tk_FontMetrics * fmPtr);
 #endif
 #ifndef Tk_GetGC_TCL_DECLARED
 #define Tk_GetGC_TCL_DECLARED
 /* 96 */
-EXTERN GC		Tk_GetGC (Tk_Window tkwin, unsigned long valueMask, 
+EXTERN GC		Tk_GetGC (Tk_Window tkwin, unsigned long valueMask,
 				XGCValues * valuePtr);
 #endif
 #ifndef Tk_GetImage_TCL_DECLARED
 #define Tk_GetImage_TCL_DECLARED
 /* 97 */
-EXTERN Tk_Image		Tk_GetImage (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * name, 
-				Tk_ImageChangedProc * changeProc, 
+EXTERN Tk_Image		Tk_GetImage (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * name,
+				Tk_ImageChangedProc * changeProc,
 				ClientData clientData);
 #endif
 #ifndef Tk_GetImageMasterData_TCL_DECLARED
 #define Tk_GetImageMasterData_TCL_DECLARED
 /* 98 */
-EXTERN ClientData	Tk_GetImageMasterData (Tcl_Interp * interp, 
-				CONST char * name, 
+EXTERN ClientData	Tk_GetImageMasterData (Tcl_Interp * interp,
+				const char * name,
 				Tk_ImageType ** typePtrPtr);
 #endif
 #ifndef Tk_GetItemTypes_TCL_DECLARED
@@ -660,13 +660,13 @@ EXTERN Tk_ItemType *	Tk_GetItemTypes (void);
 #ifndef Tk_GetJoinStyle_TCL_DECLARED
 #define Tk_GetJoinStyle_TCL_DECLARED
 /* 100 */
-EXTERN int		Tk_GetJoinStyle (Tcl_Interp * interp, 
-				CONST char * str, int * joinPtr);
+EXTERN int		Tk_GetJoinStyle (Tcl_Interp * interp,
+				const char * str, int * joinPtr);
 #endif
 #ifndef Tk_GetJustify_TCL_DECLARED
 #define Tk_GetJustify_TCL_DECLARED
 /* 101 */
-EXTERN int		Tk_GetJustify (Tcl_Interp * interp, CONST char * str, 
+EXTERN int		Tk_GetJustify (Tcl_Interp * interp, const char * str,
 				Tk_Justify * justifyPtr);
 #endif
 #ifndef Tk_GetNumMainWindows_TCL_DECLARED
@@ -677,75 +677,75 @@ EXTERN int		Tk_GetNumMainWindows (void);
 #ifndef Tk_GetOption_TCL_DECLARED
 #define Tk_GetOption_TCL_DECLARED
 /* 103 */
-EXTERN Tk_Uid		Tk_GetOption (Tk_Window tkwin, CONST char * name, 
-				CONST char * className);
+EXTERN Tk_Uid		Tk_GetOption (Tk_Window tkwin, const char * name,
+				const char * className);
 #endif
 #ifndef Tk_GetPixels_TCL_DECLARED
 #define Tk_GetPixels_TCL_DECLARED
 /* 104 */
-EXTERN int		Tk_GetPixels (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str, int * intPtr);
+EXTERN int		Tk_GetPixels (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str, int * intPtr);
 #endif
 #ifndef Tk_GetPixmap_TCL_DECLARED
 #define Tk_GetPixmap_TCL_DECLARED
 /* 105 */
-EXTERN Pixmap		Tk_GetPixmap (Display * display, Drawable d, 
+EXTERN Pixmap		Tk_GetPixmap (Display * display, Drawable d,
 				int width, int height, int depth);
 #endif
 #ifndef Tk_GetRelief_TCL_DECLARED
 #define Tk_GetRelief_TCL_DECLARED
 /* 106 */
-EXTERN int		Tk_GetRelief (Tcl_Interp * interp, CONST char * name, 
+EXTERN int		Tk_GetRelief (Tcl_Interp * interp, const char * name,
 				int * reliefPtr);
 #endif
 #ifndef Tk_GetRootCoords_TCL_DECLARED
 #define Tk_GetRootCoords_TCL_DECLARED
 /* 107 */
-EXTERN void		Tk_GetRootCoords (Tk_Window tkwin, int * xPtr, 
+EXTERN void		Tk_GetRootCoords (Tk_Window tkwin, int * xPtr,
 				int * yPtr);
 #endif
 #ifndef Tk_GetScrollInfo_TCL_DECLARED
 #define Tk_GetScrollInfo_TCL_DECLARED
 /* 108 */
-EXTERN int		Tk_GetScrollInfo (Tcl_Interp * interp, int argc, 
-				CONST84 char ** argv, double * dblPtr, 
+EXTERN int		Tk_GetScrollInfo (Tcl_Interp * interp, int argc,
+				CONST84 char ** argv, double * dblPtr,
 				int * intPtr);
 #endif
 #ifndef Tk_GetScreenMM_TCL_DECLARED
 #define Tk_GetScreenMM_TCL_DECLARED
 /* 109 */
-EXTERN int		Tk_GetScreenMM (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str, double * doublePtr);
+EXTERN int		Tk_GetScreenMM (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str, double * doublePtr);
 #endif
 #ifndef Tk_GetSelection_TCL_DECLARED
 #define Tk_GetSelection_TCL_DECLARED
 /* 110 */
-EXTERN int		Tk_GetSelection (Tcl_Interp * interp, 
-				Tk_Window tkwin, Atom selection, Atom target, 
+EXTERN int		Tk_GetSelection (Tcl_Interp * interp,
+				Tk_Window tkwin, Atom selection, Atom target,
 				Tk_GetSelProc * proc, ClientData clientData);
 #endif
 #ifndef Tk_GetUid_TCL_DECLARED
 #define Tk_GetUid_TCL_DECLARED
 /* 111 */
-EXTERN Tk_Uid		Tk_GetUid (CONST char * str);
+EXTERN Tk_Uid		Tk_GetUid (const char * str);
 #endif
 #ifndef Tk_GetVisual_TCL_DECLARED
 #define Tk_GetVisual_TCL_DECLARED
 /* 112 */
-EXTERN Visual *		Tk_GetVisual (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * str, int * depthPtr, 
+EXTERN Visual *		Tk_GetVisual (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * str, int * depthPtr,
 				Colormap * colormapPtr);
 #endif
 #ifndef Tk_GetVRootGeometry_TCL_DECLARED
 #define Tk_GetVRootGeometry_TCL_DECLARED
 /* 113 */
-EXTERN void		Tk_GetVRootGeometry (Tk_Window tkwin, int * xPtr, 
+EXTERN void		Tk_GetVRootGeometry (Tk_Window tkwin, int * xPtr,
 				int * yPtr, int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_Grab_TCL_DECLARED
 #define Tk_Grab_TCL_DECLARED
 /* 114 */
-EXTERN int		Tk_Grab (Tcl_Interp * interp, Tk_Window tkwin, 
+EXTERN int		Tk_Grab (Tcl_Interp * interp, Tk_Window tkwin,
 				int grabGlobal);
 #endif
 #ifndef Tk_HandleEvent_TCL_DECLARED
@@ -761,8 +761,8 @@ EXTERN Tk_Window	Tk_IdToWindow (Display * display, Window window);
 #ifndef Tk_ImageChanged_TCL_DECLARED
 #define Tk_ImageChanged_TCL_DECLARED
 /* 117 */
-EXTERN void		Tk_ImageChanged (Tk_ImageMaster master, int x, int y, 
-				int width, int height, int imageWidth, 
+EXTERN void		Tk_ImageChanged (Tk_ImageMaster master, int x, int y,
+				int width, int height, int imageWidth,
 				int imageHeight);
 #endif
 #ifndef Tk_Init_TCL_DECLARED
@@ -773,19 +773,19 @@ EXTERN int		Tk_Init (Tcl_Interp * interp);
 #ifndef Tk_InternAtom_TCL_DECLARED
 #define Tk_InternAtom_TCL_DECLARED
 /* 119 */
-EXTERN Atom		Tk_InternAtom (Tk_Window tkwin, CONST char * name);
+EXTERN Atom		Tk_InternAtom (Tk_Window tkwin, const char * name);
 #endif
 #ifndef Tk_IntersectTextLayout_TCL_DECLARED
 #define Tk_IntersectTextLayout_TCL_DECLARED
 /* 120 */
-EXTERN int		Tk_IntersectTextLayout (Tk_TextLayout layout, int x, 
+EXTERN int		Tk_IntersectTextLayout (Tk_TextLayout layout, int x,
 				int y, int width, int height);
 #endif
 #ifndef Tk_MaintainGeometry_TCL_DECLARED
 #define Tk_MaintainGeometry_TCL_DECLARED
 /* 121 */
-EXTERN void		Tk_MaintainGeometry (Tk_Window slave, 
-				Tk_Window master, int x, int y, int width, 
+EXTERN void		Tk_MaintainGeometry (Tk_Window slave,
+				Tk_Window master, int x, int y, int width,
 				int height);
 #endif
 #ifndef Tk_MainWindow_TCL_DECLARED
@@ -801,8 +801,8 @@ EXTERN void		Tk_MakeWindowExist (Tk_Window tkwin);
 #ifndef Tk_ManageGeometry_TCL_DECLARED
 #define Tk_ManageGeometry_TCL_DECLARED
 /* 124 */
-EXTERN void		Tk_ManageGeometry (Tk_Window tkwin, 
-				CONST Tk_GeomMgr * mgrPtr, 
+EXTERN void		Tk_ManageGeometry (Tk_Window tkwin,
+				const Tk_GeomMgr * mgrPtr,
 				ClientData clientData);
 #endif
 #ifndef Tk_MapWindow_TCL_DECLARED
@@ -813,14 +813,14 @@ EXTERN void		Tk_MapWindow (Tk_Window tkwin);
 #ifndef Tk_MeasureChars_TCL_DECLARED
 #define Tk_MeasureChars_TCL_DECLARED
 /* 126 */
-EXTERN int		Tk_MeasureChars (Tk_Font tkfont, CONST char * source, 
-				int numBytes, int maxPixels, int flags, 
+EXTERN int		Tk_MeasureChars (Tk_Font tkfont, const char * source,
+				int numBytes, int maxPixels, int flags,
 				int * lengthPtr);
 #endif
 #ifndef Tk_MoveResizeWindow_TCL_DECLARED
 #define Tk_MoveResizeWindow_TCL_DECLARED
 /* 127 */
-EXTERN void		Tk_MoveResizeWindow (Tk_Window tkwin, int x, int y, 
+EXTERN void		Tk_MoveResizeWindow (Tk_Window tkwin, int x, int y,
 				int width, int height);
 #endif
 #ifndef Tk_MoveWindow_TCL_DECLARED
@@ -846,7 +846,7 @@ EXTERN CONST84_RETURN char * Tk_NameOfAnchor (Tk_Anchor anchor);
 #ifndef Tk_NameOfBitmap_TCL_DECLARED
 #define Tk_NameOfBitmap_TCL_DECLARED
 /* 132 */
-EXTERN CONST84_RETURN char * Tk_NameOfBitmap (Display * display, 
+EXTERN CONST84_RETURN char * Tk_NameOfBitmap (Display * display,
 				Pixmap bitmap);
 #endif
 #ifndef Tk_NameOfCapStyle_TCL_DECLARED
@@ -862,7 +862,7 @@ EXTERN CONST84_RETURN char * Tk_NameOfColor (XColor * colorPtr);
 #ifndef Tk_NameOfCursor_TCL_DECLARED
 #define Tk_NameOfCursor_TCL_DECLARED
 /* 135 */
-EXTERN CONST84_RETURN char * Tk_NameOfCursor (Display * display, 
+EXTERN CONST84_RETURN char * Tk_NameOfCursor (Display * display,
 				Tk_Cursor cursor);
 #endif
 #ifndef Tk_NameOfFont_TCL_DECLARED
@@ -893,42 +893,42 @@ EXTERN CONST84_RETURN char * Tk_NameOfRelief (int relief);
 #ifndef Tk_NameToWindow_TCL_DECLARED
 #define Tk_NameToWindow_TCL_DECLARED
 /* 141 */
-EXTERN Tk_Window	Tk_NameToWindow (Tcl_Interp * interp, 
-				CONST char * pathName, Tk_Window tkwin);
+EXTERN Tk_Window	Tk_NameToWindow (Tcl_Interp * interp,
+				const char * pathName, Tk_Window tkwin);
 #endif
 #ifndef Tk_OwnSelection_TCL_DECLARED
 #define Tk_OwnSelection_TCL_DECLARED
 /* 142 */
-EXTERN void		Tk_OwnSelection (Tk_Window tkwin, Atom selection, 
+EXTERN void		Tk_OwnSelection (Tk_Window tkwin, Atom selection,
 				Tk_LostSelProc * proc, ClientData clientData);
 #endif
 #ifndef Tk_ParseArgv_TCL_DECLARED
 #define Tk_ParseArgv_TCL_DECLARED
 /* 143 */
-EXTERN int		Tk_ParseArgv (Tcl_Interp * interp, Tk_Window tkwin, 
-				int * argcPtr, CONST84 char ** argv, 
+EXTERN int		Tk_ParseArgv (Tcl_Interp * interp, Tk_Window tkwin,
+				int * argcPtr, CONST84 char ** argv,
 				Tk_ArgvInfo * argTable, int flags);
 #endif
 #ifndef Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
 #define Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
 /* 144 */
-EXTERN void		Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
+EXTERN void		Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
 				int width, int height);
 #endif
 #ifndef Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
 #define Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
 /* 145 */
 EXTERN void		Tk_PhotoPutZoomedBlock_NoComposite (
-				Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
-				int width, int height, int zoomX, int zoomY, 
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY);
 #endif
 #ifndef Tk_PhotoGetImage_TCL_DECLARED
 #define Tk_PhotoGetImage_TCL_DECLARED
 /* 146 */
-EXTERN int		Tk_PhotoGetImage (Tk_PhotoHandle handle, 
+EXTERN int		Tk_PhotoGetImage (Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock * blockPtr);
 #endif
 #ifndef Tk_PhotoBlank_TCL_DECLARED
@@ -939,19 +939,19 @@ EXTERN void		Tk_PhotoBlank (Tk_PhotoHandle handle);
 #ifndef Tk_PhotoExpand_Panic_TCL_DECLARED
 #define Tk_PhotoExpand_Panic_TCL_DECLARED
 /* 148 */
-EXTERN void		Tk_PhotoExpand_Panic (Tk_PhotoHandle handle, 
+EXTERN void		Tk_PhotoExpand_Panic (Tk_PhotoHandle handle,
 				int width, int height);
 #endif
 #ifndef Tk_PhotoGetSize_TCL_DECLARED
 #define Tk_PhotoGetSize_TCL_DECLARED
 /* 149 */
-EXTERN void		Tk_PhotoGetSize (Tk_PhotoHandle handle, 
+EXTERN void		Tk_PhotoGetSize (Tk_PhotoHandle handle,
 				int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_PhotoSetSize_Panic_TCL_DECLARED
 #define Tk_PhotoSetSize_Panic_TCL_DECLARED
 /* 150 */
-EXTERN void		Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle, 
+EXTERN void		Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle,
 				int width, int height);
 #endif
 #ifndef Tk_PointToChar_TCL_DECLARED
@@ -962,45 +962,45 @@ EXTERN int		Tk_PointToChar (Tk_TextLayout layout, int x, int y);
 #ifndef Tk_PostscriptFontName_TCL_DECLARED
 #define Tk_PostscriptFontName_TCL_DECLARED
 /* 152 */
-EXTERN int		Tk_PostscriptFontName (Tk_Font tkfont, 
+EXTERN int		Tk_PostscriptFontName (Tk_Font tkfont,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef Tk_PreserveColormap_TCL_DECLARED
 #define Tk_PreserveColormap_TCL_DECLARED
 /* 153 */
-EXTERN void		Tk_PreserveColormap (Display * display, 
+EXTERN void		Tk_PreserveColormap (Display * display,
 				Colormap colormap);
 #endif
 #ifndef Tk_QueueWindowEvent_TCL_DECLARED
 #define Tk_QueueWindowEvent_TCL_DECLARED
 /* 154 */
-EXTERN void		Tk_QueueWindowEvent (XEvent * eventPtr, 
+EXTERN void		Tk_QueueWindowEvent (XEvent * eventPtr,
 				Tcl_QueuePosition position);
 #endif
 #ifndef Tk_RedrawImage_TCL_DECLARED
 #define Tk_RedrawImage_TCL_DECLARED
 /* 155 */
-EXTERN void		Tk_RedrawImage (Tk_Image image, int imageX, 
-				int imageY, int width, int height, 
-				Drawable drawable, int drawableX, 
+EXTERN void		Tk_RedrawImage (Tk_Image image, int imageX,
+				int imageY, int width, int height,
+				Drawable drawable, int drawableX,
 				int drawableY);
 #endif
 #ifndef Tk_ResizeWindow_TCL_DECLARED
 #define Tk_ResizeWindow_TCL_DECLARED
 /* 156 */
-EXTERN void		Tk_ResizeWindow (Tk_Window tkwin, int width, 
+EXTERN void		Tk_ResizeWindow (Tk_Window tkwin, int width,
 				int height);
 #endif
 #ifndef Tk_RestackWindow_TCL_DECLARED
 #define Tk_RestackWindow_TCL_DECLARED
 /* 157 */
-EXTERN int		Tk_RestackWindow (Tk_Window tkwin, int aboveBelow, 
+EXTERN int		Tk_RestackWindow (Tk_Window tkwin, int aboveBelow,
 				Tk_Window other);
 #endif
 #ifndef Tk_RestrictEvents_TCL_DECLARED
 #define Tk_RestrictEvents_TCL_DECLARED
 /* 158 */
-EXTERN Tk_RestrictProc * Tk_RestrictEvents (Tk_RestrictProc * proc, 
+EXTERN Tk_RestrictProc * Tk_RestrictEvents (Tk_RestrictProc * proc,
 				ClientData arg, ClientData * prevArgPtr);
 #endif
 #ifndef Tk_SafeInit_TCL_DECLARED
@@ -1011,23 +1011,23 @@ EXTERN int		Tk_SafeInit (Tcl_Interp * interp);
 #ifndef Tk_SetAppName_TCL_DECLARED
 #define Tk_SetAppName_TCL_DECLARED
 /* 160 */
-EXTERN CONST char *	Tk_SetAppName (Tk_Window tkwin, CONST char * name);
+EXTERN const char *	Tk_SetAppName (Tk_Window tkwin, const char * name);
 #endif
 #ifndef Tk_SetBackgroundFromBorder_TCL_DECLARED
 #define Tk_SetBackgroundFromBorder_TCL_DECLARED
 /* 161 */
-EXTERN void		Tk_SetBackgroundFromBorder (Tk_Window tkwin, 
+EXTERN void		Tk_SetBackgroundFromBorder (Tk_Window tkwin,
 				Tk_3DBorder border);
 #endif
 #ifndef Tk_SetClass_TCL_DECLARED
 #define Tk_SetClass_TCL_DECLARED
 /* 162 */
-EXTERN void		Tk_SetClass (Tk_Window tkwin, CONST char * className);
+EXTERN void		Tk_SetClass (Tk_Window tkwin, const char * className);
 #endif
 #ifndef Tk_SetGrid_TCL_DECLARED
 #define Tk_SetGrid_TCL_DECLARED
 /* 163 */
-EXTERN void		Tk_SetGrid (Tk_Window tkwin, int reqWidth, 
+EXTERN void		Tk_SetGrid (Tk_Window tkwin, int reqWidth,
 				int reqHeight, int gridWidth, int gridHeight);
 #endif
 #ifndef Tk_SetInternalBorder_TCL_DECLARED
@@ -1038,19 +1038,19 @@ EXTERN void		Tk_SetInternalBorder (Tk_Window tkwin, int width);
 #ifndef Tk_SetWindowBackground_TCL_DECLARED
 #define Tk_SetWindowBackground_TCL_DECLARED
 /* 165 */
-EXTERN void		Tk_SetWindowBackground (Tk_Window tkwin, 
+EXTERN void		Tk_SetWindowBackground (Tk_Window tkwin,
 				unsigned long pixel);
 #endif
 #ifndef Tk_SetWindowBackgroundPixmap_TCL_DECLARED
 #define Tk_SetWindowBackgroundPixmap_TCL_DECLARED
 /* 166 */
-EXTERN void		Tk_SetWindowBackgroundPixmap (Tk_Window tkwin, 
+EXTERN void		Tk_SetWindowBackgroundPixmap (Tk_Window tkwin,
 				Pixmap pixmap);
 #endif
 #ifndef Tk_SetWindowBorder_TCL_DECLARED
 #define Tk_SetWindowBorder_TCL_DECLARED
 /* 167 */
-EXTERN void		Tk_SetWindowBorder (Tk_Window tkwin, 
+EXTERN void		Tk_SetWindowBorder (Tk_Window tkwin,
 				unsigned long pixel);
 #endif
 #ifndef Tk_SetWindowBorderWidth_TCL_DECLARED
@@ -1061,31 +1061,31 @@ EXTERN void		Tk_SetWindowBorderWidth (Tk_Window tkwin, int width);
 #ifndef Tk_SetWindowBorderPixmap_TCL_DECLARED
 #define Tk_SetWindowBorderPixmap_TCL_DECLARED
 /* 169 */
-EXTERN void		Tk_SetWindowBorderPixmap (Tk_Window tkwin, 
+EXTERN void		Tk_SetWindowBorderPixmap (Tk_Window tkwin,
 				Pixmap pixmap);
 #endif
 #ifndef Tk_SetWindowColormap_TCL_DECLARED
 #define Tk_SetWindowColormap_TCL_DECLARED
 /* 170 */
-EXTERN void		Tk_SetWindowColormap (Tk_Window tkwin, 
+EXTERN void		Tk_SetWindowColormap (Tk_Window tkwin,
 				Colormap colormap);
 #endif
 #ifndef Tk_SetWindowVisual_TCL_DECLARED
 #define Tk_SetWindowVisual_TCL_DECLARED
 /* 171 */
-EXTERN int		Tk_SetWindowVisual (Tk_Window tkwin, Visual * visual, 
+EXTERN int		Tk_SetWindowVisual (Tk_Window tkwin, Visual * visual,
 				int depth, Colormap colormap);
 #endif
 #ifndef Tk_SizeOfBitmap_TCL_DECLARED
 #define Tk_SizeOfBitmap_TCL_DECLARED
 /* 172 */
-EXTERN void		Tk_SizeOfBitmap (Display * display, Pixmap bitmap, 
+EXTERN void		Tk_SizeOfBitmap (Display * display, Pixmap bitmap,
 				int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_SizeOfImage_TCL_DECLARED
 #define Tk_SizeOfImage_TCL_DECLARED
 /* 173 */
-EXTERN void		Tk_SizeOfImage (Tk_Image image, int * widthPtr, 
+EXTERN void		Tk_SizeOfImage (Tk_Image image, int * widthPtr,
 				int * heightPtr);
 #endif
 #ifndef Tk_StrictMotif_TCL_DECLARED
@@ -1096,13 +1096,13 @@ EXTERN int		Tk_StrictMotif (Tk_Window tkwin);
 #ifndef Tk_TextLayoutToPostscript_TCL_DECLARED
 #define Tk_TextLayoutToPostscript_TCL_DECLARED
 /* 175 */
-EXTERN void		Tk_TextLayoutToPostscript (Tcl_Interp * interp, 
+EXTERN void		Tk_TextLayoutToPostscript (Tcl_Interp * interp,
 				Tk_TextLayout layout);
 #endif
 #ifndef Tk_TextWidth_TCL_DECLARED
 #define Tk_TextWidth_TCL_DECLARED
 /* 176 */
-EXTERN int		Tk_TextWidth (Tk_Font font, CONST char * str, 
+EXTERN int		Tk_TextWidth (Tk_Font font, const char * str,
 				int numBytes);
 #endif
 #ifndef Tk_UndefineCursor_TCL_DECLARED
@@ -1113,17 +1113,17 @@ EXTERN void		Tk_UndefineCursor (Tk_Window window);
 #ifndef Tk_UnderlineChars_TCL_DECLARED
 #define Tk_UnderlineChars_TCL_DECLARED
 /* 178 */
-EXTERN void		Tk_UnderlineChars (Display * display, 
-				Drawable drawable, GC gc, Tk_Font tkfont, 
-				CONST char * source, int x, int y, 
+EXTERN void		Tk_UnderlineChars (Display * display,
+				Drawable drawable, GC gc, Tk_Font tkfont,
+				const char * source, int x, int y,
 				int firstByte, int lastByte);
 #endif
 #ifndef Tk_UnderlineTextLayout_TCL_DECLARED
 #define Tk_UnderlineTextLayout_TCL_DECLARED
 /* 179 */
-EXTERN void		Tk_UnderlineTextLayout (Display * display, 
-				Drawable drawable, GC gc, 
-				Tk_TextLayout layout, int x, int y, 
+EXTERN void		Tk_UnderlineTextLayout (Display * display,
+				Drawable drawable, GC gc,
+				Tk_TextLayout layout, int x, int y,
 				int underline);
 #endif
 #ifndef Tk_Ungrab_TCL_DECLARED
@@ -1134,7 +1134,7 @@ EXTERN void		Tk_Ungrab (Tk_Window tkwin);
 #ifndef Tk_UnmaintainGeometry_TCL_DECLARED
 #define Tk_UnmaintainGeometry_TCL_DECLARED
 /* 181 */
-EXTERN void		Tk_UnmaintainGeometry (Tk_Window slave, 
+EXTERN void		Tk_UnmaintainGeometry (Tk_Window slave,
 				Tk_Window master);
 #endif
 #ifndef Tk_UnmapWindow_TCL_DECLARED
@@ -1150,44 +1150,44 @@ EXTERN void		Tk_UnsetGrid (Tk_Window tkwin);
 #ifndef Tk_UpdatePointer_TCL_DECLARED
 #define Tk_UpdatePointer_TCL_DECLARED
 /* 184 */
-EXTERN void		Tk_UpdatePointer (Tk_Window tkwin, int x, int y, 
+EXTERN void		Tk_UpdatePointer (Tk_Window tkwin, int x, int y,
 				int state);
 #endif
 #ifndef Tk_AllocBitmapFromObj_TCL_DECLARED
 #define Tk_AllocBitmapFromObj_TCL_DECLARED
 /* 185 */
-EXTERN Pixmap		Tk_AllocBitmapFromObj (Tcl_Interp * interp, 
+EXTERN Pixmap		Tk_AllocBitmapFromObj (Tcl_Interp * interp,
 				Tk_Window tkwin, Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_Alloc3DBorderFromObj_TCL_DECLARED
 #define Tk_Alloc3DBorderFromObj_TCL_DECLARED
 /* 186 */
-EXTERN Tk_3DBorder	Tk_Alloc3DBorderFromObj (Tcl_Interp * interp, 
+EXTERN Tk_3DBorder	Tk_Alloc3DBorderFromObj (Tcl_Interp * interp,
 				Tk_Window tkwin, Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_AllocColorFromObj_TCL_DECLARED
 #define Tk_AllocColorFromObj_TCL_DECLARED
 /* 187 */
-EXTERN XColor *		Tk_AllocColorFromObj (Tcl_Interp * interp, 
+EXTERN XColor *		Tk_AllocColorFromObj (Tcl_Interp * interp,
 				Tk_Window tkwin, Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_AllocCursorFromObj_TCL_DECLARED
 #define Tk_AllocCursorFromObj_TCL_DECLARED
 /* 188 */
-EXTERN Tk_Cursor	Tk_AllocCursorFromObj (Tcl_Interp * interp, 
+EXTERN Tk_Cursor	Tk_AllocCursorFromObj (Tcl_Interp * interp,
 				Tk_Window tkwin, Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_AllocFontFromObj_TCL_DECLARED
 #define Tk_AllocFontFromObj_TCL_DECLARED
 /* 189 */
-EXTERN Tk_Font		Tk_AllocFontFromObj (Tcl_Interp * interp, 
+EXTERN Tk_Font		Tk_AllocFontFromObj (Tcl_Interp * interp,
 				Tk_Window tkwin, Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_CreateOptionTable_TCL_DECLARED
 #define Tk_CreateOptionTable_TCL_DECLARED
 /* 190 */
-EXTERN Tk_OptionTable	Tk_CreateOptionTable (Tcl_Interp * interp, 
-				CONST Tk_OptionSpec * templatePtr);
+EXTERN Tk_OptionTable	Tk_CreateOptionTable (Tcl_Interp * interp,
+				const Tk_OptionSpec * templatePtr);
 #endif
 #ifndef Tk_DeleteOptionTable_TCL_DECLARED
 #define Tk_DeleteOptionTable_TCL_DECLARED
@@ -1197,25 +1197,25 @@ EXTERN void		Tk_DeleteOptionTable (Tk_OptionTable optionTable);
 #ifndef Tk_Free3DBorderFromObj_TCL_DECLARED
 #define Tk_Free3DBorderFromObj_TCL_DECLARED
 /* 192 */
-EXTERN void		Tk_Free3DBorderFromObj (Tk_Window tkwin, 
+EXTERN void		Tk_Free3DBorderFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_FreeBitmapFromObj_TCL_DECLARED
 #define Tk_FreeBitmapFromObj_TCL_DECLARED
 /* 193 */
-EXTERN void		Tk_FreeBitmapFromObj (Tk_Window tkwin, 
+EXTERN void		Tk_FreeBitmapFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_FreeColorFromObj_TCL_DECLARED
 #define Tk_FreeColorFromObj_TCL_DECLARED
 /* 194 */
-EXTERN void		Tk_FreeColorFromObj (Tk_Window tkwin, 
+EXTERN void		Tk_FreeColorFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_FreeConfigOptions_TCL_DECLARED
 #define Tk_FreeConfigOptions_TCL_DECLARED
 /* 195 */
-EXTERN void		Tk_FreeConfigOptions (char * recordPtr, 
+EXTERN void		Tk_FreeConfigOptions (char * recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
 #endif
 #ifndef Tk_FreeSavedOptions_TCL_DECLARED
@@ -1226,104 +1226,104 @@ EXTERN void		Tk_FreeSavedOptions (Tk_SavedOptions * savePtr);
 #ifndef Tk_FreeCursorFromObj_TCL_DECLARED
 #define Tk_FreeCursorFromObj_TCL_DECLARED
 /* 197 */
-EXTERN void		Tk_FreeCursorFromObj (Tk_Window tkwin, 
+EXTERN void		Tk_FreeCursorFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_FreeFontFromObj_TCL_DECLARED
 #define Tk_FreeFontFromObj_TCL_DECLARED
 /* 198 */
-EXTERN void		Tk_FreeFontFromObj (Tk_Window tkwin, 
+EXTERN void		Tk_FreeFontFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_Get3DBorderFromObj_TCL_DECLARED
 #define Tk_Get3DBorderFromObj_TCL_DECLARED
 /* 199 */
-EXTERN Tk_3DBorder	Tk_Get3DBorderFromObj (Tk_Window tkwin, 
+EXTERN Tk_3DBorder	Tk_Get3DBorderFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_GetAnchorFromObj_TCL_DECLARED
 #define Tk_GetAnchorFromObj_TCL_DECLARED
 /* 200 */
-EXTERN int		Tk_GetAnchorFromObj (Tcl_Interp * interp, 
+EXTERN int		Tk_GetAnchorFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Tk_Anchor * anchorPtr);
 #endif
 #ifndef Tk_GetBitmapFromObj_TCL_DECLARED
 #define Tk_GetBitmapFromObj_TCL_DECLARED
 /* 201 */
-EXTERN Pixmap		Tk_GetBitmapFromObj (Tk_Window tkwin, 
+EXTERN Pixmap		Tk_GetBitmapFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_GetColorFromObj_TCL_DECLARED
 #define Tk_GetColorFromObj_TCL_DECLARED
 /* 202 */
-EXTERN XColor *		Tk_GetColorFromObj (Tk_Window tkwin, 
+EXTERN XColor *		Tk_GetColorFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_GetCursorFromObj_TCL_DECLARED
 #define Tk_GetCursorFromObj_TCL_DECLARED
 /* 203 */
-EXTERN Tk_Cursor	Tk_GetCursorFromObj (Tk_Window tkwin, 
+EXTERN Tk_Cursor	Tk_GetCursorFromObj (Tk_Window tkwin,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_GetOptionInfo_TCL_DECLARED
 #define Tk_GetOptionInfo_TCL_DECLARED
 /* 204 */
-EXTERN Tcl_Obj *	Tk_GetOptionInfo (Tcl_Interp * interp, 
-				char * recordPtr, Tk_OptionTable optionTable, 
+EXTERN Tcl_Obj *	Tk_GetOptionInfo (Tcl_Interp * interp,
+				char * recordPtr, Tk_OptionTable optionTable,
 				Tcl_Obj * namePtr, Tk_Window tkwin);
 #endif
 #ifndef Tk_GetOptionValue_TCL_DECLARED
 #define Tk_GetOptionValue_TCL_DECLARED
 /* 205 */
-EXTERN Tcl_Obj *	Tk_GetOptionValue (Tcl_Interp * interp, 
-				char * recordPtr, Tk_OptionTable optionTable, 
+EXTERN Tcl_Obj *	Tk_GetOptionValue (Tcl_Interp * interp,
+				char * recordPtr, Tk_OptionTable optionTable,
 				Tcl_Obj * namePtr, Tk_Window tkwin);
 #endif
 #ifndef Tk_GetJustifyFromObj_TCL_DECLARED
 #define Tk_GetJustifyFromObj_TCL_DECLARED
 /* 206 */
-EXTERN int		Tk_GetJustifyFromObj (Tcl_Interp * interp, 
+EXTERN int		Tk_GetJustifyFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Tk_Justify * justifyPtr);
 #endif
 #ifndef Tk_GetMMFromObj_TCL_DECLARED
 #define Tk_GetMMFromObj_TCL_DECLARED
 /* 207 */
-EXTERN int		Tk_GetMMFromObj (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tcl_Obj * objPtr, 
+EXTERN int		Tk_GetMMFromObj (Tcl_Interp * interp,
+				Tk_Window tkwin, Tcl_Obj * objPtr,
 				double * doublePtr);
 #endif
 #ifndef Tk_GetPixelsFromObj_TCL_DECLARED
 #define Tk_GetPixelsFromObj_TCL_DECLARED
 /* 208 */
-EXTERN int		Tk_GetPixelsFromObj (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tcl_Obj * objPtr, 
+EXTERN int		Tk_GetPixelsFromObj (Tcl_Interp * interp,
+				Tk_Window tkwin, Tcl_Obj * objPtr,
 				int * intPtr);
 #endif
 #ifndef Tk_GetReliefFromObj_TCL_DECLARED
 #define Tk_GetReliefFromObj_TCL_DECLARED
 /* 209 */
-EXTERN int		Tk_GetReliefFromObj (Tcl_Interp * interp, 
+EXTERN int		Tk_GetReliefFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, int * resultPtr);
 #endif
 #ifndef Tk_GetScrollInfoObj_TCL_DECLARED
 #define Tk_GetScrollInfoObj_TCL_DECLARED
 /* 210 */
-EXTERN int		Tk_GetScrollInfoObj (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], double * dblPtr, 
+EXTERN int		Tk_GetScrollInfoObj (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], double * dblPtr,
 				int * intPtr);
 #endif
 #ifndef Tk_InitOptions_TCL_DECLARED
 #define Tk_InitOptions_TCL_DECLARED
 /* 211 */
-EXTERN int		Tk_InitOptions (Tcl_Interp * interp, 
-				char * recordPtr, Tk_OptionTable optionToken, 
+EXTERN int		Tk_InitOptions (Tcl_Interp * interp,
+				char * recordPtr, Tk_OptionTable optionToken,
 				Tk_Window tkwin);
 #endif
 #ifndef Tk_MainEx_TCL_DECLARED
 #define Tk_MainEx_TCL_DECLARED
 /* 212 */
-EXTERN void		Tk_MainEx (int argc, char ** argv, 
-				Tcl_AppInitProc * appInitProc, 
+EXTERN void		Tk_MainEx (int argc, char ** argv,
+				Tcl_AppInitProc * appInitProc,
 				Tcl_Interp * interp);
 #endif
 #ifndef Tk_RestoreSavedOptions_TCL_DECLARED
@@ -1334,9 +1334,9 @@ EXTERN void		Tk_RestoreSavedOptions (Tk_SavedOptions * savePtr);
 #ifndef Tk_SetOptions_TCL_DECLARED
 #define Tk_SetOptions_TCL_DECLARED
 /* 214 */
-EXTERN int		Tk_SetOptions (Tcl_Interp * interp, char * recordPtr, 
-				Tk_OptionTable optionTable, int objc, 
-				Tcl_Obj *CONST objv[], Tk_Window tkwin, 
+EXTERN int		Tk_SetOptions (Tcl_Interp * interp, char * recordPtr,
+				Tk_OptionTable optionTable, int objc,
+				Tcl_Obj *const objv[], Tk_Window tkwin,
 				Tk_SavedOptions * savePtr, int * maskPtr);
 #endif
 #ifndef Tk_InitConsoleChannels_TCL_DECLARED
@@ -1352,7 +1352,7 @@ EXTERN int		Tk_CreateConsoleWindow (Tcl_Interp * interp);
 #ifndef Tk_CreateSmoothMethod_TCL_DECLARED
 #define Tk_CreateSmoothMethod_TCL_DECLARED
 /* 217 */
-EXTERN void		Tk_CreateSmoothMethod (Tcl_Interp * interp, 
+EXTERN void		Tk_CreateSmoothMethod (Tcl_Interp * interp,
 				Tk_SmoothMethod * method);
 #endif
 /* Slot 218 is reserved */
@@ -1360,7 +1360,7 @@ EXTERN void		Tk_CreateSmoothMethod (Tcl_Interp * interp,
 #ifndef Tk_GetDash_TCL_DECLARED
 #define Tk_GetDash_TCL_DECLARED
 /* 220 */
-EXTERN int		Tk_GetDash (Tcl_Interp * interp, CONST char * value, 
+EXTERN int		Tk_GetDash (Tcl_Interp * interp, const char * value,
 				Tk_Dash * dash);
 #endif
 #ifndef Tk_CreateOutline_TCL_DECLARED
@@ -1371,32 +1371,32 @@ EXTERN void		Tk_CreateOutline (Tk_Outline * outline);
 #ifndef Tk_DeleteOutline_TCL_DECLARED
 #define Tk_DeleteOutline_TCL_DECLARED
 /* 222 */
-EXTERN void		Tk_DeleteOutline (Display * display, 
+EXTERN void		Tk_DeleteOutline (Display * display,
 				Tk_Outline * outline);
 #endif
 #ifndef Tk_ConfigOutlineGC_TCL_DECLARED
 #define Tk_ConfigOutlineGC_TCL_DECLARED
 /* 223 */
-EXTERN int		Tk_ConfigOutlineGC (XGCValues * gcValues, 
-				Tk_Canvas canvas, Tk_Item * item, 
+EXTERN int		Tk_ConfigOutlineGC (XGCValues * gcValues,
+				Tk_Canvas canvas, Tk_Item * item,
 				Tk_Outline * outline);
 #endif
 #ifndef Tk_ChangeOutlineGC_TCL_DECLARED
 #define Tk_ChangeOutlineGC_TCL_DECLARED
 /* 224 */
-EXTERN int		Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item * item, 
+EXTERN int		Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item * item,
 				Tk_Outline * outline);
 #endif
 #ifndef Tk_ResetOutlineGC_TCL_DECLARED
 #define Tk_ResetOutlineGC_TCL_DECLARED
 /* 225 */
-EXTERN int		Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item * item, 
+EXTERN int		Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item * item,
 				Tk_Outline * outline);
 #endif
 #ifndef Tk_CanvasPsOutline_TCL_DECLARED
 #define Tk_CanvasPsOutline_TCL_DECLARED
 /* 226 */
-EXTERN int		Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item * item, 
+EXTERN int		Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item * item,
 				Tk_Outline * outline);
 #endif
 #ifndef Tk_SetTSOrigin_TCL_DECLARED
@@ -1407,62 +1407,62 @@ EXTERN void		Tk_SetTSOrigin (Tk_Window tkwin, GC gc, int x, int y);
 #ifndef Tk_CanvasGetCoordFromObj_TCL_DECLARED
 #define Tk_CanvasGetCoordFromObj_TCL_DECLARED
 /* 228 */
-EXTERN int		Tk_CanvasGetCoordFromObj (Tcl_Interp * interp, 
-				Tk_Canvas canvas, Tcl_Obj * obj, 
+EXTERN int		Tk_CanvasGetCoordFromObj (Tcl_Interp * interp,
+				Tk_Canvas canvas, Tcl_Obj * obj,
 				double * doublePtr);
 #endif
 #ifndef Tk_CanvasSetOffset_TCL_DECLARED
 #define Tk_CanvasSetOffset_TCL_DECLARED
 /* 229 */
-EXTERN void		Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc, 
+EXTERN void		Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc,
 				Tk_TSOffset * offset);
 #endif
 #ifndef Tk_DitherPhoto_TCL_DECLARED
 #define Tk_DitherPhoto_TCL_DECLARED
 /* 230 */
-EXTERN void		Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y, 
+EXTERN void		Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y,
 				int width, int height);
 #endif
 #ifndef Tk_PostscriptBitmap_TCL_DECLARED
 #define Tk_PostscriptBitmap_TCL_DECLARED
 /* 231 */
-EXTERN int		Tk_PostscriptBitmap (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tk_PostscriptInfo psInfo, 
-				Pixmap bitmap, int startX, int startY, 
+EXTERN int		Tk_PostscriptBitmap (Tcl_Interp * interp,
+				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
+				Pixmap bitmap, int startX, int startY,
 				int width, int height);
 #endif
 #ifndef Tk_PostscriptColor_TCL_DECLARED
 #define Tk_PostscriptColor_TCL_DECLARED
 /* 232 */
-EXTERN int		Tk_PostscriptColor (Tcl_Interp * interp, 
+EXTERN int		Tk_PostscriptColor (Tcl_Interp * interp,
 				Tk_PostscriptInfo psInfo, XColor * colorPtr);
 #endif
 #ifndef Tk_PostscriptFont_TCL_DECLARED
 #define Tk_PostscriptFont_TCL_DECLARED
 /* 233 */
-EXTERN int		Tk_PostscriptFont (Tcl_Interp * interp, 
+EXTERN int		Tk_PostscriptFont (Tcl_Interp * interp,
 				Tk_PostscriptInfo psInfo, Tk_Font font);
 #endif
 #ifndef Tk_PostscriptImage_TCL_DECLARED
 #define Tk_PostscriptImage_TCL_DECLARED
 /* 234 */
-EXTERN int		Tk_PostscriptImage (Tk_Image image, 
-				Tcl_Interp * interp, Tk_Window tkwin, 
-				Tk_PostscriptInfo psinfo, int x, int y, 
+EXTERN int		Tk_PostscriptImage (Tk_Image image,
+				Tcl_Interp * interp, Tk_Window tkwin,
+				Tk_PostscriptInfo psinfo, int x, int y,
 				int width, int height, int prepass);
 #endif
 #ifndef Tk_PostscriptPath_TCL_DECLARED
 #define Tk_PostscriptPath_TCL_DECLARED
 /* 235 */
-EXTERN void		Tk_PostscriptPath (Tcl_Interp * interp, 
-				Tk_PostscriptInfo psInfo, double * coordPtr, 
+EXTERN void		Tk_PostscriptPath (Tcl_Interp * interp,
+				Tk_PostscriptInfo psInfo, double * coordPtr,
 				int numPoints);
 #endif
 #ifndef Tk_PostscriptStipple_TCL_DECLARED
 #define Tk_PostscriptStipple_TCL_DECLARED
 /* 236 */
-EXTERN int		Tk_PostscriptStipple (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tk_PostscriptInfo psInfo, 
+EXTERN int		Tk_PostscriptStipple (Tcl_Interp * interp,
+				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
 				Pixmap bitmap);
 #endif
 #ifndef Tk_PostscriptY_TCL_DECLARED
@@ -1473,9 +1473,9 @@ EXTERN double		Tk_PostscriptY (double y, Tk_PostscriptInfo psInfo);
 #ifndef Tk_PostscriptPhoto_TCL_DECLARED
 #define Tk_PostscriptPhoto_TCL_DECLARED
 /* 238 */
-EXTERN int		Tk_PostscriptPhoto (Tcl_Interp * interp, 
-				Tk_PhotoImageBlock * blockPtr, 
-				Tk_PostscriptInfo psInfo, int width, 
+EXTERN int		Tk_PostscriptPhoto (Tcl_Interp * interp,
+				Tk_PhotoImageBlock * blockPtr,
+				Tk_PostscriptInfo psInfo, int width,
 				int height);
 #endif
 #ifndef Tk_CreateClientMessageHandler_TCL_DECLARED
@@ -1493,87 +1493,87 @@ EXTERN void		Tk_DeleteClientMessageHandler (
 #ifndef Tk_CreateAnonymousWindow_TCL_DECLARED
 #define Tk_CreateAnonymousWindow_TCL_DECLARED
 /* 241 */
-EXTERN Tk_Window	Tk_CreateAnonymousWindow (Tcl_Interp * interp, 
-				Tk_Window parent, CONST char * screenName);
+EXTERN Tk_Window	Tk_CreateAnonymousWindow (Tcl_Interp * interp,
+				Tk_Window parent, const char * screenName);
 #endif
 #ifndef Tk_SetClassProcs_TCL_DECLARED
 #define Tk_SetClassProcs_TCL_DECLARED
 /* 242 */
-EXTERN void		Tk_SetClassProcs (Tk_Window tkwin, 
-				Tk_ClassProcs * procs, 
+EXTERN void		Tk_SetClassProcs (Tk_Window tkwin,
+				Tk_ClassProcs * procs,
 				ClientData instanceData);
 #endif
 #ifndef Tk_SetInternalBorderEx_TCL_DECLARED
 #define Tk_SetInternalBorderEx_TCL_DECLARED
 /* 243 */
-EXTERN void		Tk_SetInternalBorderEx (Tk_Window tkwin, int left, 
+EXTERN void		Tk_SetInternalBorderEx (Tk_Window tkwin, int left,
 				int right, int top, int bottom);
 #endif
 #ifndef Tk_SetMinimumRequestSize_TCL_DECLARED
 #define Tk_SetMinimumRequestSize_TCL_DECLARED
 /* 244 */
-EXTERN void		Tk_SetMinimumRequestSize (Tk_Window tkwin, 
+EXTERN void		Tk_SetMinimumRequestSize (Tk_Window tkwin,
 				int minWidth, int minHeight);
 #endif
 #ifndef Tk_SetCaretPos_TCL_DECLARED
 #define Tk_SetCaretPos_TCL_DECLARED
 /* 245 */
-EXTERN void		Tk_SetCaretPos (Tk_Window tkwin, int x, int y, 
+EXTERN void		Tk_SetCaretPos (Tk_Window tkwin, int x, int y,
 				int height);
 #endif
 #ifndef Tk_PhotoPutBlock_Panic_TCL_DECLARED
 #define Tk_PhotoPutBlock_Panic_TCL_DECLARED
 /* 246 */
-EXTERN void		Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
+EXTERN void		Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
 				int width, int height, int compRule);
 #endif
 #ifndef Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
 #define Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
 /* 247 */
-EXTERN void		Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
-				int width, int height, int zoomX, int zoomY, 
+EXTERN void		Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
 #endif
 #ifndef Tk_CollapseMotionEvents_TCL_DECLARED
 #define Tk_CollapseMotionEvents_TCL_DECLARED
 /* 248 */
-EXTERN int		Tk_CollapseMotionEvents (Display * display, 
+EXTERN int		Tk_CollapseMotionEvents (Display * display,
 				int collapse);
 #endif
 #ifndef Tk_RegisterStyleEngine_TCL_DECLARED
 #define Tk_RegisterStyleEngine_TCL_DECLARED
 /* 249 */
-EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine (CONST char * name, 
+EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine (const char * name,
 				Tk_StyleEngine parent);
 #endif
 #ifndef Tk_GetStyleEngine_TCL_DECLARED
 #define Tk_GetStyleEngine_TCL_DECLARED
 /* 250 */
-EXTERN Tk_StyleEngine	Tk_GetStyleEngine (CONST char * name);
+EXTERN Tk_StyleEngine	Tk_GetStyleEngine (const char * name);
 #endif
 #ifndef Tk_RegisterStyledElement_TCL_DECLARED
 #define Tk_RegisterStyledElement_TCL_DECLARED
 /* 251 */
-EXTERN int		Tk_RegisterStyledElement (Tk_StyleEngine engine, 
+EXTERN int		Tk_RegisterStyledElement (Tk_StyleEngine engine,
 				Tk_ElementSpec * templatePtr);
 #endif
 #ifndef Tk_GetElementId_TCL_DECLARED
 #define Tk_GetElementId_TCL_DECLARED
 /* 252 */
-EXTERN int		Tk_GetElementId (CONST char * name);
+EXTERN int		Tk_GetElementId (const char * name);
 #endif
 #ifndef Tk_CreateStyle_TCL_DECLARED
 #define Tk_CreateStyle_TCL_DECLARED
 /* 253 */
-EXTERN Tk_Style		Tk_CreateStyle (CONST char * name, 
+EXTERN Tk_Style		Tk_CreateStyle (const char * name,
 				Tk_StyleEngine engine, ClientData clientData);
 #endif
 #ifndef Tk_GetStyle_TCL_DECLARED
 #define Tk_GetStyle_TCL_DECLARED
 /* 254 */
-EXTERN Tk_Style		Tk_GetStyle (Tcl_Interp * interp, CONST char * name);
+EXTERN Tk_Style		Tk_GetStyle (Tcl_Interp * interp, const char * name);
 #endif
 #ifndef Tk_FreeStyle_TCL_DECLARED
 #define Tk_FreeStyle_TCL_DECLARED
@@ -1583,12 +1583,12 @@ EXTERN void		Tk_FreeStyle (Tk_Style style);
 #ifndef Tk_NameOfStyle_TCL_DECLARED
 #define Tk_NameOfStyle_TCL_DECLARED
 /* 256 */
-EXTERN CONST char *	Tk_NameOfStyle (Tk_Style style);
+EXTERN const char *	Tk_NameOfStyle (Tk_Style style);
 #endif
 #ifndef Tk_AllocStyleFromObj_TCL_DECLARED
 #define Tk_AllocStyleFromObj_TCL_DECLARED
 /* 257 */
-EXTERN Tk_Style		Tk_AllocStyleFromObj (Tcl_Interp * interp, 
+EXTERN Tk_Style		Tk_AllocStyleFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 #endif
 #ifndef Tk_GetStyleFromObj_TCL_DECLARED
@@ -1604,68 +1604,68 @@ EXTERN void		Tk_FreeStyleFromObj (Tcl_Obj * objPtr);
 #ifndef Tk_GetStyledElement_TCL_DECLARED
 #define Tk_GetStyledElement_TCL_DECLARED
 /* 260 */
-EXTERN Tk_StyledElement	 Tk_GetStyledElement (Tk_Style style, int elementId, 
+EXTERN Tk_StyledElement	 Tk_GetStyledElement (Tk_Style style, int elementId,
 				Tk_OptionTable optionTable);
 #endif
 #ifndef Tk_GetElementSize_TCL_DECLARED
 #define Tk_GetElementSize_TCL_DECLARED
 /* 261 */
-EXTERN void		Tk_GetElementSize (Tk_Style style, 
-				Tk_StyledElement element, char * recordPtr, 
-				Tk_Window tkwin, int width, int height, 
+EXTERN void		Tk_GetElementSize (Tk_Style style,
+				Tk_StyledElement element, char * recordPtr,
+				Tk_Window tkwin, int width, int height,
 				int inner, int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_GetElementBox_TCL_DECLARED
 #define Tk_GetElementBox_TCL_DECLARED
 /* 262 */
-EXTERN void		Tk_GetElementBox (Tk_Style style, 
-				Tk_StyledElement element, char * recordPtr, 
-				Tk_Window tkwin, int x, int y, int width, 
-				int height, int inner, int * xPtr, 
+EXTERN void		Tk_GetElementBox (Tk_Style style,
+				Tk_StyledElement element, char * recordPtr,
+				Tk_Window tkwin, int x, int y, int width,
+				int height, int inner, int * xPtr,
 				int * yPtr, int * widthPtr, int * heightPtr);
 #endif
 #ifndef Tk_GetElementBorderWidth_TCL_DECLARED
 #define Tk_GetElementBorderWidth_TCL_DECLARED
 /* 263 */
-EXTERN int		Tk_GetElementBorderWidth (Tk_Style style, 
-				Tk_StyledElement element, char * recordPtr, 
+EXTERN int		Tk_GetElementBorderWidth (Tk_Style style,
+				Tk_StyledElement element, char * recordPtr,
 				Tk_Window tkwin);
 #endif
 #ifndef Tk_DrawElement_TCL_DECLARED
 #define Tk_DrawElement_TCL_DECLARED
 /* 264 */
-EXTERN void		Tk_DrawElement (Tk_Style style, 
-				Tk_StyledElement element, char * recordPtr, 
-				Tk_Window tkwin, Drawable d, int x, int y, 
+EXTERN void		Tk_DrawElement (Tk_Style style,
+				Tk_StyledElement element, char * recordPtr,
+				Tk_Window tkwin, Drawable d, int x, int y,
 				int width, int height, int state);
 #endif
 #ifndef Tk_PhotoExpand_TCL_DECLARED
 #define Tk_PhotoExpand_TCL_DECLARED
 /* 265 */
-EXTERN int		Tk_PhotoExpand (Tcl_Interp * interp, 
+EXTERN int		Tk_PhotoExpand (Tcl_Interp * interp,
 				Tk_PhotoHandle handle, int width, int height);
 #endif
 #ifndef Tk_PhotoPutBlock_TCL_DECLARED
 #define Tk_PhotoPutBlock_TCL_DECLARED
 /* 266 */
-EXTERN int		Tk_PhotoPutBlock (Tcl_Interp * interp, 
-				Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
+EXTERN int		Tk_PhotoPutBlock (Tcl_Interp * interp,
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
 				int width, int height, int compRule);
 #endif
 #ifndef Tk_PhotoPutZoomedBlock_TCL_DECLARED
 #define Tk_PhotoPutZoomedBlock_TCL_DECLARED
 /* 267 */
-EXTERN int		Tk_PhotoPutZoomedBlock (Tcl_Interp * interp, 
-				Tk_PhotoHandle handle, 
-				Tk_PhotoImageBlock * blockPtr, int x, int y, 
-				int width, int height, int zoomX, int zoomY, 
+EXTERN int		Tk_PhotoPutZoomedBlock (Tcl_Interp * interp,
+				Tk_PhotoHandle handle,
+				Tk_PhotoImageBlock * blockPtr, int x, int y,
+				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
 #endif
 #ifndef Tk_PhotoSetSize_TCL_DECLARED
 #define Tk_PhotoSetSize_TCL_DECLARED
 /* 268 */
-EXTERN int		Tk_PhotoSetSize (Tcl_Interp * interp, 
+EXTERN int		Tk_PhotoSetSize (Tcl_Interp * interp,
 				Tk_PhotoHandle handle, int width, int height);
 #endif
 #ifndef Tk_GetUserInactiveTime_TCL_DECLARED
@@ -1696,26 +1696,26 @@ EXTERN void		Tk_CreateOldPhotoImageFormat (
 #endif
 
 typedef struct TkStubHooks {
-    CONST struct TkPlatStubs *tkPlatStubs;
-    CONST struct TkIntStubs *tkIntStubs;
-    CONST struct TkIntPlatStubs *tkIntPlatStubs;
-    CONST struct TkIntXlibStubs *tkIntXlibStubs;
+    const struct TkPlatStubs *tkPlatStubs;
+    const struct TkIntStubs *tkIntStubs;
+    const struct TkIntPlatStubs *tkIntPlatStubs;
+    const struct TkIntXlibStubs *tkIntXlibStubs;
 } TkStubHooks;
 
 typedef struct TkStubs {
     int magic;
-    CONST struct TkStubHooks *hooks;
+    const struct TkStubHooks *hooks;
 
     void (*tk_MainLoop) (void); /* 0 */
     XColor * (*tk_3DBorderColor) (Tk_3DBorder border); /* 1 */
     GC (*tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 2 */
     void (*tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); /* 3 */
     void (*tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); /* 4 */
-    void (*tk_AddOption) (Tk_Window tkwin, CONST char * name, CONST char * value, int priority); /* 5 */
+    void (*tk_AddOption) (Tk_Window tkwin, const char * name, const char * value, int priority); /* 5 */
     void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent * eventPtr, Tk_Window tkwin, int numObjects, ClientData * objectPtr); /* 6 */
     void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short * drawableXPtr, short * drawableYPtr); /* 7 */
     void (*tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); /* 8 */
-    int (*tk_CanvasGetCoord) (Tcl_Interp * interp, Tk_Canvas canvas, CONST char * str, double * doublePtr); /* 9 */
+    int (*tk_CanvasGetCoord) (Tcl_Interp * interp, Tk_Canvas canvas, const char * str, double * doublePtr); /* 9 */
     Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) (Tk_Canvas canvas); /* 10 */
     int (*tk_CanvasPsBitmap) (Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */
     int (*tk_CanvasPsColor) (Tcl_Interp * interp, Tk_Canvas canvas, XColor * colorPtr); /* 12 */
@@ -1724,7 +1724,7 @@ typedef struct TkStubs {
     int (*tk_CanvasPsStipple) (Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
     double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */
     void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */
-    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset); /* 18 */
+    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 18 */
     char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 19 */
     Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */
     void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short * screenXPtr, short * screenYPtr); /* 21 */
@@ -1733,13 +1733,13 @@ typedef struct TkStubs {
     void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */
     int (*tk_ClipboardAppend) (Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, char* buffer); /* 25 */
     int (*tk_ClipboardClear) (Tcl_Interp * interp, Tk_Window tkwin); /* 26 */
-    int (*tk_ConfigureInfo) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 27 */
-    int (*tk_ConfigureValue) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags); /* 28 */
+    int (*tk_ConfigureInfo) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 27 */
+    int (*tk_ConfigureValue) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, const char * argvName, int flags); /* 28 */
     int (*tk_ConfigureWidget) (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, CONST84 char ** argv, char * widgRec, int flags); /* 29 */
     void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges * valuePtr); /* 30 */
-    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, CONST char * str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr); /* 31 */
+    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, const char * str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr); /* 31 */
     Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */
-    unsigned long (*tk_CreateBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr, CONST char * command, int append); /* 33 */
+    unsigned long (*tk_CreateBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr, const char * command, int append); /* 33 */
     Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp * interp); /* 34 */
     Tk_ErrorHandler (*tk_CreateErrorHandler) (Display * display, int errNum, int request, int minorCode, Tk_ErrorProc * errorProc, ClientData clientData); /* 35 */
     void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData); /* 36 */
@@ -1748,29 +1748,29 @@ typedef struct TkStubs {
     void (*tk_CreateItemType) (Tk_ItemType * typePtr); /* 39 */
     void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 40 */
     void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format); /* 41 */
-    Tk_Window (*tk_CreateWindow) (Tcl_Interp * interp, Tk_Window parent, CONST char * name, CONST char * screenName); /* 42 */
-    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * pathName, CONST char * screenName); /* 43 */
-    int (*tk_DefineBitmap) (Tcl_Interp * interp, CONST char * name, CONST char * source, int width, int height); /* 44 */
+    Tk_Window (*tk_CreateWindow) (Tcl_Interp * interp, Tk_Window parent, const char * name, const char * screenName); /* 42 */
+    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp * interp, Tk_Window tkwin, const char * pathName, const char * screenName); /* 43 */
+    int (*tk_DefineBitmap) (Tcl_Interp * interp, const char * name, const char * source, int width, int height); /* 44 */
     void (*tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); /* 45 */
     void (*tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); /* 46 */
-    int (*tk_DeleteBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 47 */
+    int (*tk_DeleteBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr); /* 47 */
     void (*tk_DeleteBindingTable) (Tk_BindingTable bindingTable); /* 48 */
     void (*tk_DeleteErrorHandler) (Tk_ErrorHandler handler); /* 49 */
     void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData); /* 50 */
     void (*tk_DeleteGenericHandler) (Tk_GenericProc * proc, ClientData clientData); /* 51 */
-    void (*tk_DeleteImage) (Tcl_Interp * interp, CONST char * name); /* 52 */
+    void (*tk_DeleteImage) (Tcl_Interp * interp, const char * name); /* 52 */
     void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */
     void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */
     CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
     int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */
     void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
     void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */
-    void (*tk_DrawChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int numBytes, int x, int y); /* 59 */
+    void (*tk_DrawChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, const char * source, int numBytes, int x, int y); /* 59 */
     void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */
     void (*tk_DrawTextLayout) (Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */
     void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */
     void (*tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 63 */
-    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp * interp, CONST char * imageName); /* 64 */
+    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp * interp, const char * imageName); /* 64 */
     Font (*tk_FontId) (Tk_Font font); /* 65 */
     void (*tk_Free3DBorder) (Tk_3DBorder border); /* 66 */
     void (*tk_FreeBitmap) (Display * display, Pixmap bitmap); /* 67 */
@@ -1788,51 +1788,51 @@ typedef struct TkStubs {
     void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */
     Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
     void (*tk_GetAllBindings) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
-    int (*tk_GetAnchor) (Tcl_Interp * interp, CONST char * str, Tk_Anchor * anchorPtr); /* 82 */
+    int (*tk_GetAnchor) (Tcl_Interp * interp, const char * str, Tk_Anchor * anchorPtr); /* 82 */
     CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
-    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr); /* 84 */
-    Pixmap (*tk_GetBitmap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 85 */
-    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, int width, int height); /* 86 */
-    int (*tk_GetCapStyle) (Tcl_Interp * interp, CONST char * str, int * capPtr); /* 87 */
+    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, const char * eventStr); /* 84 */
+    Pixmap (*tk_GetBitmap) (Tcl_Interp * interp, Tk_Window tkwin, const char * str); /* 85 */
+    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp * interp, Tk_Window tkwin, const char * source, int width, int height); /* 86 */
+    int (*tk_GetCapStyle) (Tcl_Interp * interp, const char * str, int * capPtr); /* 87 */
     XColor * (*tk_GetColor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
     XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor * colorPtr); /* 89 */
-    Colormap (*tk_GetColormap) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 90 */
+    Colormap (*tk_GetColormap) (Tcl_Interp * interp, Tk_Window tkwin, const char * str); /* 90 */
     Tk_Cursor (*tk_GetCursor) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
-    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
-    Tk_Font (*tk_GetFont) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str); /* 93 */
+    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp * interp, Tk_Window tkwin, const char * source, const char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
+    Tk_Font (*tk_GetFont) (Tcl_Interp * interp, Tk_Window tkwin, const char * str); /* 93 */
     Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 94 */
     void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics * fmPtr); /* 95 */
     GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues * valuePtr); /* 96 */
-    Tk_Image (*tk_GetImage) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * name, Tk_ImageChangedProc * changeProc, ClientData clientData); /* 97 */
-    ClientData (*tk_GetImageMasterData) (Tcl_Interp * interp, CONST char * name, Tk_ImageType ** typePtrPtr); /* 98 */
+    Tk_Image (*tk_GetImage) (Tcl_Interp * interp, Tk_Window tkwin, const char * name, Tk_ImageChangedProc * changeProc, ClientData clientData); /* 97 */
+    ClientData (*tk_GetImageMasterData) (Tcl_Interp * interp, const char * name, Tk_ImageType ** typePtrPtr); /* 98 */
     Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */
-    int (*tk_GetJoinStyle) (Tcl_Interp * interp, CONST char * str, int * joinPtr); /* 100 */
-    int (*tk_GetJustify) (Tcl_Interp * interp, CONST char * str, Tk_Justify * justifyPtr); /* 101 */
+    int (*tk_GetJoinStyle) (Tcl_Interp * interp, const char * str, int * joinPtr); /* 100 */
+    int (*tk_GetJustify) (Tcl_Interp * interp, const char * str, Tk_Justify * justifyPtr); /* 101 */
     int (*tk_GetNumMainWindows) (void); /* 102 */
-    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, CONST char * name, CONST char * className); /* 103 */
-    int (*tk_GetPixels) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * intPtr); /* 104 */
+    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, const char * name, const char * className); /* 103 */
+    int (*tk_GetPixels) (Tcl_Interp * interp, Tk_Window tkwin, const char * str, int * intPtr); /* 104 */
     Pixmap (*tk_GetPixmap) (Display * display, Drawable d, int width, int height, int depth); /* 105 */
-    int (*tk_GetRelief) (Tcl_Interp * interp, CONST char * name, int * reliefPtr); /* 106 */
+    int (*tk_GetRelief) (Tcl_Interp * interp, const char * name, int * reliefPtr); /* 106 */
     void (*tk_GetRootCoords) (Tk_Window tkwin, int * xPtr, int * yPtr); /* 107 */
     int (*tk_GetScrollInfo) (Tcl_Interp * interp, int argc, CONST84 char ** argv, double * dblPtr, int * intPtr); /* 108 */
-    int (*tk_GetScreenMM) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, double * doublePtr); /* 109 */
+    int (*tk_GetScreenMM) (Tcl_Interp * interp, Tk_Window tkwin, const char * str, double * doublePtr); /* 109 */
     int (*tk_GetSelection) (Tcl_Interp * interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData); /* 110 */
-    Tk_Uid (*tk_GetUid) (CONST char * str); /* 111 */
-    Visual * (*tk_GetVisual) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * depthPtr, Colormap * colormapPtr); /* 112 */
+    Tk_Uid (*tk_GetUid) (const char * str); /* 111 */
+    Visual * (*tk_GetVisual) (Tcl_Interp * interp, Tk_Window tkwin, const char * str, int * depthPtr, Colormap * colormapPtr); /* 112 */
     void (*tk_GetVRootGeometry) (Tk_Window tkwin, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr); /* 113 */
     int (*tk_Grab) (Tcl_Interp * interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent * eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display * display, Window window); /* 116 */
     void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp * interp); /* 118 */
-    Atom (*tk_InternAtom) (Tk_Window tkwin, CONST char * name); /* 119 */
+    Atom (*tk_InternAtom) (Tk_Window tkwin, const char * name); /* 119 */
     int (*tk_IntersectTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height); /* 120 */
     void (*tk_MaintainGeometry) (Tk_Window slave, Tk_Window master, int x, int y, int width, int height); /* 121 */
     Tk_Window (*tk_MainWindow) (Tcl_Interp * interp); /* 122 */
     void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */
-    void (*tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr * mgrPtr, ClientData clientData); /* 124 */
+    void (*tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr * mgrPtr, ClientData clientData); /* 124 */
     void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */
-    int (*tk_MeasureChars) (Tk_Font tkfont, CONST char * source, int numBytes, int maxPixels, int flags, int * lengthPtr); /* 126 */
+    int (*tk_MeasureChars) (Tk_Font tkfont, const char * source, int numBytes, int maxPixels, int flags, int * lengthPtr); /* 126 */
     void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */
     void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */
     void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */
@@ -1847,7 +1847,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
-    Tk_Window (*tk_NameToWindow) (Tcl_Interp * interp, CONST char * pathName, Tk_Window tkwin); /* 141 */
+    Tk_Window (*tk_NameToWindow) (Tcl_Interp * interp, const char * pathName, Tk_Window tkwin); /* 141 */
     void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData); /* 142 */
     int (*tk_ParseArgv) (Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags); /* 143 */
     void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height); /* 144 */
@@ -1866,9 +1866,9 @@ typedef struct TkStubs {
     int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */
     Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr); /* 158 */
     int (*tk_SafeInit) (Tcl_Interp * interp); /* 159 */
-    CONST char * (*tk_SetAppName) (Tk_Window tkwin, CONST char * name); /* 160 */
+    const char * (*tk_SetAppName) (Tk_Window tkwin, const char * name); /* 160 */
     void (*tk_SetBackgroundFromBorder) (Tk_Window tkwin, Tk_3DBorder border); /* 161 */
-    void (*tk_SetClass) (Tk_Window tkwin, CONST char * className); /* 162 */
+    void (*tk_SetClass) (Tk_Window tkwin, const char * className); /* 162 */
     void (*tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); /* 163 */
     void (*tk_SetInternalBorder) (Tk_Window tkwin, int width); /* 164 */
     void (*tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); /* 165 */
@@ -1882,9 +1882,9 @@ typedef struct TkStubs {
     void (*tk_SizeOfImage) (Tk_Image image, int * widthPtr, int * heightPtr); /* 173 */
     int (*tk_StrictMotif) (Tk_Window tkwin); /* 174 */
     void (*tk_TextLayoutToPostscript) (Tcl_Interp * interp, Tk_TextLayout layout); /* 175 */
-    int (*tk_TextWidth) (Tk_Font font, CONST char * str, int numBytes); /* 176 */
+    int (*tk_TextWidth) (Tk_Font font, const char * str, int numBytes); /* 176 */
     void (*tk_UndefineCursor) (Tk_Window window); /* 177 */
-    void (*tk_UnderlineChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstByte, int lastByte); /* 178 */
+    void (*tk_UnderlineChars) (Display * display, Drawable drawable, GC gc, Tk_Font tkfont, const char * source, int x, int y, int firstByte, int lastByte); /* 178 */
     void (*tk_UnderlineTextLayout) (Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
     void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */
     void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */
@@ -1896,7 +1896,7 @@ typedef struct TkStubs {
     XColor * (*tk_AllocColorFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 187 */
     Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 188 */
     Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr); /* 189 */
-    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp * interp, CONST Tk_OptionSpec * templatePtr); /* 190 */
+    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp * interp, const Tk_OptionSpec * templatePtr); /* 190 */
     void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */
     void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 192 */
     void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj * objPtr); /* 193 */
@@ -1916,17 +1916,17 @@ typedef struct TkStubs {
     int (*tk_GetMMFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, double * doublePtr); /* 207 */
     int (*tk_GetPixelsFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, int * intPtr); /* 208 */
     int (*tk_GetReliefFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int * resultPtr); /* 209 */
-    int (*tk_GetScrollInfoObj) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], double * dblPtr, int * intPtr); /* 210 */
+    int (*tk_GetScrollInfoObj) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], double * dblPtr, int * intPtr); /* 210 */
     int (*tk_InitOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
     void (*tk_MainEx) (int argc, char ** argv, Tcl_AppInitProc * appInitProc, Tcl_Interp * interp); /* 212 */
     void (*tk_RestoreSavedOptions) (Tk_SavedOptions * savePtr); /* 213 */
-    int (*tk_SetOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr); /* 214 */
+    int (*tk_SetOptions) (Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr); /* 214 */
     void (*tk_InitConsoleChannels) (Tcl_Interp * interp); /* 215 */
     int (*tk_CreateConsoleWindow) (Tcl_Interp * interp); /* 216 */
     void (*tk_CreateSmoothMethod) (Tcl_Interp * interp, Tk_SmoothMethod * method); /* 217 */
     void *reserved218;
     void *reserved219;
-    int (*tk_GetDash) (Tcl_Interp * interp, CONST char * value, Tk_Dash * dash); /* 220 */
+    int (*tk_GetDash) (Tcl_Interp * interp, const char * value, Tk_Dash * dash); /* 220 */
     void (*tk_CreateOutline) (Tk_Outline * outline); /* 221 */
     void (*tk_DeleteOutline) (Display * display, Tk_Outline * outline); /* 222 */
     int (*tk_ConfigOutlineGC) (XGCValues * gcValues, Tk_Canvas canvas, Tk_Item * item, Tk_Outline * outline); /* 223 */
@@ -1947,7 +1947,7 @@ typedef struct TkStubs {
     int (*tk_PostscriptPhoto) (Tcl_Interp * interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */
     void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc * proc); /* 239 */
     void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc * proc); /* 240 */
-    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp * interp, Tk_Window parent, CONST char * screenName); /* 241 */
+    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp * interp, Tk_Window parent, const char * screenName); /* 241 */
     void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs * procs, ClientData instanceData); /* 242 */
     void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */
     void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */
@@ -1955,14 +1955,14 @@ typedef struct TkStubs {
     void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
     void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
     int (*tk_CollapseMotionEvents) (Display * display, int collapse); /* 248 */
-    Tk_StyleEngine (*tk_RegisterStyleEngine) (CONST char * name, Tk_StyleEngine parent); /* 249 */
-    Tk_StyleEngine (*tk_GetStyleEngine) (CONST char * name); /* 250 */
+    Tk_StyleEngine (*tk_RegisterStyleEngine) (const char * name, Tk_StyleEngine parent); /* 249 */
+    Tk_StyleEngine (*tk_GetStyleEngine) (const char * name); /* 250 */
     int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec * templatePtr); /* 251 */
-    int (*tk_GetElementId) (CONST char * name); /* 252 */
-    Tk_Style (*tk_CreateStyle) (CONST char * name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
-    Tk_Style (*tk_GetStyle) (Tcl_Interp * interp, CONST char * name); /* 254 */
+    int (*tk_GetElementId) (const char * name); /* 252 */
+    Tk_Style (*tk_CreateStyle) (const char * name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
+    Tk_Style (*tk_GetStyle) (Tcl_Interp * interp, const char * name); /* 254 */
     void (*tk_FreeStyle) (Tk_Style style); /* 255 */
-    CONST char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
+    const char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
     Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp * interp, Tcl_Obj * objPtr); /* 257 */
     Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj * objPtr); /* 258 */
     void (*tk_FreeStyleFromObj) (Tcl_Obj * objPtr); /* 259 */
@@ -1983,7 +1983,7 @@ typedef struct TkStubs {
 } TkStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkStubs *tkStubsPtr;
+extern const TkStubs *tkStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 7f87450..f6890f6 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -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: tkInt.decls,v 1.45 2008/08/19 15:52:11 georgeps Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.46 2008/10/22 20:56:43 nijtmans Exp $
 
 library tk
 
@@ -62,12 +62,12 @@ declare 10 generic {
 declare 11 generic {
     unsigned long TkCreateBindingProcedure(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    CONST char *eventString, TkBindEvalProc *evalProc,
+	    const char *eventString, TkBindEvalProc *evalProc,
 	    TkBindFreeProc *freeProc, ClientData clientData)
 }
 declare 12 generic {
     TkCursor *TkCreateCursorFromData(Tk_Window tkwin,
-	    CONST char *source, CONST char *mask, int width, int height,
+	    const char *source, const char *mask, int width, int height,
 	    int xHot, int yHot, XColor fg, XColor bg)
 }
 declare 13 generic {
@@ -76,7 +76,7 @@ declare 13 generic {
 }
 declare 14 generic {
     Tk_Window TkCreateMainWindow(Tcl_Interp *interp,
-	    CONST char *screenName, char *baseName)
+	    const char *screenName, char *baseName)
 }
 declare 15 generic {
     Time TkCurrentTime(TkDisplay *dispPtr)
@@ -99,11 +99,11 @@ declare 20 generic {
 	    Display *display, Drawable drawable, GC gc, GC outlineGC)
 }
 declare 21 generic {
-    int TkFindStateNum(Tcl_Interp *interp, CONST char *option,
-	    CONST TkStateMap *mapPtr, CONST char *strKey)
+    int TkFindStateNum(Tcl_Interp *interp, const char *option,
+	    const TkStateMap *mapPtr, const char *strKey)
 }
 declare 22 generic {
-    char *TkFindStateString(CONST TkStateMap *mapPtr, int numKey)
+    char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
 }
 declare 23 generic {
     void TkFocusDeadWindow(TkWindow *winPtr)
@@ -142,13 +142,13 @@ declare 32 generic {
 }
 declare 33 generic {
     CONST84_RETURN char *TkGetDefaultScreenName(Tcl_Interp *interp,
-	    CONST char *screenName)
+	    const char *screenName)
 }
 declare 34 generic {
     TkDisplay *TkGetDisplay(Display *display)
 }
 declare 35 generic {
-    int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+    int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[],
 	    Tk_Window *tkwinPtr)
 }
 declare 36 generic {
@@ -224,7 +224,7 @@ declare 57 generic {
     void TkpClaimFocus(TkWindow *topLevelPtr, int force)
 }
 declare 58 generic {
-    void TkpDisplayWarning(CONST char *msg, CONST char *title)
+    void TkpDisplayWarning(const char *msg, const char *title)
 }
 declare 59 generic {
     void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name)
@@ -255,7 +255,7 @@ declare 67 generic {
     void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp1, char *menuName)
 }
 declare 68 generic {
-    TkDisplay *TkpOpenDisplay(CONST char *display_name)
+    TkDisplay *TkpOpenDisplay(const char *display_name)
 }
 declare 69 generic {
     int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr)
@@ -276,13 +276,13 @@ declare 74 generic {
     void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, char *menuName)
 }
 declare 75 generic {
-    int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, CONST char *string)
+    int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string)
 }
 declare 77 generic {
     void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr)
 }
 declare 78 generic {
-    int TkReadBitmapFile(Display *display, Drawable d, CONST char *filename,
+    int TkReadBitmapFile(Display *display, Drawable d, const char *filename,
 	    unsigned int *width_return, unsigned int *height_return,
 	    Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return)
 }
@@ -374,7 +374,7 @@ declare 103 generic {
 }
 declare 104 generic {
     int TkFindStateNumObj(Tcl_Interp *interp, Tcl_Obj *optionPtr,
-	    CONST TkStateMap *mapPtr, Tcl_Obj *keyPtr)
+	    const TkStateMap *mapPtr, Tcl_Obj *keyPtr)
 }
 declare 105 generic {
     Tcl_HashTable *TkGetBitmapPredefTable(void)
@@ -397,7 +397,7 @@ declare 110 generic {
 }
 declare 111 generic {
     Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin,
-	    CONST char *dbName, CONST char *className)
+	    const char *dbName, const char *className)
 }
 declare 112 generic {
     void TkpMenuThreadInit(void)
@@ -426,14 +426,14 @@ declare 119 {aqua win} {
 	    TkRegion src, TkRegion dr_return)
 }
 declare 121 aqua {
-    Pixmap TkpCreateNativeBitmap(Display *display, CONST char *source)
+    Pixmap TkpCreateNativeBitmap(Display *display, const char *source)
 }
 declare 122 aqua {
     void TkpDefineNativeBitmaps(void)
 }
 declare 124 aqua {
     Pixmap TkpGetNativeAppBitmap(Display *display,
- 	    CONST char *name, int *width, int *height)
+ 	    const char *name, int *width, int *height)
 }
 declare 135 generic {
     void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC,
@@ -478,10 +478,10 @@ declare 147 generic {
 }
 declare 148 generic {
     Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp,
-	    CONST char *cmdName)
+	    const char *cmdName)
 }
 declare 149 generic {
-    CONST Tk_OptionSpec *TkGetOptionSpec(CONST char *name,
+    const Tk_OptionSpec *TkGetOptionSpec(const char *name,
 	    Tk_OptionTable optionTable)
 }
 
@@ -508,11 +508,11 @@ declare 154 generic {
 # entries needed only by tktest:
 declare 156 generic {
     int TkpTestembedCmd(ClientData clientData, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
 declare 157 generic {
     int TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
 
 ##############################################################################
@@ -544,7 +544,7 @@ declare 7 x11 {
     void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
 }
 declare 8 x11 {
-    int TkpScanWindowId(Tcl_Interp *interp, CONST char *string, Window *idPtr)
+    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 9 x11 {
     void TkWmCleanup(TkDisplay *dispPtr)
@@ -558,7 +558,7 @@ declare 12 x11 {
 # only needed by tktest:
 declare 13 x11 {
     int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int argc,
-	    CONST char **argv)
+	    const char **argv)
 }
 
 ################################
@@ -580,7 +580,7 @@ declare 5 win {
     void TkpPrintWindowId(char *buf, Window window)
 }
 declare 6 win {
-    int TkpScanWindowId(Tcl_Interp *interp, CONST char *string, Window *idPtr)
+    int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
 }
 declare 7 win {
     void TkpSetCapture(TkWindow *winPtr)
@@ -665,7 +665,7 @@ declare 31 win {
 }
 declare 32 win {
     Tcl_Obj *TkWinGetMenuSystemDefault(Tk_Window tkwin,
-	    CONST char *dbName, CONST char *className)
+	    const char *dbName, const char *className)
 }
 declare 33 win {
     int TkWinGetPlatformId(void)
@@ -689,7 +689,7 @@ declare 0 aqua {
 
 # removed duplicates from tkInt table
 #declare 1 aqua {
-#    Pixmap TkpCreateNativeBitmap(Display *display, CONST char *source)
+#    Pixmap TkpCreateNativeBitmap(Display *display, const char *source)
 #}
 #
 #declare 2 aqua {
@@ -1090,7 +1090,7 @@ declare 61 win {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
 declare 62 win {
-    void XSetCommand(Display *d, Window w, CONST char **c, int i)
+    void XSetCommand(Display *d, Window w, const char **c, int i)
 }
 declare 63 win {
     void XSetIconName(Display *d, Window w, _Xconst char *c)
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 8f749a8..9e49dba 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.35 2008/08/19 15:52:11 georgeps Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.36 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -37,20 +37,20 @@
 #ifndef TkAllocWindow_TCL_DECLARED
 #define TkAllocWindow_TCL_DECLARED
 /* 0 */
-EXTERN TkWindow *	TkAllocWindow (TkDisplay * dispPtr, int screenNum, 
+EXTERN TkWindow *	TkAllocWindow (TkDisplay * dispPtr, int screenNum,
 				TkWindow * parentPtr);
 #endif
 #ifndef TkBezierPoints_TCL_DECLARED
 #define TkBezierPoints_TCL_DECLARED
 /* 1 */
-EXTERN void		TkBezierPoints (double control[], int numSteps, 
+EXTERN void		TkBezierPoints (double control[], int numSteps,
 				double * coordPtr);
 #endif
 #ifndef TkBezierScreenPoints_TCL_DECLARED
 #define TkBezierScreenPoints_TCL_DECLARED
 /* 2 */
-EXTERN void		TkBezierScreenPoints (Tk_Canvas canvas, 
-				double control[], int numSteps, 
+EXTERN void		TkBezierScreenPoints (Tk_Canvas canvas,
+				double control[], int numSteps,
 				XPoint * xPointPtr);
 #endif
 #ifndef TkBindDeadWindow_TCL_DECLARED
@@ -61,7 +61,7 @@ EXTERN void		TkBindDeadWindow (TkWindow * winPtr);
 #ifndef TkBindEventProc_TCL_DECLARED
 #define TkBindEventProc_TCL_DECLARED
 /* 4 */
-EXTERN void		TkBindEventProc (TkWindow * winPtr, 
+EXTERN void		TkBindEventProc (TkWindow * winPtr,
 				XEvent * eventPtr);
 #endif
 #ifndef TkBindFree_TCL_DECLARED
@@ -77,7 +77,7 @@ EXTERN void		TkBindInit (TkMainInfo * mainPtr);
 #ifndef TkChangeEventWindow_TCL_DECLARED
 #define TkChangeEventWindow_TCL_DECLARED
 /* 7 */
-EXTERN void		TkChangeEventWindow (XEvent * eventPtr, 
+EXTERN void		TkChangeEventWindow (XEvent * eventPtr,
 				TkWindow * winPtr);
 #endif
 #ifndef TkClipInit_TCL_DECLARED
@@ -88,46 +88,46 @@ EXTERN int		TkClipInit (Tcl_Interp * interp, TkDisplay * dispPtr);
 #ifndef TkComputeAnchor_TCL_DECLARED
 #define TkComputeAnchor_TCL_DECLARED
 /* 9 */
-EXTERN void		TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin, 
-				int padX, int padY, int innerWidth, 
+EXTERN void		TkComputeAnchor (Tk_Anchor anchor, Tk_Window tkwin,
+				int padX, int padY, int innerWidth,
 				int innerHeight, int * xPtr, int * yPtr);
 #endif
 #ifndef TkCopyAndGlobalEval_TCL_DECLARED
 #define TkCopyAndGlobalEval_TCL_DECLARED
 /* 10 */
-EXTERN int		TkCopyAndGlobalEval (Tcl_Interp * interp, 
+EXTERN int		TkCopyAndGlobalEval (Tcl_Interp * interp,
 				char * script);
 #endif
 #ifndef TkCreateBindingProcedure_TCL_DECLARED
 #define TkCreateBindingProcedure_TCL_DECLARED
 /* 11 */
-EXTERN unsigned long	TkCreateBindingProcedure (Tcl_Interp * interp, 
-				Tk_BindingTable bindingTable, 
-				ClientData object, CONST char * eventString, 
-				TkBindEvalProc * evalProc, 
-				TkBindFreeProc * freeProc, 
+EXTERN unsigned long	TkCreateBindingProcedure (Tcl_Interp * interp,
+				Tk_BindingTable bindingTable,
+				ClientData object, const char * eventString,
+				TkBindEvalProc * evalProc,
+				TkBindFreeProc * freeProc,
 				ClientData clientData);
 #endif
 #ifndef TkCreateCursorFromData_TCL_DECLARED
 #define TkCreateCursorFromData_TCL_DECLARED
 /* 12 */
-EXTERN TkCursor *	TkCreateCursorFromData (Tk_Window tkwin, 
-				CONST char * source, CONST char * mask, 
-				int width, int height, int xHot, int yHot, 
+EXTERN TkCursor *	TkCreateCursorFromData (Tk_Window tkwin,
+				const char * source, const char * mask,
+				int width, int height, int xHot, int yHot,
 				XColor fg, XColor bg);
 #endif
 #ifndef TkCreateFrame_TCL_DECLARED
 #define TkCreateFrame_TCL_DECLARED
 /* 13 */
-EXTERN int		TkCreateFrame (ClientData clientData, 
-				Tcl_Interp * interp, int argc, char ** argv, 
+EXTERN int		TkCreateFrame (ClientData clientData,
+				Tcl_Interp * interp, int argc, char ** argv,
 				int toplevel, char * appName);
 #endif
 #ifndef TkCreateMainWindow_TCL_DECLARED
 #define TkCreateMainWindow_TCL_DECLARED
 /* 14 */
-EXTERN Tk_Window	TkCreateMainWindow (Tcl_Interp * interp, 
-				CONST char * screenName, char * baseName);
+EXTERN Tk_Window	TkCreateMainWindow (Tcl_Interp * interp,
+				const char * screenName, char * baseName);
 #endif
 #ifndef TkCurrentTime_TCL_DECLARED
 #define TkCurrentTime_TCL_DECLARED
@@ -147,7 +147,7 @@ EXTERN void		TkDoConfigureNotify (TkWindow * winPtr);
 #ifndef TkDrawInsetFocusHighlight_TCL_DECLARED
 #define TkDrawInsetFocusHighlight_TCL_DECLARED
 /* 18 */
-EXTERN void		TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc, 
+EXTERN void		TkDrawInsetFocusHighlight (Tk_Window tkwin, GC gc,
 				int width, Drawable drawable, int padding);
 #endif
 #ifndef TkEventDeadWindow_TCL_DECLARED
@@ -158,22 +158,22 @@ EXTERN void		TkEventDeadWindow (TkWindow * winPtr);
 #ifndef TkFillPolygon_TCL_DECLARED
 #define TkFillPolygon_TCL_DECLARED
 /* 20 */
-EXTERN void		TkFillPolygon (Tk_Canvas canvas, double * coordPtr, 
-				int numPoints, Display * display, 
+EXTERN void		TkFillPolygon (Tk_Canvas canvas, double * coordPtr,
+				int numPoints, Display * display,
 				Drawable drawable, GC gc, GC outlineGC);
 #endif
 #ifndef TkFindStateNum_TCL_DECLARED
 #define TkFindStateNum_TCL_DECLARED
 /* 21 */
-EXTERN int		TkFindStateNum (Tcl_Interp * interp, 
-				CONST char * option, 
-				CONST TkStateMap * mapPtr, 
-				CONST char * strKey);
+EXTERN int		TkFindStateNum (Tcl_Interp * interp,
+				const char * option,
+				const TkStateMap * mapPtr,
+				const char * strKey);
 #endif
 #ifndef TkFindStateString_TCL_DECLARED
 #define TkFindStateString_TCL_DECLARED
 /* 22 */
-EXTERN char *		TkFindStateString (CONST TkStateMap * mapPtr, 
+EXTERN char *		TkFindStateString (const TkStateMap * mapPtr,
 				int numKey);
 #endif
 #ifndef TkFocusDeadWindow_TCL_DECLARED
@@ -184,13 +184,13 @@ EXTERN void		TkFocusDeadWindow (TkWindow * winPtr);
 #ifndef TkFocusFilterEvent_TCL_DECLARED
 #define TkFocusFilterEvent_TCL_DECLARED
 /* 24 */
-EXTERN int		TkFocusFilterEvent (TkWindow * winPtr, 
+EXTERN int		TkFocusFilterEvent (TkWindow * winPtr,
 				XEvent * eventPtr);
 #endif
 #ifndef TkFocusKeyEvent_TCL_DECLARED
 #define TkFocusKeyEvent_TCL_DECLARED
 /* 25 */
-EXTERN TkWindow *	TkFocusKeyEvent (TkWindow * winPtr, 
+EXTERN TkWindow *	TkFocusKeyEvent (TkWindow * winPtr,
 				XEvent * eventPtr);
 #endif
 #ifndef TkFontPkgInit_TCL_DECLARED
@@ -216,29 +216,29 @@ EXTERN void		TkpFreeCursor (TkCursor * cursorPtr);
 #ifndef TkGetBitmapData_TCL_DECLARED
 #define TkGetBitmapData_TCL_DECLARED
 /* 30 */
-EXTERN char *		TkGetBitmapData (Tcl_Interp * interp, char * string, 
-				char * fileName, int * widthPtr, 
-				int * heightPtr, int * hotXPtr, 
+EXTERN char *		TkGetBitmapData (Tcl_Interp * interp, char * string,
+				char * fileName, int * widthPtr,
+				int * heightPtr, int * hotXPtr,
 				int * hotYPtr);
 #endif
 #ifndef TkGetButtPoints_TCL_DECLARED
 #define TkGetButtPoints_TCL_DECLARED
 /* 31 */
-EXTERN void		TkGetButtPoints (double p1[], double p2[], 
-				double width, int project, double m1[], 
+EXTERN void		TkGetButtPoints (double p1[], double p2[],
+				double width, int project, double m1[],
 				double m2[]);
 #endif
 #ifndef TkGetCursorByName_TCL_DECLARED
 #define TkGetCursorByName_TCL_DECLARED
 /* 32 */
-EXTERN TkCursor *	TkGetCursorByName (Tcl_Interp * interp, 
+EXTERN TkCursor *	TkGetCursorByName (Tcl_Interp * interp,
 				Tk_Window tkwin, Tk_Uid string);
 #endif
 #ifndef TkGetDefaultScreenName_TCL_DECLARED
 #define TkGetDefaultScreenName_TCL_DECLARED
 /* 33 */
-EXTERN CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp * interp, 
-				CONST char * screenName);
+EXTERN CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp * interp,
+				const char * screenName);
 #endif
 #ifndef TkGetDisplay_TCL_DECLARED
 #define TkGetDisplay_TCL_DECLARED
@@ -248,8 +248,8 @@ EXTERN TkDisplay *	TkGetDisplay (Display * display);
 #ifndef TkGetDisplayOf_TCL_DECLARED
 #define TkGetDisplayOf_TCL_DECLARED
 /* 35 */
-EXTERN int		TkGetDisplayOf (Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[], Tk_Window * tkwinPtr);
+EXTERN int		TkGetDisplayOf (Tcl_Interp * interp, int objc,
+				Tcl_Obj *const objv[], Tk_Window * tkwinPtr);
 #endif
 #ifndef TkGetFocusWin_TCL_DECLARED
 #define TkGetFocusWin_TCL_DECLARED
@@ -259,26 +259,26 @@ EXTERN TkWindow *	TkGetFocusWin (TkWindow * winPtr);
 #ifndef TkGetInterpNames_TCL_DECLARED
 #define TkGetInterpNames_TCL_DECLARED
 /* 37 */
-EXTERN int		TkGetInterpNames (Tcl_Interp * interp, 
+EXTERN int		TkGetInterpNames (Tcl_Interp * interp,
 				Tk_Window tkwin);
 #endif
 #ifndef TkGetMiterPoints_TCL_DECLARED
 #define TkGetMiterPoints_TCL_DECLARED
 /* 38 */
-EXTERN int		TkGetMiterPoints (double p1[], double p2[], 
-				double p3[], double width, double m1[], 
+EXTERN int		TkGetMiterPoints (double p1[], double p2[],
+				double p3[], double width, double m1[],
 				double m2[]);
 #endif
 #ifndef TkGetPointerCoords_TCL_DECLARED
 #define TkGetPointerCoords_TCL_DECLARED
 /* 39 */
-EXTERN void		TkGetPointerCoords (Tk_Window tkwin, int * xPtr, 
+EXTERN void		TkGetPointerCoords (Tk_Window tkwin, int * xPtr,
 				int * yPtr);
 #endif
 #ifndef TkGetServerInfo_TCL_DECLARED
 #define TkGetServerInfo_TCL_DECLARED
 /* 40 */
-EXTERN void		TkGetServerInfo (Tcl_Interp * interp, 
+EXTERN void		TkGetServerInfo (Tcl_Interp * interp,
 				Tk_Window tkwin);
 #endif
 #ifndef TkGrabDeadWindow_TCL_DECLARED
@@ -299,9 +299,9 @@ EXTERN void		TkIncludePoint (Tk_Item * itemPtr, double * pointPtr);
 #ifndef TkInOutEvents_TCL_DECLARED
 #define TkInOutEvents_TCL_DECLARED
 /* 44 */
-EXTERN void		TkInOutEvents (XEvent * eventPtr, 
-				TkWindow * sourcePtr, TkWindow * destPtr, 
-				int leaveType, int enterType, 
+EXTERN void		TkInOutEvents (XEvent * eventPtr,
+				TkWindow * sourcePtr, TkWindow * destPtr,
+				int leaveType, int enterType,
 				Tcl_QueuePosition position);
 #endif
 #ifndef TkInstallFrameMenu_TCL_DECLARED
@@ -317,28 +317,28 @@ EXTERN char *		TkKeysymToString (KeySym keysym);
 #ifndef TkLineToArea_TCL_DECLARED
 #define TkLineToArea_TCL_DECLARED
 /* 47 */
-EXTERN int		TkLineToArea (double end1Ptr[], double end2Ptr[], 
+EXTERN int		TkLineToArea (double end1Ptr[], double end2Ptr[],
 				double rectPtr[]);
 #endif
 #ifndef TkLineToPoint_TCL_DECLARED
 #define TkLineToPoint_TCL_DECLARED
 /* 48 */
-EXTERN double		TkLineToPoint (double end1Ptr[], double end2Ptr[], 
+EXTERN double		TkLineToPoint (double end1Ptr[], double end2Ptr[],
 				double pointPtr[]);
 #endif
 #ifndef TkMakeBezierCurve_TCL_DECLARED
 #define TkMakeBezierCurve_TCL_DECLARED
 /* 49 */
-EXTERN int		TkMakeBezierCurve (Tk_Canvas canvas, 
-				double * pointPtr, int numPoints, 
-				int numSteps, XPoint xPoints[], 
+EXTERN int		TkMakeBezierCurve (Tk_Canvas canvas,
+				double * pointPtr, int numPoints,
+				int numSteps, XPoint xPoints[],
 				double dblPoints[]);
 #endif
 #ifndef TkMakeBezierPostscript_TCL_DECLARED
 #define TkMakeBezierPostscript_TCL_DECLARED
 /* 50 */
-EXTERN void		TkMakeBezierPostscript (Tcl_Interp * interp, 
-				Tk_Canvas canvas, double * pointPtr, 
+EXTERN void		TkMakeBezierPostscript (Tcl_Interp * interp,
+				Tk_Canvas canvas, double * pointPtr,
 				int numPoints);
 #endif
 #ifndef TkOptionClassChanged_TCL_DECLARED
@@ -359,7 +359,7 @@ EXTERN int		TkOvalToArea (double * ovalPtr, double * rectPtr);
 #ifndef TkOvalToPoint_TCL_DECLARED
 #define TkOvalToPoint_TCL_DECLARED
 /* 54 */
-EXTERN double		TkOvalToPoint (double ovalPtr[], double width, 
+EXTERN double		TkOvalToPoint (double ovalPtr[], double width,
 				int filled, double pointPtr[]);
 #endif
 #ifndef TkpChangeFocus_TCL_DECLARED
@@ -380,13 +380,13 @@ EXTERN void		TkpClaimFocus (TkWindow * topLevelPtr, int force);
 #ifndef TkpDisplayWarning_TCL_DECLARED
 #define TkpDisplayWarning_TCL_DECLARED
 /* 58 */
-EXTERN void		TkpDisplayWarning (CONST char * msg, 
-				CONST char * title);
+EXTERN void		TkpDisplayWarning (const char * msg,
+				const char * title);
 #endif
 #ifndef TkpGetAppName_TCL_DECLARED
 #define TkpGetAppName_TCL_DECLARED
 /* 59 */
-EXTERN void		TkpGetAppName (Tcl_Interp * interp, 
+EXTERN void		TkpGetAppName (Tcl_Interp * interp,
 				Tcl_DString * name);
 #endif
 #ifndef TkpGetOtherWindow_TCL_DECLARED
@@ -407,7 +407,7 @@ EXTERN int		TkpInit (Tcl_Interp * interp);
 #ifndef TkpInitializeMenuBindings_TCL_DECLARED
 #define TkpInitializeMenuBindings_TCL_DECLARED
 /* 63 */
-EXTERN void		TkpInitializeMenuBindings (Tcl_Interp * interp, 
+EXTERN void		TkpInitializeMenuBindings (Tcl_Interp * interp,
 				Tk_BindingTable bindingTable);
 #endif
 #ifndef TkpMakeContainer_TCL_DECLARED
@@ -428,13 +428,13 @@ EXTERN Window		TkpMakeWindow (TkWindow * winPtr, Window parent);
 #ifndef TkpMenuNotifyToplevelCreate_TCL_DECLARED
 #define TkpMenuNotifyToplevelCreate_TCL_DECLARED
 /* 67 */
-EXTERN void		TkpMenuNotifyToplevelCreate (Tcl_Interp * interp1, 
+EXTERN void		TkpMenuNotifyToplevelCreate (Tcl_Interp * interp1,
 				char * menuName);
 #endif
 #ifndef TkpOpenDisplay_TCL_DECLARED
 #define TkpOpenDisplay_TCL_DECLARED
 /* 68 */
-EXTERN TkDisplay *	TkpOpenDisplay (CONST char * display_name);
+EXTERN TkDisplay *	TkpOpenDisplay (const char * display_name);
 #endif
 #ifndef TkPointerEvent_TCL_DECLARED
 #define TkPointerEvent_TCL_DECLARED
@@ -444,61 +444,61 @@ EXTERN int		TkPointerEvent (XEvent * eventPtr, TkWindow * winPtr);
 #ifndef TkPolygonToArea_TCL_DECLARED
 #define TkPolygonToArea_TCL_DECLARED
 /* 70 */
-EXTERN int		TkPolygonToArea (double * polyPtr, int numPoints, 
+EXTERN int		TkPolygonToArea (double * polyPtr, int numPoints,
 				double * rectPtr);
 #endif
 #ifndef TkPolygonToPoint_TCL_DECLARED
 #define TkPolygonToPoint_TCL_DECLARED
 /* 71 */
-EXTERN double		TkPolygonToPoint (double * polyPtr, int numPoints, 
+EXTERN double		TkPolygonToPoint (double * polyPtr, int numPoints,
 				double * pointPtr);
 #endif
 #ifndef TkPositionInTree_TCL_DECLARED
 #define TkPositionInTree_TCL_DECLARED
 /* 72 */
-EXTERN int		TkPositionInTree (TkWindow * winPtr, 
+EXTERN int		TkPositionInTree (TkWindow * winPtr,
 				TkWindow * treePtr);
 #endif
 #ifndef TkpRedirectKeyEvent_TCL_DECLARED
 #define TkpRedirectKeyEvent_TCL_DECLARED
 /* 73 */
-EXTERN void		TkpRedirectKeyEvent (TkWindow * winPtr, 
+EXTERN void		TkpRedirectKeyEvent (TkWindow * winPtr,
 				XEvent * eventPtr);
 #endif
 #ifndef TkpSetMainMenubar_TCL_DECLARED
 #define TkpSetMainMenubar_TCL_DECLARED
 /* 74 */
-EXTERN void		TkpSetMainMenubar (Tcl_Interp * interp, 
+EXTERN void		TkpSetMainMenubar (Tcl_Interp * interp,
 				Tk_Window tkwin, char * menuName);
 #endif
 #ifndef TkpUseWindow_TCL_DECLARED
 #define TkpUseWindow_TCL_DECLARED
 /* 75 */
-EXTERN int		TkpUseWindow (Tcl_Interp * interp, Tk_Window tkwin, 
-				CONST char * string);
+EXTERN int		TkpUseWindow (Tcl_Interp * interp, Tk_Window tkwin,
+				const char * string);
 #endif
 /* Slot 76 is reserved */
 #ifndef TkQueueEventForAllChildren_TCL_DECLARED
 #define TkQueueEventForAllChildren_TCL_DECLARED
 /* 77 */
-EXTERN void		TkQueueEventForAllChildren (TkWindow * winPtr, 
+EXTERN void		TkQueueEventForAllChildren (TkWindow * winPtr,
 				XEvent * eventPtr);
 #endif
 #ifndef TkReadBitmapFile_TCL_DECLARED
 #define TkReadBitmapFile_TCL_DECLARED
 /* 78 */
-EXTERN int		TkReadBitmapFile (Display * display, Drawable d, 
-				CONST char * filename, 
-				unsigned int * width_return, 
-				unsigned int * height_return, 
-				Pixmap * bitmap_return, int * x_hot_return, 
+EXTERN int		TkReadBitmapFile (Display * display, Drawable d,
+				const char * filename,
+				unsigned int * width_return,
+				unsigned int * height_return,
+				Pixmap * bitmap_return, int * x_hot_return,
 				int * y_hot_return);
 #endif
 #ifndef TkScrollWindow_TCL_DECLARED
 #define TkScrollWindow_TCL_DECLARED
 /* 79 */
-EXTERN int		TkScrollWindow (Tk_Window tkwin, GC gc, int x, int y, 
-				int width, int height, int dx, int dy, 
+EXTERN int		TkScrollWindow (Tk_Window tkwin, GC gc, int x, int y,
+				int width, int height, int dx, int dy,
 				TkRegion damageRgn);
 #endif
 #ifndef TkSelDeadWindow_TCL_DECLARED
@@ -525,8 +525,8 @@ EXTERN void		TkSelPropProc (XEvent * eventPtr);
 #ifndef TkSetWindowMenuBar_TCL_DECLARED
 #define TkSetWindowMenuBar_TCL_DECLARED
 /* 85 */
-EXTERN void		TkSetWindowMenuBar (Tcl_Interp * interp, 
-				Tk_Window tkwin, char * oldMenuName, 
+EXTERN void		TkSetWindowMenuBar (Tcl_Interp * interp,
+				Tk_Window tkwin, char * oldMenuName,
 				char * menuName);
 #endif
 #ifndef TkStringToKeysym_TCL_DECLARED
@@ -537,8 +537,8 @@ EXTERN KeySym		TkStringToKeysym (char * name);
 #ifndef TkThickPolyLineToArea_TCL_DECLARED
 #define TkThickPolyLineToArea_TCL_DECLARED
 /* 87 */
-EXTERN int		TkThickPolyLineToArea (double * coordPtr, 
-				int numPoints, double width, int capStyle, 
+EXTERN int		TkThickPolyLineToArea (double * coordPtr,
+				int numPoints, double width, int capStyle,
 				int joinStyle, double * rectPtr);
 #endif
 #ifndef TkWmAddToColormapWindows_TCL_DECLARED
@@ -569,7 +569,7 @@ EXTERN void		TkWmNewWindow (TkWindow * winPtr);
 #ifndef TkWmProtocolEventProc_TCL_DECLARED
 #define TkWmProtocolEventProc_TCL_DECLARED
 /* 93 */
-EXTERN void		TkWmProtocolEventProc (TkWindow * winPtr, 
+EXTERN void		TkWmProtocolEventProc (TkWindow * winPtr,
 				XEvent * evenvPtr);
 #endif
 #ifndef TkWmRemoveFromColormapWindows_TCL_DECLARED
@@ -580,7 +580,7 @@ EXTERN void		TkWmRemoveFromColormapWindows (TkWindow * winPtr);
 #ifndef TkWmRestackToplevel_TCL_DECLARED
 #define TkWmRestackToplevel_TCL_DECLARED
 /* 95 */
-EXTERN void		TkWmRestackToplevel (TkWindow * winPtr, 
+EXTERN void		TkWmRestackToplevel (TkWindow * winPtr,
 				int aboveBelow, TkWindow * otherPtr);
 #endif
 #ifndef TkWmSetClass_TCL_DECLARED
@@ -616,7 +616,7 @@ EXTERN Tcl_Obj *	TkDebugColor (Tk_Window tkwin, char * name);
 #ifndef TkDebugConfig_TCL_DECLARED
 #define TkDebugConfig_TCL_DECLARED
 /* 102 */
-EXTERN Tcl_Obj *	TkDebugConfig (Tcl_Interp * interp, 
+EXTERN Tcl_Obj *	TkDebugConfig (Tcl_Interp * interp,
 				Tk_OptionTable table);
 #endif
 #ifndef TkDebugFont_TCL_DECLARED
@@ -627,9 +627,9 @@ EXTERN Tcl_Obj *	TkDebugFont (Tk_Window tkwin, char * name);
 #ifndef TkFindStateNumObj_TCL_DECLARED
 #define TkFindStateNumObj_TCL_DECLARED
 /* 104 */
-EXTERN int		TkFindStateNumObj (Tcl_Interp * interp, 
-				Tcl_Obj * optionPtr, 
-				CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr);
+EXTERN int		TkFindStateNumObj (Tcl_Interp * interp,
+				Tcl_Obj * optionPtr,
+				const TkStateMap * mapPtr, Tcl_Obj * keyPtr);
 #endif
 #ifndef TkGetBitmapPredefTable_TCL_DECLARED
 #define TkGetBitmapPredefTable_TCL_DECLARED
@@ -649,14 +649,14 @@ EXTERN TkMainInfo *	TkGetMainInfoList (void);
 #ifndef TkGetWindowFromObj_TCL_DECLARED
 #define TkGetWindowFromObj_TCL_DECLARED
 /* 108 */
-EXTERN int		TkGetWindowFromObj (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tcl_Obj * objPtr, 
+EXTERN int		TkGetWindowFromObj (Tcl_Interp * interp,
+				Tk_Window tkwin, Tcl_Obj * objPtr,
 				Tk_Window * windowPtr);
 #endif
 #ifndef TkpGetString_TCL_DECLARED
 #define TkpGetString_TCL_DECLARED
 /* 109 */
-EXTERN char *		TkpGetString (TkWindow * winPtr, XEvent * eventPtr, 
+EXTERN char *		TkpGetString (TkWindow * winPtr, XEvent * eventPtr,
 				Tcl_DString * dsPtr);
 #endif
 #ifndef TkpGetSubFonts_TCL_DECLARED
@@ -667,8 +667,8 @@ EXTERN void		TkpGetSubFonts (Tcl_Interp * interp, Tk_Font tkfont);
 #ifndef TkpGetSystemDefault_TCL_DECLARED
 #define TkpGetSystemDefault_TCL_DECLARED
 /* 111 */
-EXTERN Tcl_Obj *	TkpGetSystemDefault (Tk_Window tkwin, 
-				CONST char * dbName, CONST char * className);
+EXTERN Tcl_Obj *	TkpGetSystemDefault (Tk_Window tkwin,
+				const char * dbName, const char * className);
 #endif
 #ifndef TkpMenuThreadInit_TCL_DECLARED
 #define TkpMenuThreadInit_TCL_DECLARED
@@ -721,7 +721,7 @@ EXTERN void		TkDestroyRegion (TkRegion rgn);
 #ifndef TkIntersectRegion_TCL_DECLARED
 #define TkIntersectRegion_TCL_DECLARED
 /* 116 */
-EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb, 
+EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
 #endif
 #endif /* WIN */
@@ -729,7 +729,7 @@ EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb,
 #ifndef TkIntersectRegion_TCL_DECLARED
 #define TkIntersectRegion_TCL_DECLARED
 /* 116 */
-EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb, 
+EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
 #endif
 #endif /* AQUA */
@@ -737,7 +737,7 @@ EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb,
 #ifndef TkRectInRegion_TCL_DECLARED
 #define TkRectInRegion_TCL_DECLARED
 /* 117 */
-EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y, 
+EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y,
 				unsigned int width, unsigned int height);
 #endif
 #endif /* WIN */
@@ -745,7 +745,7 @@ EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y,
 #ifndef TkRectInRegion_TCL_DECLARED
 #define TkRectInRegion_TCL_DECLARED
 /* 117 */
-EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y, 
+EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y,
 				unsigned int width, unsigned int height);
 #endif
 #endif /* AQUA */
@@ -767,7 +767,7 @@ EXTERN void		TkSetRegion (Display * display, GC gc, TkRegion rgn);
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
-EXTERN void		TkUnionRectWithRegion (XRectangle * rect, 
+EXTERN void		TkUnionRectWithRegion (XRectangle * rect,
 				TkRegion src, TkRegion dr_return);
 #endif
 #endif /* WIN */
@@ -775,7 +775,7 @@ EXTERN void		TkUnionRectWithRegion (XRectangle * rect,
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
-EXTERN void		TkUnionRectWithRegion (XRectangle * rect, 
+EXTERN void		TkUnionRectWithRegion (XRectangle * rect,
 				TkRegion src, TkRegion dr_return);
 #endif
 #endif /* AQUA */
@@ -784,8 +784,8 @@ EXTERN void		TkUnionRectWithRegion (XRectangle * rect,
 #ifndef TkpCreateNativeBitmap_TCL_DECLARED
 #define TkpCreateNativeBitmap_TCL_DECLARED
 /* 121 */
-EXTERN Pixmap		TkpCreateNativeBitmap (Display * display, 
-				CONST char * source);
+EXTERN Pixmap		TkpCreateNativeBitmap (Display * display,
+				const char * source);
 #endif
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
@@ -800,8 +800,8 @@ EXTERN void		TkpDefineNativeBitmaps (void);
 #ifndef TkpGetNativeAppBitmap_TCL_DECLARED
 #define TkpGetNativeAppBitmap_TCL_DECLARED
 /* 124 */
-EXTERN Pixmap		TkpGetNativeAppBitmap (Display * display, 
-				CONST char * name, int * width, int * height);
+EXTERN Pixmap		TkpGetNativeAppBitmap (Display * display,
+				const char * name, int * width, int * height);
 #endif
 #endif /* AQUA */
 /* Slot 125 is reserved */
@@ -817,8 +817,8 @@ EXTERN Pixmap		TkpGetNativeAppBitmap (Display * display,
 #ifndef TkpDrawHighlightBorder_TCL_DECLARED
 #define TkpDrawHighlightBorder_TCL_DECLARED
 /* 135 */
-EXTERN void		TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC, 
-				GC bgGC, int highlightWidth, 
+EXTERN void		TkpDrawHighlightBorder (Tk_Window tkwin, GC fgGC,
+				GC bgGC, int highlightWidth,
 				Drawable drawable);
 #endif
 #ifndef TkSetFocusWin_TCL_DECLARED
@@ -829,7 +829,7 @@ EXTERN void		TkSetFocusWin (TkWindow * winPtr, int force);
 #ifndef TkpSetKeycodeAndState_TCL_DECLARED
 #define TkpSetKeycodeAndState_TCL_DECLARED
 /* 137 */
-EXTERN void		TkpSetKeycodeAndState (Tk_Window tkwin, 
+EXTERN void		TkpSetKeycodeAndState (Tk_Window tkwin,
 				KeySym keySym, XEvent * eventPtr);
 #endif
 #ifndef TkpGetKeySym_TCL_DECLARED
@@ -871,7 +871,7 @@ EXTERN void		TkGCCleanup (TkDisplay * dispPtr);
 #ifndef TkSubtractRegion_TCL_DECLARED
 #define TkSubtractRegion_TCL_DECLARED
 /* 145 */
-EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb, 
+EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
 #endif
 #endif /* WIN */
@@ -879,7 +879,7 @@ EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb,
 #ifndef TkSubtractRegion_TCL_DECLARED
 #define TkSubtractRegion_TCL_DECLARED
 /* 145 */
-EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb, 
+EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
 #endif
 #endif /* AQUA */
@@ -896,67 +896,67 @@ EXTERN void		TkStylePkgFree (TkMainInfo * mainPtr);
 #ifndef TkToplevelWindowForCommand_TCL_DECLARED
 #define TkToplevelWindowForCommand_TCL_DECLARED
 /* 148 */
-EXTERN Tk_Window	TkToplevelWindowForCommand (Tcl_Interp * interp, 
-				CONST char * cmdName);
+EXTERN Tk_Window	TkToplevelWindowForCommand (Tcl_Interp * interp,
+				const char * cmdName);
 #endif
 #ifndef TkGetOptionSpec_TCL_DECLARED
 #define TkGetOptionSpec_TCL_DECLARED
 /* 149 */
-EXTERN CONST Tk_OptionSpec * TkGetOptionSpec (CONST char * name, 
+EXTERN const Tk_OptionSpec * TkGetOptionSpec (const char * name,
 				Tk_OptionTable optionTable);
 #endif
 #ifndef TkMakeRawCurve_TCL_DECLARED
 #define TkMakeRawCurve_TCL_DECLARED
 /* 150 */
-EXTERN int		TkMakeRawCurve (Tk_Canvas canvas, double * pointPtr, 
-				int numPoints, int numSteps, 
+EXTERN int		TkMakeRawCurve (Tk_Canvas canvas, double * pointPtr,
+				int numPoints, int numSteps,
 				XPoint xPoints[], double dblPoints[]);
 #endif
 #ifndef TkMakeRawCurvePostscript_TCL_DECLARED
 #define TkMakeRawCurvePostscript_TCL_DECLARED
 /* 151 */
-EXTERN void		TkMakeRawCurvePostscript (Tcl_Interp * interp, 
-				Tk_Canvas canvas, double * pointPtr, 
+EXTERN void		TkMakeRawCurvePostscript (Tcl_Interp * interp,
+				Tk_Canvas canvas, double * pointPtr,
 				int numPoints);
 #endif
 #ifndef TkpDrawFrame_TCL_DECLARED
 #define TkpDrawFrame_TCL_DECLARED
 /* 152 */
-EXTERN void		TkpDrawFrame (Tk_Window tkwin, Tk_3DBorder border, 
-				int highlightWidth, int borderWidth, 
+EXTERN void		TkpDrawFrame (Tk_Window tkwin, Tk_3DBorder border,
+				int highlightWidth, int borderWidth,
 				int relief);
 #endif
 #ifndef TkCreateThreadExitHandler_TCL_DECLARED
 #define TkCreateThreadExitHandler_TCL_DECLARED
 /* 153 */
-EXTERN void		TkCreateThreadExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		TkCreateThreadExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 #ifndef TkDeleteThreadExitHandler_TCL_DECLARED
 #define TkDeleteThreadExitHandler_TCL_DECLARED
 /* 154 */
-EXTERN void		TkDeleteThreadExitHandler (Tcl_ExitProc * proc, 
+EXTERN void		TkDeleteThreadExitHandler (Tcl_ExitProc * proc,
 				ClientData clientData);
 #endif
 /* Slot 155 is reserved */
 #ifndef TkpTestembedCmd_TCL_DECLARED
 #define TkpTestembedCmd_TCL_DECLARED
 /* 156 */
-EXTERN int		TkpTestembedCmd (ClientData clientData, 
-				Tcl_Interp * interp, int argc, 
-				CONST char ** argv);
+EXTERN int		TkpTestembedCmd (ClientData clientData,
+				Tcl_Interp * interp, int argc,
+				const char ** argv);
 #endif
 #ifndef TkpTesttextCmd_TCL_DECLARED
 #define TkpTesttextCmd_TCL_DECLARED
 /* 157 */
-EXTERN int		TkpTesttextCmd (ClientData dummy, 
-				Tcl_Interp * interp, int argc, 
-				CONST char ** argv);
+EXTERN int		TkpTesttextCmd (ClientData dummy,
+				Tcl_Interp * interp, int argc,
+				const char ** argv);
 #endif
 
 typedef struct TkIntStubs {
     int magic;
-    CONST struct TkIntStubHooks *hooks;
+    const struct TkIntStubHooks *hooks;
 
     TkWindow * (*tkAllocWindow) (TkDisplay * dispPtr, int screenNum, TkWindow * parentPtr); /* 0 */
     void (*tkBezierPoints) (double control[], int numSteps, double * coordPtr); /* 1 */
@@ -969,18 +969,18 @@ typedef struct TkIntStubs {
     int (*tkClipInit) (Tcl_Interp * interp, TkDisplay * dispPtr); /* 8 */
     void (*tkComputeAnchor) (Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int * xPtr, int * yPtr); /* 9 */
     int (*tkCopyAndGlobalEval) (Tcl_Interp * interp, char * script); /* 10 */
-    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData); /* 11 */
-    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, CONST char * source, CONST char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
+    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, const char * eventString, TkBindEvalProc * evalProc, TkBindFreeProc * freeProc, ClientData clientData); /* 11 */
+    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, const char * source, const char * mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
     int (*tkCreateFrame) (ClientData clientData, Tcl_Interp * interp, int argc, char ** argv, int toplevel, char * appName); /* 13 */
-    Tk_Window (*tkCreateMainWindow) (Tcl_Interp * interp, CONST char * screenName, char * baseName); /* 14 */
+    Tk_Window (*tkCreateMainWindow) (Tcl_Interp * interp, const char * screenName, char * baseName); /* 14 */
     Time (*tkCurrentTime) (TkDisplay * dispPtr); /* 15 */
     void (*tkDeleteAllImages) (TkMainInfo * mainPtr); /* 16 */
     void (*tkDoConfigureNotify) (TkWindow * winPtr); /* 17 */
     void (*tkDrawInsetFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding); /* 18 */
     void (*tkEventDeadWindow) (TkWindow * winPtr); /* 19 */
     void (*tkFillPolygon) (Tk_Canvas canvas, double * coordPtr, int numPoints, Display * display, Drawable drawable, GC gc, GC outlineGC); /* 20 */
-    int (*tkFindStateNum) (Tcl_Interp * interp, CONST char * option, CONST TkStateMap * mapPtr, CONST char * strKey); /* 21 */
-    char * (*tkFindStateString) (CONST TkStateMap * mapPtr, int numKey); /* 22 */
+    int (*tkFindStateNum) (Tcl_Interp * interp, const char * option, const TkStateMap * mapPtr, const char * strKey); /* 21 */
+    char * (*tkFindStateString) (const TkStateMap * mapPtr, int numKey); /* 22 */
     void (*tkFocusDeadWindow) (TkWindow * winPtr); /* 23 */
     int (*tkFocusFilterEvent) (TkWindow * winPtr, XEvent * eventPtr); /* 24 */
     TkWindow * (*tkFocusKeyEvent) (TkWindow * winPtr, XEvent * eventPtr); /* 25 */
@@ -991,9 +991,9 @@ typedef struct TkIntStubs {
     char * (*tkGetBitmapData) (Tcl_Interp * interp, char * string, char * fileName, int * widthPtr, int * heightPtr, int * hotXPtr, int * hotYPtr); /* 30 */
     void (*tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); /* 31 */
     TkCursor * (*tkGetCursorByName) (Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid string); /* 32 */
-    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp * interp, CONST char * screenName); /* 33 */
+    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp * interp, const char * screenName); /* 33 */
     TkDisplay * (*tkGetDisplay) (Display * display); /* 34 */
-    int (*tkGetDisplayOf) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], Tk_Window * tkwinPtr); /* 35 */
+    int (*tkGetDisplayOf) (Tcl_Interp * interp, int objc, Tcl_Obj *const objv[], Tk_Window * tkwinPtr); /* 35 */
     TkWindow * (*tkGetFocusWin) (TkWindow * winPtr); /* 36 */
     int (*tkGetInterpNames) (Tcl_Interp * interp, Tk_Window tkwin); /* 37 */
     int (*tkGetMiterPoints) (double p1[], double p2[], double p3[], double width, double m1[], double m2[]); /* 38 */
@@ -1016,7 +1016,7 @@ typedef struct TkIntStubs {
     int (*tkpChangeFocus) (TkWindow * winPtr, int force); /* 55 */
     void (*tkpCloseDisplay) (TkDisplay * dispPtr); /* 56 */
     void (*tkpClaimFocus) (TkWindow * topLevelPtr, int force); /* 57 */
-    void (*tkpDisplayWarning) (CONST char * msg, CONST char * title); /* 58 */
+    void (*tkpDisplayWarning) (const char * msg, const char * title); /* 58 */
     void (*tkpGetAppName) (Tcl_Interp * interp, Tcl_DString * name); /* 59 */
     TkWindow * (*tkpGetOtherWindow) (TkWindow * winPtr); /* 60 */
     TkWindow * (*tkpGetWrapperWindow) (TkWindow * winPtr); /* 61 */
@@ -1026,17 +1026,17 @@ typedef struct TkIntStubs {
     void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */
     Window (*tkpMakeWindow) (TkWindow * winPtr, Window parent); /* 66 */
     void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp * interp1, char * menuName); /* 67 */
-    TkDisplay * (*tkpOpenDisplay) (CONST char * display_name); /* 68 */
+    TkDisplay * (*tkpOpenDisplay) (const char * display_name); /* 68 */
     int (*tkPointerEvent) (XEvent * eventPtr, TkWindow * winPtr); /* 69 */
     int (*tkPolygonToArea) (double * polyPtr, int numPoints, double * rectPtr); /* 70 */
     double (*tkPolygonToPoint) (double * polyPtr, int numPoints, double * pointPtr); /* 71 */
     int (*tkPositionInTree) (TkWindow * winPtr, TkWindow * treePtr); /* 72 */
     void (*tkpRedirectKeyEvent) (TkWindow * winPtr, XEvent * eventPtr); /* 73 */
     void (*tkpSetMainMenubar) (Tcl_Interp * interp, Tk_Window tkwin, char * menuName); /* 74 */
-    int (*tkpUseWindow) (Tcl_Interp * interp, Tk_Window tkwin, CONST char * string); /* 75 */
+    int (*tkpUseWindow) (Tcl_Interp * interp, Tk_Window tkwin, const char * string); /* 75 */
     void *reserved76;
     void (*tkQueueEventForAllChildren) (TkWindow * winPtr, XEvent * eventPtr); /* 77 */
-    int (*tkReadBitmapFile) (Display * display, Drawable d, CONST char * filename, unsigned int * width_return, unsigned int * height_return, Pixmap * bitmap_return, int * x_hot_return, int * y_hot_return); /* 78 */
+    int (*tkReadBitmapFile) (Display * display, Drawable d, const char * filename, unsigned int * width_return, unsigned int * height_return, Pixmap * bitmap_return, int * x_hot_return, int * y_hot_return); /* 78 */
     int (*tkScrollWindow) (Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn); /* 79 */
     void (*tkSelDeadWindow) (TkWindow * winPtr); /* 80 */
     void (*tkSelEventProc) (Tk_Window tkwin, XEvent * eventPtr); /* 81 */
@@ -1062,14 +1062,14 @@ typedef struct TkIntStubs {
     Tcl_Obj * (*tkDebugColor) (Tk_Window tkwin, char * name); /* 101 */
     Tcl_Obj * (*tkDebugConfig) (Tcl_Interp * interp, Tk_OptionTable table); /* 102 */
     Tcl_Obj * (*tkDebugFont) (Tk_Window tkwin, char * name); /* 103 */
-    int (*tkFindStateNumObj) (Tcl_Interp * interp, Tcl_Obj * optionPtr, CONST TkStateMap * mapPtr, Tcl_Obj * keyPtr); /* 104 */
+    int (*tkFindStateNumObj) (Tcl_Interp * interp, Tcl_Obj * optionPtr, const TkStateMap * mapPtr, Tcl_Obj * keyPtr); /* 104 */
     Tcl_HashTable * (*tkGetBitmapPredefTable) (void); /* 105 */
     TkDisplay * (*tkGetDisplayList) (void); /* 106 */
     TkMainInfo * (*tkGetMainInfoList) (void); /* 107 */
     int (*tkGetWindowFromObj) (Tcl_Interp * interp, Tk_Window tkwin, Tcl_Obj * objPtr, Tk_Window * windowPtr); /* 108 */
     char * (*tkpGetString) (TkWindow * winPtr, XEvent * eventPtr, Tcl_DString * dsPtr); /* 109 */
     void (*tkpGetSubFonts) (Tcl_Interp * interp, Tk_Font tkfont); /* 110 */
-    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char * dbName, CONST char * className); /* 111 */
+    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char * dbName, const char * className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved113;
@@ -1150,7 +1150,7 @@ typedef struct TkIntStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void *reserved121; /* Dummy entry for stubs table backwards compatibility */
-    Pixmap (*tkpCreateNativeBitmap) (Display * display, CONST char * source); /* 121 */
+    Pixmap (*tkpCreateNativeBitmap) (Display * display, const char * source); /* 121 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved122;
@@ -1171,7 +1171,7 @@ typedef struct TkIntStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void *reserved124; /* Dummy entry for stubs table backwards compatibility */
-    Pixmap (*tkpGetNativeAppBitmap) (Display * display, CONST char * name, int * width, int * height); /* 124 */
+    Pixmap (*tkpGetNativeAppBitmap) (Display * display, const char * name, int * width, int * height); /* 124 */
 #endif /* AQUA */
     void *reserved125;
     void *reserved126;
@@ -1205,20 +1205,20 @@ typedef struct TkIntStubs {
 #endif /* AQUA */
     void (*tkStylePkgInit) (TkMainInfo * mainPtr); /* 146 */
     void (*tkStylePkgFree) (TkMainInfo * mainPtr); /* 147 */
-    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp * interp, CONST char * cmdName); /* 148 */
-    CONST Tk_OptionSpec * (*tkGetOptionSpec) (CONST char * name, Tk_OptionTable optionTable); /* 149 */
+    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp * interp, const char * cmdName); /* 148 */
+    const Tk_OptionSpec * (*tkGetOptionSpec) (const char * name, Tk_OptionTable optionTable); /* 149 */
     int (*tkMakeRawCurve) (Tk_Canvas canvas, double * pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]); /* 150 */
     void (*tkMakeRawCurvePostscript) (Tcl_Interp * interp, Tk_Canvas canvas, double * pointPtr, int numPoints); /* 151 */
     void (*tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); /* 152 */
     void (*tkCreateThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 153 */
     void (*tkDeleteThreadExitHandler) (Tcl_ExitProc * proc, ClientData clientData); /* 154 */
     void *reserved155;
-    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp * interp, int argc, CONST char ** argv); /* 156 */
-    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp * interp, int argc, CONST char ** argv); /* 157 */
+    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp * interp, int argc, const char ** argv); /* 156 */
+    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp * interp, int argc, const char ** argv); /* 157 */
 } TkIntStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkIntStubs *tkIntStubsPtr;
+extern const TkIntStubs *tkIntStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index dabb233..7b75731 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.33 2008/08/19 15:52:12 georgeps Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.34 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -36,14 +36,14 @@
 #ifndef TkAlignImageData_TCL_DECLARED
 #define TkAlignImageData_TCL_DECLARED
 /* 0 */
-EXTERN char *		TkAlignImageData (XImage * image, int alignment, 
+EXTERN char *		TkAlignImageData (XImage * image, int alignment,
 				int bitOrder);
 #endif
 /* Slot 1 is reserved */
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
 #define TkGenerateActivateEvents_TCL_DECLARED
 /* 2 */
-EXTERN void		TkGenerateActivateEvents (TkWindow * winPtr, 
+EXTERN void		TkGenerateActivateEvents (TkWindow * winPtr,
 				int active);
 #endif
 #ifndef TkpGetMS_TCL_DECLARED
@@ -64,8 +64,8 @@ EXTERN void		TkpPrintWindowId (char * buf, Window window);
 #ifndef TkpScanWindowId_TCL_DECLARED
 #define TkpScanWindowId_TCL_DECLARED
 /* 6 */
-EXTERN int		TkpScanWindowId (Tcl_Interp * interp, 
-				CONST char * string, Window * idPtr);
+EXTERN int		TkpScanWindowId (Tcl_Interp * interp,
+				const char * string, Window * idPtr);
 #endif
 #ifndef TkpSetCapture_TCL_DECLARED
 #define TkpSetCapture_TCL_DECLARED
@@ -85,7 +85,7 @@ EXTERN void		TkpWmSetState (TkWindow * winPtr, int state);
 #ifndef TkSetPixmapColormap_TCL_DECLARED
 #define TkSetPixmapColormap_TCL_DECLARED
 /* 10 */
-EXTERN void		TkSetPixmapColormap (Pixmap pixmap, 
+EXTERN void		TkSetPixmapColormap (Pixmap pixmap,
 				Colormap colormap);
 #endif
 #ifndef TkWinCancelMouseTimer_TCL_DECLARED
@@ -96,31 +96,31 @@ EXTERN void		TkWinCancelMouseTimer (void);
 #ifndef TkWinClipboardRender_TCL_DECLARED
 #define TkWinClipboardRender_TCL_DECLARED
 /* 12 */
-EXTERN void		TkWinClipboardRender (TkDisplay * dispPtr, 
+EXTERN void		TkWinClipboardRender (TkDisplay * dispPtr,
 				UINT format);
 #endif
 #ifndef TkWinEmbeddedEventProc_TCL_DECLARED
 #define TkWinEmbeddedEventProc_TCL_DECLARED
 /* 13 */
-EXTERN LRESULT		TkWinEmbeddedEventProc (HWND hwnd, UINT message, 
+EXTERN LRESULT		TkWinEmbeddedEventProc (HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
 #endif
 #ifndef TkWinFillRect_TCL_DECLARED
 #define TkWinFillRect_TCL_DECLARED
 /* 14 */
-EXTERN void		TkWinFillRect (HDC dc, int x, int y, int width, 
+EXTERN void		TkWinFillRect (HDC dc, int x, int y, int width,
 				int height, int pixel);
 #endif
 #ifndef TkWinGetBorderPixels_TCL_DECLARED
 #define TkWinGetBorderPixels_TCL_DECLARED
 /* 15 */
-EXTERN COLORREF		TkWinGetBorderPixels (Tk_Window tkwin, 
+EXTERN COLORREF		TkWinGetBorderPixels (Tk_Window tkwin,
 				Tk_3DBorder border, int which);
 #endif
 #ifndef TkWinGetDrawableDC_TCL_DECLARED
 #define TkWinGetDrawableDC_TCL_DECLARED
 /* 16 */
-EXTERN HDC		TkWinGetDrawableDC (Display * display, Drawable d, 
+EXTERN HDC		TkWinGetDrawableDC (Display * display, Drawable d,
 				TkWinDCState * state);
 #endif
 #ifndef TkWinGetModifierState_TCL_DECLARED
@@ -141,8 +141,8 @@ EXTERN HWND		TkWinGetWrapperWindow (Tk_Window tkwin);
 #ifndef TkWinHandleMenuEvent_TCL_DECLARED
 #define TkWinHandleMenuEvent_TCL_DECLARED
 /* 20 */
-EXTERN int		TkWinHandleMenuEvent (HWND * phwnd, UINT * pMessage, 
-				WPARAM * pwParam, LPARAM * plParam, 
+EXTERN int		TkWinHandleMenuEvent (HWND * phwnd, UINT * pMessage,
+				WPARAM * pwParam, LPARAM * plParam,
 				LRESULT * plResult);
 #endif
 #ifndef TkWinIndexOfColor_TCL_DECLARED
@@ -153,13 +153,13 @@ EXTERN int		TkWinIndexOfColor (XColor * colorPtr);
 #ifndef TkWinReleaseDrawableDC_TCL_DECLARED
 #define TkWinReleaseDrawableDC_TCL_DECLARED
 /* 22 */
-EXTERN void		TkWinReleaseDrawableDC (Drawable d, HDC hdc, 
+EXTERN void		TkWinReleaseDrawableDC (Drawable d, HDC hdc,
 				TkWinDCState * state);
 #endif
 #ifndef TkWinResendEvent_TCL_DECLARED
 #define TkWinResendEvent_TCL_DECLARED
 /* 23 */
-EXTERN LRESULT		TkWinResendEvent (WNDPROC wndproc, HWND hwnd, 
+EXTERN LRESULT		TkWinResendEvent (WNDPROC wndproc, HWND hwnd,
 				XEvent * eventPtr);
 #endif
 #ifndef TkWinSelectPalette_TCL_DECLARED
@@ -175,7 +175,7 @@ EXTERN void		TkWinSetMenu (Tk_Window tkwin, HMENU hMenu);
 #ifndef TkWinSetWindowPos_TCL_DECLARED
 #define TkWinSetWindowPos_TCL_DECLARED
 /* 26 */
-EXTERN void		TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd, 
+EXTERN void		TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd,
 				int pos);
 #endif
 #ifndef TkWinWmCleanup_TCL_DECLARED
@@ -206,8 +206,8 @@ EXTERN void		TkWinDialogDebug (int debug);
 #ifndef TkWinGetMenuSystemDefault_TCL_DECLARED
 #define TkWinGetMenuSystemDefault_TCL_DECLARED
 /* 32 */
-EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault (Tk_Window tkwin, 
-				CONST char * dbName, CONST char * className);
+EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault (Tk_Window tkwin,
+				const char * dbName, const char * className);
 #endif
 #ifndef TkWinGetPlatformId_TCL_DECLARED
 #define TkWinGetPlatformId_TCL_DECLARED
@@ -229,7 +229,7 @@ EXTERN int		TkWinGetPlatformTheme (void);
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
 #define TkGenerateActivateEvents_TCL_DECLARED
 /* 0 */
-EXTERN void		TkGenerateActivateEvents (TkWindow * winPtr, 
+EXTERN void		TkGenerateActivateEvents (TkWindow * winPtr,
 				int active);
 #endif
 /* Slot 1 is reserved */
@@ -299,13 +299,13 @@ EXTERN Window		TkMacOSXGetXWindow (WindowRef macWinPtr);
 #ifndef TkMacOSXGrowToplevel_TCL_DECLARED
 #define TkMacOSXGrowToplevel_TCL_DECLARED
 /* 17 */
-EXTERN int		TkMacOSXGrowToplevel (WindowRef whichWindow, 
+EXTERN int		TkMacOSXGrowToplevel (WindowRef whichWindow,
 				Point start);
 #endif
 #ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
 #define TkMacOSXHandleMenuSelect_TCL_DECLARED
 /* 18 */
-EXTERN void		TkMacOSXHandleMenuSelect (MenuID theMenu, 
+EXTERN void		TkMacOSXHandleMenuSelect (MenuID theMenu,
 				MenuItemIndex theItem, int optionKeyPressed);
 #endif
 /* Slot 19 is reserved */
@@ -313,13 +313,13 @@ EXTERN void		TkMacOSXHandleMenuSelect (MenuID theMenu,
 #ifndef TkMacOSXInvalidateWindow_TCL_DECLARED
 #define TkMacOSXInvalidateWindow_TCL_DECLARED
 /* 21 */
-EXTERN void		TkMacOSXInvalidateWindow (MacDrawable * macWin, 
+EXTERN void		TkMacOSXInvalidateWindow (MacDrawable * macWin,
 				int flag);
 #endif
 #ifndef TkMacOSXIsCharacterMissing_TCL_DECLARED
 #define TkMacOSXIsCharacterMissing_TCL_DECLARED
 /* 22 */
-EXTERN int		TkMacOSXIsCharacterMissing (Tk_Font tkfont, 
+EXTERN int		TkMacOSXIsCharacterMissing (Tk_Font tkfont,
 				unsigned int searchChar);
 #endif
 #ifndef TkMacOSXMakeRealWindowExist_TCL_DECLARED
@@ -340,7 +340,7 @@ EXTERN void		TkMacOSXMenuClick (void);
 #ifndef TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 #define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 /* 26 */
-EXTERN void		TkMacOSXRegisterOffScreenWindow (Window window, 
+EXTERN void		TkMacOSXRegisterOffScreenWindow (Window window,
 				GWorldPtr portPtr);
 #endif
 #ifndef TkMacOSXResizable_TCL_DECLARED
@@ -356,7 +356,7 @@ EXTERN void		TkMacOSXSetHelpMenuItemCount (void);
 #ifndef TkMacOSXSetScrollbarGrow_TCL_DECLARED
 #define TkMacOSXSetScrollbarGrow_TCL_DECLARED
 /* 29 */
-EXTERN void		TkMacOSXSetScrollbarGrow (TkWindow * winPtr, 
+EXTERN void		TkMacOSXSetScrollbarGrow (TkWindow * winPtr,
 				int flag);
 #endif
 #ifndef TkMacOSXSetUpClippingRgn_TCL_DECLARED
@@ -392,19 +392,19 @@ EXTERN RgnHandle	TkMacOSXVisableClipRgn (TkWindow * winPtr);
 #ifndef TkMacOSXWinBounds_TCL_DECLARED
 #define TkMacOSXWinBounds_TCL_DECLARED
 /* 36 */
-EXTERN void		TkMacOSXWinBounds (TkWindow * winPtr, 
+EXTERN void		TkMacOSXWinBounds (TkWindow * winPtr,
 				Rect * geometry);
 #endif
 #ifndef TkMacOSXWindowOffset_TCL_DECLARED
 #define TkMacOSXWindowOffset_TCL_DECLARED
 /* 37 */
-EXTERN void		TkMacOSXWindowOffset (WindowRef wRef, int * xOffset, 
+EXTERN void		TkMacOSXWindowOffset (WindowRef wRef, int * xOffset,
 				int * yOffset);
 #endif
 #ifndef TkSetMacColor_TCL_DECLARED
 #define TkSetMacColor_TCL_DECLARED
 /* 38 */
-EXTERN int		TkSetMacColor (unsigned long pixel, 
+EXTERN int		TkSetMacColor (unsigned long pixel,
 				RGBColor * macColor);
 #endif
 #ifndef TkSetWMName_TCL_DECLARED
@@ -420,13 +420,13 @@ EXTERN void		TkSuspendClipboard (void);
 #ifndef TkMacOSXZoomToplevel_TCL_DECLARED
 #define TkMacOSXZoomToplevel_TCL_DECLARED
 /* 41 */
-EXTERN int		TkMacOSXZoomToplevel (WindowPtr whichWindow, 
+EXTERN int		TkMacOSXZoomToplevel (WindowPtr whichWindow,
 				short zoomPart);
 #endif
 #ifndef Tk_TopCoordsToWindow_TCL_DECLARED
 #define Tk_TopCoordsToWindow_TCL_DECLARED
 /* 42 */
-EXTERN Tk_Window	Tk_TopCoordsToWindow (Tk_Window tkwin, int rootX, 
+EXTERN Tk_Window	Tk_TopCoordsToWindow (Tk_Window tkwin, int rootX,
 				int rootY, int * newX, int * newY);
 #endif
 #ifndef TkMacOSXContainerId_TCL_DECLARED
@@ -463,7 +463,7 @@ EXTERN Window		TkGetTransientMaster (TkWindow * winPtr);
 #ifndef TkGenerateButtonEvent_TCL_DECLARED
 #define TkGenerateButtonEvent_TCL_DECLARED
 /* 50 */
-EXTERN int		TkGenerateButtonEvent (int x, int y, Window window, 
+EXTERN int		TkGenerateButtonEvent (int x, int y, Window window,
 				unsigned int state);
 #endif
 #ifndef TkGenWMDestroyEvent_TCL_DECLARED
@@ -514,8 +514,8 @@ EXTERN void		TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar);
 #ifndef TkpScanWindowId_TCL_DECLARED
 #define TkpScanWindowId_TCL_DECLARED
 /* 8 */
-EXTERN int		TkpScanWindowId (Tcl_Interp * interp, 
-				CONST char * string, Window * idPtr);
+EXTERN int		TkpScanWindowId (Tcl_Interp * interp,
+				const char * string, Window * idPtr);
 #endif
 #ifndef TkWmCleanup_TCL_DECLARED
 #define TkWmCleanup_TCL_DECLARED
@@ -536,15 +536,15 @@ EXTERN int		TkpWmSetState (TkWindow * winPtr, int state);
 #ifndef TkpTestsendCmd_TCL_DECLARED
 #define TkpTestsendCmd_TCL_DECLARED
 /* 13 */
-EXTERN int		TkpTestsendCmd (ClientData clientData, 
-				Tcl_Interp * interp, int argc, 
-				CONST char ** argv);
+EXTERN int		TkpTestsendCmd (ClientData clientData,
+				Tcl_Interp * interp, int argc,
+				const char ** argv);
 #endif
 #endif /* X11 */
 
 typedef struct TkIntPlatStubs {
     int magic;
-    CONST struct TkIntPlatStubHooks *hooks;
+    const struct TkIntPlatStubHooks *hooks;
 
 #ifdef __WIN32__ /* WIN */
     char * (*tkAlignImageData) (XImage * image, int alignment, int bitOrder); /* 0 */
@@ -553,7 +553,7 @@ typedef struct TkIntPlatStubs {
     unsigned long (*tkpGetMS) (void); /* 3 */
     void (*tkPointerDeadWindow) (TkWindow * winPtr); /* 4 */
     void (*tkpPrintWindowId) (char * buf, Window window); /* 5 */
-    int (*tkpScanWindowId) (Tcl_Interp * interp, CONST char * string, Window * idPtr); /* 6 */
+    int (*tkpScanWindowId) (Tcl_Interp * interp, const char * string, Window * idPtr); /* 6 */
     void (*tkpSetCapture) (TkWindow * winPtr); /* 7 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 8 */
     void (*tkpWmSetState) (TkWindow * winPtr, int state); /* 9 */
@@ -579,7 +579,7 @@ typedef struct TkIntPlatStubs {
     void (*tkWinXInit) (HINSTANCE hInstance); /* 29 */
     void (*tkWinSetForegroundWindow) (TkWindow * winPtr); /* 30 */
     void (*tkWinDialogDebug) (int debug); /* 31 */
-    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, CONST char * dbName, CONST char * className); /* 32 */
+    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, const char * dbName, const char * className); /* 32 */
     int (*tkWinGetPlatformId) (void); /* 33 */
     void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */
     int (*tkWinGetPlatformTheme) (void); /* 35 */
@@ -649,17 +649,17 @@ typedef struct TkIntPlatStubs {
     Window (*tkUnixContainerId) (TkWindow * winPtr); /* 5 */
     int (*tkUnixDoOneXEvent) (Tcl_Time * timePtr); /* 6 */
     void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 7 */
-    int (*tkpScanWindowId) (Tcl_Interp * interp, CONST char * string, Window * idPtr); /* 8 */
+    int (*tkpScanWindowId) (Tcl_Interp * interp, const char * string, Window * idPtr); /* 8 */
     void (*tkWmCleanup) (TkDisplay * dispPtr); /* 9 */
     void (*tkSendCleanup) (TkDisplay * dispPtr); /* 10 */
     void *reserved11;
     int (*tkpWmSetState) (TkWindow * winPtr, int state); /* 12 */
-    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp * interp, int argc, CONST char ** argv); /* 13 */
+    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp * interp, int argc, const char ** argv); /* 13 */
 #endif /* X11 */
 } TkIntPlatStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkIntPlatStubs *tkIntPlatStubsPtr;
+extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 0a7974a..b6a3b8b 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.26 2008/04/08 15:00:47 das Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.27 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -38,8 +38,8 @@
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc, 
-				int dash_offset, _Xconst char * dash_list, 
+EXTERN void		XSetDashes (Display * display, GC gc,
+				int dash_offset, _Xconst char * dash_list,
 				int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
@@ -50,16 +50,16 @@ EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v, 
-				unsigned int ui1, int i1, int i2, char * cp, 
-				unsigned int ui2, unsigned int ui3, int i3, 
+EXTERN XImage *		XCreateImage (Display * d, Visual * v,
+				unsigned int ui1, int i1, int i2, char * cp,
+				unsigned int ui2, unsigned int ui3, int i3,
 				int i4);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
@@ -75,21 +75,21 @@ EXTERN char *		XKeysymToString (KeySym k);
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v, 
+EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
 				int i);
 #endif
 #ifndef XCreatePixmapCursor_TCL_DECLARED
 #define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
-EXTERN Cursor		XCreatePixmapCursor (Display * d, Pixmap p1, 
-				Pixmap p2, XColor * x1, XColor * x2, 
+EXTERN Cursor		XCreatePixmapCursor (Display * d, Pixmap p1,
+				Pixmap p2, XColor * x1, XColor * x2,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XCreateGlyphCursor_TCL_DECLARED
 #define XCreateGlyphCursor_TCL_DECLARED
 /* 8 */
-EXTERN Cursor		XCreateGlyphCursor (Display * d, Font f1, Font f2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN Cursor		XCreateGlyphCursor (Display * d, Font f1, Font f2,
+				unsigned int ui1, unsigned int ui2,
 				XColor * x1, XColor * x2);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
@@ -135,7 +135,7 @@ EXTERN Status		XWithdrawWindow (Display * d, Window w, int i);
 #ifndef XGetWMColormapWindows_TCL_DECLARED
 #define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
-EXTERN Status		XGetWMColormapWindows (Display * d, Window w, 
+EXTERN Status		XGetWMColormapWindows (Display * d, Window w,
 				Window ** wpp, int * ip);
 #endif
 #ifndef XAllocColor_TCL_DECLARED
@@ -151,14 +151,14 @@ EXTERN void		XBell (Display * d, int i);
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 20 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1, 
-				Atom a2, int i1, int i2, 
+EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
 				_Xconst unsigned char * c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 21 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w, 
+EXTERN void		XChangeWindowAttributes (Display * d, Window w,
 				unsigned long ul, XSetWindowAttributes * x);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
@@ -169,29 +169,29 @@ EXTERN void		XClearWindow (Display * d, Window w);
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 23 */
-EXTERN void		XConfigureWindow (Display * d, Window w, 
+EXTERN void		XConfigureWindow (Display * d, Window w,
 				unsigned int i, XWindowChanges * x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 24 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
+EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 25 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4, 
+EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
 #endif
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d, 
-				_Xconst char * data, unsigned int width, 
+EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
+				_Xconst char * data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
@@ -212,40 +212,40 @@ EXTERN void		XDestroyWindow (Display * d, Window w);
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 30 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 31 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g, 
+EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 32 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
+EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
+				int i1, int i2, unsigned int ui1,
 				unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 33 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 34 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 35 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
 				XRectangle * x, int i);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
@@ -261,7 +261,7 @@ EXTERN void		XFreeColormap (Display * d, Colormap c);
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 38 */
-EXTERN void		XFreeColors (Display * d, Colormap c, 
+EXTERN void		XFreeColors (Display * d, Colormap c,
 				unsigned long * ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeCursor_TCL_DECLARED
@@ -277,9 +277,9 @@ EXTERN void		XFreeModifiermap (XModifierKeymap * x);
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 41 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w, 
-				int * i1, int * i2, unsigned int * ui1, 
-				unsigned int * ui2, unsigned int * ui3, 
+EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
+				int * i1, int * i2, unsigned int * ui1,
+				unsigned int * ui2, unsigned int * ui3,
 				unsigned int * ui4);
 #endif
 #ifndef XGetInputFocus_TCL_DECLARED
@@ -290,28 +290,28 @@ EXTERN void		XGetInputFocus (Display * d, Window * w, int * i);
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 43 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1, 
-				long l1, long l2, Bool b, Atom a2, Atom * ap, 
-				int * ip, unsigned long * ulp1, 
+EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom * ap,
+				int * ip, unsigned long * ulp1,
 				unsigned long * ulp2, unsigned char ** cpp);
 #endif
 #ifndef XGetWindowAttributes_TCL_DECLARED
 #define XGetWindowAttributes_TCL_DECLARED
 /* 44 */
-EXTERN Status		XGetWindowAttributes (Display * d, Window w, 
+EXTERN Status		XGetWindowAttributes (Display * d, Window w,
 				XWindowAttributes * x);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 45 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1, 
+EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 46 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b, 
-				unsigned int ui, int i1, int i2, Window w2, 
+EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
@@ -322,7 +322,7 @@ EXTERN KeyCode		XKeysymToKeycode (Display * d, KeySym k);
 #ifndef XLookupColor_TCL_DECLARED
 #define XLookupColor_TCL_DECLARED
 /* 48 */
-EXTERN Status		XLookupColor (Display * d, Colormap c1, 
+EXTERN Status		XLookupColor (Display * d, Colormap c1,
 				_Xconst char * c2, XColor * x1, XColor * x2);
 #endif
 #ifndef XMapWindow_TCL_DECLARED
@@ -333,7 +333,7 @@ EXTERN void		XMapWindow (Display * d, Window w);
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1, 
+EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
@@ -354,20 +354,20 @@ EXTERN void		XPutBackEvent (Display * d, XEvent * x);
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 54 */
-EXTERN void		XQueryColors (Display * d, Colormap c, XColor * x, 
+EXTERN void		XQueryColors (Display * d, Colormap c, XColor * x,
 				int i);
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 55 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2, 
-				Window * w3, int * i1, int * i2, int * i3, 
+EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
+				Window * w3, int * i1, int * i2, int * i3,
 				int * i4, unsigned int * ui);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 56 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2, 
+EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
 				Window * w3, Window ** w4, unsigned int * ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
@@ -383,7 +383,7 @@ EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 59 */
-EXTERN void		XResizeWindow (Display * d, Window w, 
+EXTERN void		XResizeWindow (Display * d, Window w,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
@@ -394,19 +394,19 @@ EXTERN void		XSelectInput (Display * d, Window w, long l);
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 61 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l, 
+EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
 				XEvent * x);
 #endif
 #ifndef XSetCommand_TCL_DECLARED
 #define XSetCommand_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetCommand (Display * d, Window w, CONST char ** c, 
+EXTERN void		XSetCommand (Display * d, Window w, const char ** c,
 				int i);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetIconName (Display * d, Window w, 
+EXTERN void		XSetIconName (Display * d, Window w,
 				_Xconst char * c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
@@ -417,50 +417,50 @@ EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w, 
+EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetWindowBackground (Display * d, Window w, 
+EXTERN void		XSetWindowBackground (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 68 */
-EXTERN void		XSetWindowBorder (Display * d, Window w, 
+EXTERN void		XSetWindowBorder (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w, 
+EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetWindowColormap (Display * d, Window w, 
+EXTERN void		XSetWindowColormap (Display * d, Window w,
 				Colormap c);
 #endif
 #ifndef XTranslateCoordinates_TCL_DECLARED
 #define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
-EXTERN Bool		XTranslateCoordinates (Display * d, Window w1, 
-				Window w2, int i1, int i2, int * i3, 
+EXTERN Bool		XTranslateCoordinates (Display * d, Window w1,
+				Window w2, int i1, int i2, int * i3,
 				int * i4, Window * w3);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
@@ -481,7 +481,7 @@ EXTERN void		XUnmapWindow (Display * d, Window w);
 #ifndef XWindowEvent_TCL_DECLARED
 #define XWindowEvent_TCL_DECLARED
 /* 76 */
-EXTERN void		XWindowEvent (Display * d, Window w, long l, 
+EXTERN void		XWindowEvent (Display * d, Window w, long l,
 				XEvent * x);
 #endif
 #ifndef XDestroyIC_TCL_DECLARED
@@ -497,29 +497,29 @@ EXTERN Bool		XFilterEvent (XEvent * x, Window w);
 #ifndef XmbLookupString_TCL_DECLARED
 #define XmbLookupString_TCL_DECLARED
 /* 79 */
-EXTERN int		XmbLookupString (XIC xi, XKeyPressedEvent * xk, 
+EXTERN int		XmbLookupString (XIC xi, XKeyPressedEvent * xk,
 				char * c, int i, KeySym * k, Status * s);
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 80 */
-EXTERN void		TkPutImage (unsigned long * colors, int ncolors, 
-				Display * display, Drawable d, GC gc, 
-				XImage * image, int src_x, int src_y, 
-				int dest_x, int dest_y, unsigned int width, 
+EXTERN void		TkPutImage (unsigned long * colors, int ncolors,
+				Display * display, Drawable d, GC gc,
+				XImage * image, int src_x, int src_y,
+				int dest_x, int dest_y, unsigned int width,
 				unsigned int height);
 #endif
 /* Slot 81 is reserved */
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 82 */
-EXTERN Status		XParseColor (Display * display, Colormap map, 
+EXTERN Status		XParseColor (Display * display, Colormap map,
 				_Xconst char * spec, XColor * colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 83 */
-EXTERN GC		XCreateGC (Display * display, Drawable d, 
+EXTERN GC		XCreateGC (Display * display, Drawable d,
 				unsigned long valuemask, XGCValues * values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
@@ -530,44 +530,44 @@ EXTERN void		XFreeGC (Display * display, GC gc);
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 85 */
-EXTERN Atom		XInternAtom (Display * display, 
-				_Xconst char * atom_name, 
+EXTERN Atom		XInternAtom (Display * display,
+				_Xconst char * atom_name,
 				Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 86 */
-EXTERN void		XSetBackground (Display * display, GC gc, 
+EXTERN void		XSetBackground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 87 */
-EXTERN void		XSetForeground (Display * display, GC gc, 
+EXTERN void		XSetForeground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 88 */
-EXTERN void		XSetClipMask (Display * display, GC gc, 
+EXTERN void		XSetClipMask (Display * display, GC gc,
 				Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 89 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc, 
+EXTERN void		XSetClipOrigin (Display * display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 90 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc, 
+EXTERN void		XSetTSOrigin (Display * display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 91 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask, 
+EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
 				XGCValues * values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
@@ -583,19 +583,19 @@ EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 94 */
-EXTERN void		XSetStipple (Display * display, GC gc, 
+EXTERN void		XSetStipple (Display * display, GC gc,
 				Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 95 */
-EXTERN void		XSetFillRule (Display * display, GC gc, 
+EXTERN void		XSetFillRule (Display * display, GC gc,
 				int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 96 */
-EXTERN void		XSetFillStyle (Display * display, GC gc, 
+EXTERN void		XSetFillStyle (Display * display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
@@ -606,8 +606,8 @@ EXTERN void		XSetFunction (Display * display, GC gc, int function);
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 98 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc, 
-				unsigned int line_width, int line_style, 
+EXTERN void		XSetLineAttributes (Display * display, GC gc,
+				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
@@ -623,40 +623,40 @@ EXTERN XIC		XCreateIC (void);
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 101 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask, 
-				XVisualInfo * vinfo_template, 
+EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
+				XVisualInfo * vinfo_template,
 				int * nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w, 
+EXTERN void		XSetWMClientMachine (Display * display, Window w,
 				XTextProperty * text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count, 
+EXTERN Status		XStringListToTextProperty (char ** list, int count,
 				XTextProperty * text_prop_return);
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 104 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1, 
+EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 105 */
-EXTERN void		XWarpPointer (Display * d, Window s, Window dw, 
-				int sx, int sy, unsigned int sw, 
+EXTERN void		XWarpPointer (Display * d, Window s, Window dw,
+				int sx, int sy, unsigned int sw,
 				unsigned int sh, int dx, int dy);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 106 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc, 
-				int x, int y, unsigned int width, 
+EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
 #endif /* WIN */
@@ -664,8 +664,8 @@ EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc, 
-				int dash_offset, _Xconst char * dash_list, 
+EXTERN void		XSetDashes (Display * display, GC gc,
+				int dash_offset, _Xconst char * dash_list,
 				int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
@@ -676,16 +676,16 @@ EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v, 
-				unsigned int ui1, int i1, int i2, char * cp, 
-				unsigned int ui2, unsigned int ui3, int i3, 
+EXTERN XImage *		XCreateImage (Display * d, Visual * v,
+				unsigned int ui1, int i1, int i2, char * cp,
+				unsigned int ui2, unsigned int ui3, int i3,
 				int i4);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
@@ -701,7 +701,7 @@ EXTERN char *		XKeysymToString (KeySym k);
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v, 
+EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
 				int i);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
@@ -742,42 +742,42 @@ EXTERN void		XBell (Display * d, int i);
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 14 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1, 
-				Atom a2, int i1, int i2, 
+EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
 				_Xconst unsigned char * c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 15 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w, 
+EXTERN void		XChangeWindowAttributes (Display * d, Window w,
 				unsigned long ul, XSetWindowAttributes * x);
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 16 */
-EXTERN void		XConfigureWindow (Display * d, Window w, 
+EXTERN void		XConfigureWindow (Display * d, Window w,
 				unsigned int i, XWindowChanges * x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 17 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
+EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 18 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4, 
+EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
+				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
 #endif
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d, 
-				_Xconst char * data, unsigned int width, 
+EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
+				_Xconst char * data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
@@ -793,40 +793,40 @@ EXTERN void		XDestroyWindow (Display * d, Window w);
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 22 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 23 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g, 
+EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 24 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
+EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
+				int i1, int i2, unsigned int ui1,
 				unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 25 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 26 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 27 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
 				XRectangle * x, int i);
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
@@ -837,7 +837,7 @@ EXTERN void		XFreeColormap (Display * d, Colormap c);
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 29 */
-EXTERN void		XFreeColors (Display * d, Colormap c, 
+EXTERN void		XFreeColors (Display * d, Colormap c,
 				unsigned long * ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeModifiermap_TCL_DECLARED
@@ -848,30 +848,30 @@ EXTERN void		XFreeModifiermap (XModifierKeymap * x);
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 31 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w, 
-				int * i1, int * i2, unsigned int * ui1, 
-				unsigned int * ui2, unsigned int * ui3, 
+EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
+				int * i1, int * i2, unsigned int * ui1,
+				unsigned int * ui2, unsigned int * ui3,
 				unsigned int * ui4);
 #endif
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 32 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1, 
-				long l1, long l2, Bool b, Atom a2, Atom * ap, 
-				int * ip, unsigned long * ulp1, 
+EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom * ap,
+				int * ip, unsigned long * ulp1,
 				unsigned long * ulp2, unsigned char ** cpp);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 33 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1, 
+EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 34 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b, 
-				unsigned int ui, int i1, int i2, Window w2, 
+EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
@@ -887,7 +887,7 @@ EXTERN void		XMapWindow (Display * d, Window w);
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1, 
+EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
@@ -898,8 +898,8 @@ EXTERN void		XMoveWindow (Display * d, Window w, int i1, int i2);
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 39 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2, 
-				Window * w3, int * i1, int * i2, int * i3, 
+EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
+				Window * w3, int * i1, int * i2, int * i3,
 				int * i4, unsigned int * ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
@@ -915,7 +915,7 @@ EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 42 */
-EXTERN void		XResizeWindow (Display * d, Window w, 
+EXTERN void		XResizeWindow (Display * d, Window w,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
@@ -926,13 +926,13 @@ EXTERN void		XSelectInput (Display * d, Window w, long l);
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 44 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l, 
+EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
 				XEvent * x);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 45 */
-EXTERN void		XSetIconName (Display * d, Window w, 
+EXTERN void		XSetIconName (Display * d, Window w,
 				_Xconst char * c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
@@ -943,43 +943,43 @@ EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w, 
+EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 48 */
-EXTERN void		XSetWindowBackground (Display * d, Window w, 
+EXTERN void		XSetWindowBackground (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 50 */
-EXTERN void		XSetWindowBorder (Display * d, Window w, 
+EXTERN void		XSetWindowBorder (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w, 
+EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 53 */
-EXTERN void		XSetWindowColormap (Display * d, Window w, 
+EXTERN void		XSetWindowColormap (Display * d, Window w,
 				Colormap c);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
@@ -1000,22 +1000,22 @@ EXTERN void		XUnmapWindow (Display * d, Window w);
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 57 */
-EXTERN void		TkPutImage (unsigned long * colors, int ncolors, 
-				Display * display, Drawable d, GC gc, 
-				XImage * image, int src_x, int src_y, 
-				int dest_x, int dest_y, unsigned int width, 
+EXTERN void		TkPutImage (unsigned long * colors, int ncolors,
+				Display * display, Drawable d, GC gc,
+				XImage * image, int src_x, int src_y,
+				int dest_x, int dest_y, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 58 */
-EXTERN Status		XParseColor (Display * display, Colormap map, 
+EXTERN Status		XParseColor (Display * display, Colormap map,
 				_Xconst char * spec, XColor * colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 59 */
-EXTERN GC		XCreateGC (Display * display, Drawable d, 
+EXTERN GC		XCreateGC (Display * display, Drawable d,
 				unsigned long valuemask, XGCValues * values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
@@ -1026,44 +1026,44 @@ EXTERN void		XFreeGC (Display * display, GC gc);
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 61 */
-EXTERN Atom		XInternAtom (Display * display, 
-				_Xconst char * atom_name, 
+EXTERN Atom		XInternAtom (Display * display,
+				_Xconst char * atom_name,
 				Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetBackground (Display * display, GC gc, 
+EXTERN void		XSetBackground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetForeground (Display * display, GC gc, 
+EXTERN void		XSetForeground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetClipMask (Display * display, GC gc, 
+EXTERN void		XSetClipMask (Display * display, GC gc,
 				Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc, 
+EXTERN void		XSetClipOrigin (Display * display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc, 
+EXTERN void		XSetTSOrigin (Display * display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 67 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask, 
+EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
 				XGCValues * values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
@@ -1079,19 +1079,19 @@ EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetStipple (Display * display, GC gc, 
+EXTERN void		XSetStipple (Display * display, GC gc,
 				Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetFillRule (Display * display, GC gc, 
+EXTERN void		XSetFillRule (Display * display, GC gc,
 				int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 72 */
-EXTERN void		XSetFillStyle (Display * display, GC gc, 
+EXTERN void		XSetFillStyle (Display * display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
@@ -1102,8 +1102,8 @@ EXTERN void		XSetFunction (Display * display, GC gc, int function);
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 74 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc, 
-				unsigned int line_width, int line_style, 
+EXTERN void		XSetLineAttributes (Display * display, GC gc,
+				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
@@ -1119,26 +1119,26 @@ EXTERN XIC		XCreateIC (void);
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask, 
-				XVisualInfo * vinfo_template, 
+EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
+				XVisualInfo * vinfo_template,
 				int * nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w, 
+EXTERN void		XSetWMClientMachine (Display * display, Window w,
 				XTextProperty * text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count, 
+EXTERN Status		XStringListToTextProperty (char ** list, int count,
 				XTextProperty * text_prop_return);
 #endif
 #ifndef XDrawSegments_TCL_DECLARED
 #define XDrawSegments_TCL_DECLARED
 /* 80 */
-EXTERN void		XDrawSegments (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawSegments (Display * display, Drawable d, GC gc,
 				XSegment * segments, int nsegments);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
@@ -1149,14 +1149,14 @@ EXTERN void		XForceScreenSaver (Display * display, int mode);
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 82 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1, 
+EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 83 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc, 
-				int x, int y, unsigned int width, 
+EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
@@ -1167,40 +1167,40 @@ EXTERN void		XClearWindow (Display * d, Window w);
 #ifndef XDrawPoint_TCL_DECLARED
 #define XDrawPoint_TCL_DECLARED
 /* 85 */
-EXTERN void		XDrawPoint (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawPoint (Display * display, Drawable d, GC gc,
 				int x, int y);
 #endif
 #ifndef XDrawPoints_TCL_DECLARED
 #define XDrawPoints_TCL_DECLARED
 /* 86 */
-EXTERN void		XDrawPoints (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawPoints (Display * display, Drawable d, GC gc,
 				XPoint * points, int npoints, int mode);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 87 */
-EXTERN void		XWarpPointer (Display * display, Window src_w, 
-				Window dest_w, int src_x, int src_y, 
-				unsigned int src_width, 
-				unsigned int src_height, int dest_x, 
+EXTERN void		XWarpPointer (Display * display, Window src_w,
+				Window dest_w, int src_x, int src_y,
+				unsigned int src_width,
+				unsigned int src_height, int dest_x,
 				int dest_y);
 #endif
 #ifndef XQueryColor_TCL_DECLARED
 #define XQueryColor_TCL_DECLARED
 /* 88 */
-EXTERN void		XQueryColor (Display * display, Colormap colormap, 
+EXTERN void		XQueryColor (Display * display, Colormap colormap,
 				XColor * def_in_out);
 #endif
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 89 */
-EXTERN void		XQueryColors (Display * display, Colormap colormap, 
+EXTERN void		XQueryColors (Display * display, Colormap colormap,
 				XColor * defs_in_out, int ncolors);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 90 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2, 
+EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
 				Window * w3, Window ** w4, unsigned int * ui);
 #endif
 #ifndef XSync_TCL_DECLARED
@@ -1212,7 +1212,7 @@ EXTERN int		XSync (Display * display, Bool flag);
 
 typedef struct TkIntXlibStubs {
     int magic;
-    CONST struct TkIntXlibStubHooks *hooks;
+    const struct TkIntXlibStubHooks *hooks;
 
 #ifdef __WIN32__ /* WIN */
     void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */
@@ -1277,7 +1277,7 @@ typedef struct TkIntXlibStubs {
     void (*xResizeWindow) (Display * d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
     void (*xSelectInput) (Display * d, Window w, long l); /* 60 */
     Status (*xSendEvent) (Display * d, Window w, Bool b, long l, XEvent * x); /* 61 */
-    void (*xSetCommand) (Display * d, Window w, CONST char ** c, int i); /* 62 */
+    void (*xSetCommand) (Display * d, Window w, const char ** c, int i); /* 62 */
     void (*xSetIconName) (Display * d, Window w, _Xconst char * c); /* 63 */
     void (*xSetInputFocus) (Display * d, Window w, int i, Time t); /* 64 */
     void (*xSetSelectionOwner) (Display * d, Atom a, Window w, Time t); /* 65 */
@@ -1420,7 +1420,7 @@ typedef struct TkIntXlibStubs {
 } TkIntXlibStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkIntXlibStubs *tkIntXlibStubsPtr;
+extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index d2cc339..448f78a 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -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: tkPlatDecls.h,v 1.18 2008/04/08 03:28:05 kennykb Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.19 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -60,8 +60,8 @@ EXTERN void		Tk_PointerEvent (HWND hwnd, int x, int y);
 #ifndef Tk_TranslateWinEvent_TCL_DECLARED
 #define Tk_TranslateWinEvent_TCL_DECLARED
 /* 5 */
-EXTERN int		Tk_TranslateWinEvent (HWND hwnd, UINT message, 
-				WPARAM wParam, LPARAM lParam, 
+EXTERN int		Tk_TranslateWinEvent (HWND hwnd, UINT message,
+				WPARAM wParam, LPARAM lParam,
 				LRESULT * result);
 #endif
 #endif /* WIN */
@@ -70,10 +70,10 @@ EXTERN int		Tk_TranslateWinEvent (HWND hwnd, UINT message,
 #define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 /* 0 */
 EXTERN void		Tk_MacOSXSetEmbedHandler (
-				Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, 
-				Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, 
-				Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, 
-				Tk_MacOSXEmbedGetClipProc * getClipProc, 
+				Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr,
+				Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr,
+				Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr,
+				Tk_MacOSXEmbedGetClipProc * getClipProc,
 				Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc);
 #endif
 #ifndef Tk_MacOSXTurnOffMenus_TCL_DECLARED
@@ -99,7 +99,7 @@ EXTERN void		TkMacOSXInitAppleEvents (Tcl_Interp * interp);
 #ifndef TkGenWMConfigureEvent_TCL_DECLARED
 #define TkGenWMConfigureEvent_TCL_DECLARED
 /* 5 */
-EXTERN void		TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, 
+EXTERN void		TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
 #endif
 #ifndef TkMacOSXInvalClipRgns_TCL_DECLARED
@@ -131,7 +131,7 @@ EXTERN int		Tk_MacOSXIsAppInFront (void);
 
 typedef struct TkPlatStubs {
     int magic;
-    CONST struct TkPlatStubHooks *hooks;
+    const struct TkPlatStubHooks *hooks;
 
 #ifdef __WIN32__ /* WIN */
     Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
@@ -157,7 +157,7 @@ typedef struct TkPlatStubs {
 } TkPlatStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkPlatStubs *tkPlatStubsPtr;
+extern const TkPlatStubs *tkPlatStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
diff --git a/generic/ttk/ttk.decls b/generic/ttk/ttk.decls
index b3f2538..2b2fe5f 100644
--- a/generic/ttk/ttk.decls
+++ b/generic/ttk/ttk.decls
@@ -1,5 +1,5 @@
 #
-# $Id: ttk.decls,v 1.2 2006/12/10 19:19:44 jenglish Exp $
+# $Id: ttk.decls,v 1.3 2008/10/22 20:56:43 nijtmans Exp $
 #
 
 library 	ttk
@@ -27,7 +27,7 @@ declare 4 current {
 
 declare 5 current {
     int Ttk_RegisterElementSpec(
-	Ttk_Theme theme, 
+	Ttk_Theme theme,
 	const char *elementName,
 	Ttk_ElementSpec *elementSpec,
 	void *clientData);
@@ -36,7 +36,7 @@ declare 5 current {
 declare 6 current {
     Ttk_ElementImpl Ttk_RegisterElement(
 	Tcl_Interp *interp,
-	Ttk_Theme theme, 
+	Ttk_Theme theme,
 	const char *elementName,
 	Ttk_ElementSpec *elementSpec,
 	void *clientData);
@@ -44,7 +44,7 @@ declare 6 current {
 
 declare 7 current {
     int Ttk_RegisterElementFactory(
-	Tcl_Interp *interp, 
+	Tcl_Interp *interp,
 	const char *name,
 	Ttk_ElementFactory factoryProc,
 	void *clientData);
@@ -85,15 +85,15 @@ declare 14 current {
 #
 declare 20 current {
     int Ttk_GetPaddingFromObj(
-    	Tcl_Interp *interp, 
-	Tk_Window tkwin, 
-	Tcl_Obj *objPtr, 
+    	Tcl_Interp *interp,
+	Tk_Window tkwin,
+	Tcl_Obj *objPtr,
 	Ttk_Padding *pad_rtn);
 }
 declare 21 current {
     int Ttk_GetBorderFromObj(
-    	Tcl_Interp *interp, 
-	Tcl_Obj *objPtr, 
+    	Tcl_Interp *interp,
+	Tcl_Obj *objPtr,
 	Ttk_Padding *pad_rtn);
 }
 declare 22 current {
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 6e515d6..1bdec8e 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkDecls.h,v 1.6 2008/03/27 12:04:02 das Exp $
+ * $Id: ttkDecls.h,v 1.7 2008/10/22 20:56:43 nijtmans Exp $
  *
  * This file is (mostly) automatically generated from ttk.decls.
  */
@@ -38,46 +38,46 @@ TTKAPI Ttk_Theme	Ttk_GetDefaultTheme (Tcl_Interp * interp);
 /* 2 */
 TTKAPI Ttk_Theme	Ttk_GetCurrentTheme (Tcl_Interp * interp);
 /* 3 */
-TTKAPI Ttk_Theme	Ttk_CreateTheme (Tcl_Interp * interp, 
+TTKAPI Ttk_Theme	Ttk_CreateTheme (Tcl_Interp * interp,
 				const char * name, Ttk_Theme parent);
 /* 4 */
-TTKAPI void		Ttk_RegisterCleanup (Tcl_Interp * interp, 
-				void * deleteData, 
+TTKAPI void		Ttk_RegisterCleanup (Tcl_Interp * interp,
+				void * deleteData,
 				Ttk_CleanupProc * cleanupProc);
 /* 5 */
-TTKAPI int		Ttk_RegisterElementSpec (Ttk_Theme theme, 
-				const char * elementName, 
-				Ttk_ElementSpec * elementSpec, 
+TTKAPI int		Ttk_RegisterElementSpec (Ttk_Theme theme,
+				const char * elementName,
+				Ttk_ElementSpec * elementSpec,
 				void * clientData);
 /* 6 */
-TTKAPI Ttk_ElementImpl	Ttk_RegisterElement (Tcl_Interp * interp, 
-				Ttk_Theme theme, const char * elementName, 
-				Ttk_ElementSpec * elementSpec, 
+TTKAPI Ttk_ElementImpl	Ttk_RegisterElement (Tcl_Interp * interp,
+				Ttk_Theme theme, const char * elementName,
+				Ttk_ElementSpec * elementSpec,
 				void * clientData);
 /* 7 */
-TTKAPI int		Ttk_RegisterElementFactory (Tcl_Interp * interp, 
-				const char * name, 
-				Ttk_ElementFactory factoryProc, 
+TTKAPI int		Ttk_RegisterElementFactory (Tcl_Interp * interp,
+				const char * name,
+				Ttk_ElementFactory factoryProc,
 				void * clientData);
 /* 8 */
-TTKAPI void		Ttk_RegisterLayout (Ttk_Theme theme, 
-				const char * className, 
+TTKAPI void		Ttk_RegisterLayout (Ttk_Theme theme,
+				const char * className,
 				Ttk_LayoutSpec layoutSpec);
 /* Slot 9 is reserved */
 /* 10 */
-TTKAPI int		Ttk_GetStateSpecFromObj (Tcl_Interp * interp, 
+TTKAPI int		Ttk_GetStateSpecFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Ttk_StateSpec * spec_rtn);
 /* 11 */
-TTKAPI Tcl_Obj *	Ttk_NewStateSpecObj (unsigned int onbits, 
+TTKAPI Tcl_Obj *	Ttk_NewStateSpecObj (unsigned int onbits,
 				unsigned int offbits);
 /* 12 */
-TTKAPI Ttk_StateMap	Ttk_GetStateMapFromObj (Tcl_Interp * interp, 
+TTKAPI Ttk_StateMap	Ttk_GetStateMapFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr);
 /* 13 */
-TTKAPI Tcl_Obj *	Ttk_StateMapLookup (Tcl_Interp * interp, 
+TTKAPI Tcl_Obj *	Ttk_StateMapLookup (Tcl_Interp * interp,
 				Ttk_StateMap map, Ttk_State state);
 /* 14 */
-TTKAPI int		Ttk_StateTableLookup (Ttk_StateTable map[], 
+TTKAPI int		Ttk_StateTableLookup (Ttk_StateTable map[],
 				Ttk_State state);
 /* Slot 15 is reserved */
 /* Slot 16 is reserved */
@@ -85,14 +85,14 @@ TTKAPI int		Ttk_StateTableLookup (Ttk_StateTable map[],
 /* Slot 18 is reserved */
 /* Slot 19 is reserved */
 /* 20 */
-TTKAPI int		Ttk_GetPaddingFromObj (Tcl_Interp * interp, 
-				Tk_Window tkwin, Tcl_Obj * objPtr, 
+TTKAPI int		Ttk_GetPaddingFromObj (Tcl_Interp * interp,
+				Tk_Window tkwin, Tcl_Obj * objPtr,
 				Ttk_Padding * pad_rtn);
 /* 21 */
-TTKAPI int		Ttk_GetBorderFromObj (Tcl_Interp * interp, 
+TTKAPI int		Ttk_GetBorderFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Ttk_Padding * pad_rtn);
 /* 22 */
-TTKAPI int		Ttk_GetStickyFromObj (Tcl_Interp * interp, 
+TTKAPI int		Ttk_GetStickyFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, Ttk_Sticky * sticky_rtn);
 /* 23 */
 TTKAPI Ttk_Padding	Ttk_MakePadding (short l, short t, short r, short b);
@@ -101,27 +101,27 @@ TTKAPI Ttk_Padding	Ttk_UniformPadding (short borderWidth);
 /* 25 */
 TTKAPI Ttk_Padding	Ttk_AddPadding (Ttk_Padding pad1, Ttk_Padding pad2);
 /* 26 */
-TTKAPI Ttk_Padding	Ttk_RelievePadding (Ttk_Padding padding, int relief, 
+TTKAPI Ttk_Padding	Ttk_RelievePadding (Ttk_Padding padding, int relief,
 				int n);
 /* 27 */
 TTKAPI Ttk_Box		Ttk_MakeBox (int x, int y, int width, int height);
 /* 28 */
 TTKAPI int		Ttk_BoxContains (Ttk_Box box, int x, int y);
 /* 29 */
-TTKAPI Ttk_Box		Ttk_PackBox (Ttk_Box * cavity, int w, int h, 
+TTKAPI Ttk_Box		Ttk_PackBox (Ttk_Box * cavity, int w, int h,
 				Ttk_Side side);
 /* 30 */
-TTKAPI Ttk_Box		Ttk_StickBox (Ttk_Box parcel, int w, int h, 
+TTKAPI Ttk_Box		Ttk_StickBox (Ttk_Box parcel, int w, int h,
 				Ttk_Sticky sticky);
 /* 31 */
-TTKAPI Ttk_Box		Ttk_AnchorBox (Ttk_Box parcel, int w, int h, 
+TTKAPI Ttk_Box		Ttk_AnchorBox (Ttk_Box parcel, int w, int h,
 				Tk_Anchor anchor);
 /* 32 */
 TTKAPI Ttk_Box		Ttk_PadBox (Ttk_Box b, Ttk_Padding p);
 /* 33 */
 TTKAPI Ttk_Box		Ttk_ExpandBox (Ttk_Box b, Ttk_Padding p);
 /* 34 */
-TTKAPI Ttk_Box		Ttk_PlaceBox (Ttk_Box * cavity, int w, int h, 
+TTKAPI Ttk_Box		Ttk_PlaceBox (Ttk_Box * cavity, int w, int h,
 				Ttk_Side side, Ttk_Sticky sticky);
 /* 35 */
 TTKAPI Tcl_Obj *	Ttk_NewBoxObj (Ttk_Box box);
@@ -130,7 +130,7 @@ TTKAPI Tcl_Obj *	Ttk_NewBoxObj (Ttk_Box box);
 /* Slot 38 is reserved */
 /* Slot 39 is reserved */
 /* 40 */
-TTKAPI int		Ttk_GetOrientFromObj (Tcl_Interp * interp, 
+TTKAPI int		Ttk_GetOrientFromObj (Tcl_Interp * interp,
 				Tcl_Obj * objPtr, int * orient);
 
 #endif /* !defined(USE_TTK_STUBS) */
diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl
index 961f36b..29307dc 100644
--- a/generic/ttk/ttkGenStubs.tcl
+++ b/generic/ttk/ttkGenStubs.tcl
@@ -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.
 # 
-# $Id: ttkGenStubs.tcl,v 1.1 2007/03/07 23:46:34 das Exp $
+# $Id: ttkGenStubs.tcl,v 1.2 2008/10/22 20:56:43 nijtmans Exp $
 #
 # SOURCE: tcl/tools/genStubs.tcl, revision 1.20
 #
@@ -434,7 +434,7 @@ proc genStubs::makeDecl {name decl index} {
 			[lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
-		    append text $line \n
+		    append text [string trimright $line] \n
 		    set line "\t\t\t\t"
 		    set pad 28
 		}
@@ -452,7 +452,7 @@ proc genStubs::makeDecl {name decl index} {
 			[lindex $arg 2]
 		if {[string length $line] + [string length $next] \
 			+ $pad > 76} {
-		    append text $line \n
+		    append text [string trimright $line] \n
 		    set line "\t\t\t\t"
 		    set pad 28
 		}
@@ -876,7 +876,7 @@ proc genStubs::init {} {
 if {[string length [namespace which lassign]] == 0} {
 proc lassign {valueList args} {
   if {[llength $args] == 0} {
-      error "wrong # args: lassign list varname ?varname..?"
+      error "wrong # args: should be \"lassign list ?varName ...?\""
   }
 
   uplevel [list foreach $args $valueList {break}]