Applied companion patch for Tcl Patch 585105,

updating Tk to use Tcl 8.4's fully CONST-ified
interface, and fully CONSTifying Tk at the
same time.

This patch includes purging Tk of its last
direct access to interp->result.  [Bug 589853]

The substantial changes include copying
event sequence strings into Tcl_DStrings
in tkBind.c, and copying [text] indices into
Tcl_DStrings because parsing them involved
overwriting them.  If this causes performance
trouble, that can be resolved by further
converting them to Tcl_Obj's.

The #defines USE_NON_CONST and USE_COMPAT_CONST
have the same effect for Tk as they do for Tcl.
(They actually change tcl.h)

61 files changed, 615 insertions, 570 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 0d2ce92..3328b6a 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -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: tk.decls,v 1.22 2002/06/18 23:51:46 dkf Exp $
+# RCS: @(#) $Id: tk.decls,v 1.23 2002/08/05 04:30:38 dgp Exp $
 
 library tk
 
@@ -121,7 +121,7 @@ declare 17 generic {
 
 declare 18 generic {
     int Tk_CanvasTagsParseProc (ClientData clientData, Tcl_Interp *interp,
-	    Tk_Window tkwin, char *value, char *widgRec, int offset)
+	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
 }
 
 declare 19 generic {
@@ -164,19 +164,19 @@ declare 26 generic {
 declare 27 generic {
     int Tk_ConfigureInfo (Tcl_Interp *interp,
 	    Tk_Window tkwin, Tk_ConfigSpec *specs,
-	    char *widgRec, 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, char *argvName, int flags)
+	    char *widgRec, CONST char *argvName, int flags)
 }
 
 declare 29 generic {
     int Tk_ConfigureWidget (Tcl_Interp *interp,
 	    Tk_Window tkwin, Tk_ConfigSpec *specs,
-	    int argc, char **argv, char *widgRec,
+	    int argc, CONST84 char **argv, char *widgRec,
 	    int flags)
 }
 
@@ -199,7 +199,7 @@ declare 32 generic {
 declare 33 generic {
     unsigned long Tk_CreateBinding (Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    char *eventStr, char *command, int append)
+	    CONST char *eventStr, CONST char *command, int append)
 }
 
 declare 34 generic {
@@ -243,17 +243,17 @@ declare 41 generic {
 
 declare 42 generic {
     Tk_Window Tk_CreateWindow (Tcl_Interp *interp,
-	    Tk_Window parent, char *name, char *screenName)
+	    Tk_Window parent, CONST char *name, CONST char *screenName)
 }
 
 declare 43 generic {
     Tk_Window Tk_CreateWindowFromPath (Tcl_Interp *interp, Tk_Window tkwin,
-	    char *pathName, char *screenName)
+	    CONST char *pathName, CONST char *screenName)
 }
 
 declare 44 generic {
-    int Tk_DefineBitmap (Tcl_Interp *interp, CONST char *name, 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 {
@@ -267,7 +267,7 @@ declare 46 generic {
 declare 47 generic {
     int Tk_DeleteBinding (Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    char *eventStr)
+	    CONST char *eventStr)
 }
 
 declare 48 generic {
@@ -289,7 +289,7 @@ declare 51 generic {
 }
 
 declare 52 generic {
-    void Tk_DeleteImage (Tcl_Interp *interp, char *name)
+    void Tk_DeleteImage (Tcl_Interp *interp, CONST char *name)
 }
 
 declare 53 generic {
@@ -301,7 +301,7 @@ declare 54 generic {
 }
 
 declare 55 generic {
-    char * Tk_DisplayName (Tk_Window tkwin)
+    CONST84_RETURN char * Tk_DisplayName (Tk_Window tkwin)
 }
 
 declare 56 generic {
@@ -352,7 +352,7 @@ declare 63 generic {
 }
 
 declare 64 generic {
-    Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp *interp, char *imageName)
+    Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp *interp, CONST char *imageName)
 }
 
 declare 65 generic {
@@ -428,17 +428,17 @@ declare 81 generic {
 
 declare 82 generic {
     int Tk_GetAnchor (Tcl_Interp *interp,
-	    char *str, Tk_Anchor *anchorPtr)
+	    CONST char *str, Tk_Anchor *anchorPtr)
 }
 
 declare 83 generic {
-    char * Tk_GetAtomName (Tk_Window tkwin, Atom atom)
+    CONST84_RETURN char * Tk_GetAtomName (Tk_Window tkwin, Atom atom)
 }
 
 declare 84 generic {
-    char * Tk_GetBinding (Tcl_Interp *interp,
+    CONST84_RETURN char * Tk_GetBinding (Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    char *eventStr)
+	    CONST char *eventStr)
 }
 
 declare 85 generic {
@@ -447,11 +447,11 @@ declare 85 generic {
 
 declare 86 generic {
     Pixmap Tk_GetBitmapFromData (Tcl_Interp *interp,
-	    Tk_Window tkwin, 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, char *str, int *capPtr)
+    int Tk_GetCapStyle (Tcl_Interp *interp, CONST char *str, int *capPtr)
 }
 
 declare 88 generic {
@@ -463,7 +463,8 @@ declare 89 generic {
 }
 
 declare 90 generic {
-    Colormap Tk_GetColormap (Tcl_Interp *interp, Tk_Window tkwin, char *str)
+    Colormap Tk_GetColormap (Tcl_Interp *interp, Tk_Window tkwin,
+	    CONST char *str)
 }
 
 declare 91 generic {
@@ -473,7 +474,7 @@ declare 91 generic {
 
 declare 92 generic {
     Tk_Cursor Tk_GetCursorFromData (Tcl_Interp *interp,
-	    Tk_Window tkwin, char *source, 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)
 }
@@ -496,13 +497,13 @@ declare 96 generic {
 }
 
 declare 97 generic {
-    Tk_Image Tk_GetImage (Tcl_Interp *interp, Tk_Window tkwin, 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,
-	    char *name, Tk_ImageType **typePtrPtr)
+	    CONST char *name, Tk_ImageType **typePtrPtr)
 }
 
 declare 99 generic {
@@ -510,12 +511,12 @@ declare 99 generic {
 }
 
 declare 100 generic {
-    int Tk_GetJoinStyle (Tcl_Interp *interp, char *str, int *joinPtr)
+    int Tk_GetJoinStyle (Tcl_Interp *interp, CONST char *str, int *joinPtr)
 }
 
 declare 101 generic {
     int Tk_GetJustify (Tcl_Interp *interp,
-	    char *str, Tk_Justify *justifyPtr)
+	    CONST char *str, Tk_Justify *justifyPtr)
 }
 
 declare 102 generic {
@@ -523,7 +524,8 @@ declare 102 generic {
 }
 
 declare 103 generic {
-    Tk_Uid Tk_GetOption (Tk_Window tkwin, char *name, char *className)
+    Tk_Uid Tk_GetOption (Tk_Window tkwin, CONST char *name, 
+	    CONST char *className)
 }
 
 declare 104 generic {
@@ -537,7 +539,7 @@ declare 105 generic {
 }
 
 declare 106 generic {
-    int Tk_GetRelief (Tcl_Interp *interp, char *name, int *reliefPtr)
+    int Tk_GetRelief (Tcl_Interp *interp, CONST char *name, int *reliefPtr)
 }
 
 declare 107 generic {
@@ -546,7 +548,7 @@ declare 107 generic {
 
 declare 108 generic {
     int Tk_GetScrollInfo (Tcl_Interp *interp,
-	    int argc, char **argv, double *dblPtr, int *intPtr)
+	    int argc, CONST84 char **argv, double *dblPtr, int *intPtr)
 }
 
 declare 109 generic {
@@ -566,7 +568,7 @@ declare 111 generic {
 
 declare 112 generic {
     Visual * Tk_GetVisual (Tcl_Interp *interp,
-	    Tk_Window tkwin, char *str, int *depthPtr,
+	    Tk_Window tkwin, CONST char *str, int *depthPtr,
 	    Colormap *colormapPtr)
 }
 
@@ -597,7 +599,7 @@ declare 118 generic {
 }
 
 declare 119 generic {
-    Atom Tk_InternAtom (Tk_Window tkwin, char *name)
+    Atom Tk_InternAtom (Tk_Window tkwin, CONST char *name)
 }
 
 declare 120 generic {
@@ -647,47 +649,47 @@ declare 129 generic {
 }
 
 declare 130 generic {
-    char * Tk_NameOf3DBorder (Tk_3DBorder border)
+    CONST84_RETURN char * Tk_NameOf3DBorder (Tk_3DBorder border)
 }
 
 declare 131 generic {
-    char * Tk_NameOfAnchor (Tk_Anchor anchor)
+    CONST84_RETURN char * Tk_NameOfAnchor (Tk_Anchor anchor)
 }
 
 declare 132 generic {
-    char * Tk_NameOfBitmap (Display *display, Pixmap bitmap)
+    CONST84_RETURN char * Tk_NameOfBitmap (Display *display, Pixmap bitmap)
 }
 
 declare 133 generic {
-    char * Tk_NameOfCapStyle (int cap)
+    CONST84_RETURN char * Tk_NameOfCapStyle (int cap)
 }
 
 declare 134 generic {
-    char * Tk_NameOfColor (XColor *colorPtr)
+    CONST84_RETURN char * Tk_NameOfColor (XColor *colorPtr)
 }
 
 declare 135 generic {
-    char * Tk_NameOfCursor (Display *display, Tk_Cursor cursor)
+    CONST84_RETURN char * Tk_NameOfCursor (Display *display, Tk_Cursor cursor)
 }
 
 declare 136 generic {
-    char * Tk_NameOfFont (Tk_Font font)
+    CONST84_RETURN char * Tk_NameOfFont (Tk_Font font)
 }
 
 declare 137 generic {
-    char * Tk_NameOfImage (Tk_ImageMaster imageMaster)
+    CONST84_RETURN char * Tk_NameOfImage (Tk_ImageMaster imageMaster)
 }
 
 declare 138 generic {
-    char * Tk_NameOfJoinStyle (int join)
+    CONST84_RETURN char * Tk_NameOfJoinStyle (int join)
 }
 
 declare 139 generic {
-    char * Tk_NameOfJustify (Tk_Justify justify)
+    CONST84_RETURN char * Tk_NameOfJustify (Tk_Justify justify)
 }
 
 declare 140 generic {
-    char * Tk_NameOfRelief (int relief)
+    CONST84_RETURN char * Tk_NameOfRelief (int relief)
 }
 
 declare 141 generic {
@@ -780,7 +782,7 @@ declare 159 generic {
 }
 
 declare 160 generic {
-    char * Tk_SetAppName (Tk_Window tkwin, char *name)
+    CONST char * Tk_SetAppName (Tk_Window tkwin, CONST char *name)
 }
 
 declare 161 generic {
@@ -788,7 +790,7 @@ declare 161 generic {
 }
 
 declare 162 generic {
-    void Tk_SetClass (Tk_Window tkwin, char *className)
+    void Tk_SetClass (Tk_Window tkwin, CONST char *className)
 }
 
 declare 163 generic {
@@ -1139,7 +1141,7 @@ declare 240 generic {
 #
 declare 241 generic {
     Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp *interp,
-	    Tk_Window parent, char *screenName)
+	    Tk_Window parent, CONST char *screenName)
 }
 declare 242 generic {
     void Tk_SetClassProcs (Tk_Window tkwin,
@@ -1181,17 +1183,18 @@ declare 248 generic {
 
 # Style engine
 declare 249 generic {
-    Tk_StyleEngine Tk_RegisterStyleEngine (char *name, Tk_StyleEngine parent)
+    Tk_StyleEngine Tk_RegisterStyleEngine (CONST char *name,
+	    Tk_StyleEngine parent)
 }
 declare 250 generic {
-    Tk_StyleEngine Tk_GetStyleEngine (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 (char *name)
+    int Tk_GetElementId (CONST char *name)
 }
 declare 253 generic {
     Tk_Style Tk_CreateStyle (CONST char *name, Tk_StyleEngine engine,
diff --git a/generic/tk.h b/generic/tk.h
index cdf03ac..f6a7e78 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.65 2002/07/14 17:29:57 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.66 2002/08/05 04:30:38 dgp Exp $
  */
 
 #ifndef _TK
@@ -124,7 +124,7 @@ typedef struct Tk_StyledElement_ *Tk_StyledElement;
  * Additional types exported to clients.
  */
 
-typedef char *Tk_Uid;
+typedef CONST char *Tk_Uid;
 
 /*
  * The enum below defines the valid types for Tk configuration options
@@ -322,7 +322,7 @@ typedef struct Tk_SavedOptions {
 #ifndef __NO_OLD_CONFIG
 
 typedef int (Tk_OptionParseProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, Tk_Window tkwin, char *value, char *widgRec,
+	Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value, char *widgRec,
 	int offset));
 typedef char *(Tk_OptionPrintProc) _ANSI_ARGS_((ClientData clientData,
 	Tk_Window tkwin, char *widgRec, int offset,
@@ -353,9 +353,9 @@ typedef struct Tk_ConfigSpec {
 				 * table must have type TK_CONFIG_END. */
     char *argvName;		/* Switch used to specify option in argv.
 				 * NULL means this spec is part of a group. */
-    char *dbName;		/* Name for option in option database. */
-    char *dbClass;		/* Class for option in database. */
-    char *defValue;		/* Default value for option if not
+    Tk_Uid dbName;		/* Name for option in option database. */
+    Tk_Uid dbClass;		/* Class for option in database. */
+    Tk_Uid defValue;		/* Default value for option if not
 				 * specified in command line or database. */
     int offset;			/* Where in widget record to store value;
 				 * use Tk_Offset macro to generate values
diff --git a/generic/tk3d.c b/generic/tk3d.c
index 5e3be12..3c6492e 100644
--- a/generic/tk3d.c
+++ b/generic/tk3d.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk3d.c,v 1.12 2002/01/17 05:13:11 dgp Exp $
+ * RCS: @(#) $Id: tk3d.c,v 1.13 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tk3d.h"
@@ -186,7 +186,7 @@ Tk_Get3DBorder(interp, tkwin, colorName)
     Tcl_Interp *interp;		/* Place to store an error message. */
     Tk_Window tkwin;		/* Token for window in which border will
 				 * be drawn. */
-    char *colorName;		/* String giving name of color
+    Tk_Uid colorName;		/* String giving name of color
 				 * for window background. */
 {
     Tcl_HashEntry *hashPtr;
@@ -324,7 +324,7 @@ Tk_Draw3DRectangle(tkwin, drawable, border, x, y, width, height,
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOf3DBorder(border)
     Tk_3DBorder border;		/* Token for border. */
 {
@@ -652,7 +652,7 @@ Tk_GetReliefFromObj(interp, objPtr, resultPtr)
 int
 Tk_GetRelief(interp, name, reliefPtr)
     Tcl_Interp *interp;		/* For error messages. */
-    char *name;			/* Name of a relief type. */
+    CONST char *name;		/* Name of a relief type. */
     int *reliefPtr;		/* Where to store converted relief. */
 {
     char c;
@@ -703,7 +703,7 @@ Tk_GetRelief(interp, name, reliefPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfRelief(relief)
     int relief;		/* One of TK_RELIEF_FLAT, TK_RELIEF_RAISED,
 			 * or TK_RELIEF_SUNKEN. */
diff --git a/generic/tkAtom.c b/generic/tkAtom.c
index fba9fb8..0137d40 100644
--- a/generic/tkAtom.c
+++ b/generic/tkAtom.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkAtom.c,v 1.2 1998/09/14 18:23:03 stanton Exp $
+ * RCS: @(#) $Id: tkAtom.c,v 1.3 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -80,7 +80,7 @@ Atom
 Tk_InternAtom(tkwin, name)
     Tk_Window tkwin;		/* Window token;  map name to atom
 				 * for this window's display. */
-    char *name;			/* Name to turn into atom. */
+    CONST char *name;		/* Name to turn into atom. */
 {
     register TkDisplay *dispPtr;
     register Tcl_HashEntry *hPtr;
@@ -127,7 +127,7 @@ Tk_InternAtom(tkwin, name)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_GetAtomName(tkwin, atom)
     Tk_Window tkwin;		/* Window token;  map atom to name
 				 * relative to this window's
@@ -168,7 +168,7 @@ Tk_GetAtomName(tkwin, atom)
 		&new);
 	Tcl_SetHashValue(hPtr, name);
     }
-    return (char *) Tcl_GetHashValue(hPtr);
+    return Tcl_GetHashValue(hPtr);
 }
 
 /*
diff --git a/generic/tkBind.c b/generic/tkBind.c
index c70a1a5..a71ac44 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- *  RCS: @(#) $Id: tkBind.c,v 1.25 2002/06/19 19:37:53 mdejong Exp $
+ *  RCS: @(#) $Id: tkBind.c,v 1.26 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -676,13 +676,13 @@ static int		DeleteVirtualEvent _ANSI_ARGS_((Tcl_Interp *interp,
 static void		DeleteVirtualEventTable _ANSI_ARGS_((
 			    VirtualEventTable *vetPtr));
 static void		ExpandPercents _ANSI_ARGS_((TkWindow *winPtr,
-			    char *before, XEvent *eventPtr, KeySym keySym,
+			    CONST char *before, XEvent *eventPtr, KeySym keySym,
 			    Tcl_DString *dsPtr));
 static void		FreeTclBinding _ANSI_ARGS_((ClientData clientData));
 static PatSeq *		FindSequence _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_HashTable *patternTablePtr, ClientData object,
-			    char *eventString, int create, int allowVirtual,
-			    unsigned long *maskPtr));
+			    CONST char *eventString, int create,
+			    int allowVirtual, unsigned long *maskPtr));
 static void		GetAllVirtualEvents _ANSI_ARGS_((Tcl_Interp *interp,
 			    VirtualEventTable *vetPtr));
 static char *		GetField _ANSI_ARGS_((char *p, char *copy, int size));
@@ -705,7 +705,7 @@ static int		NameToWindow _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tk_Window main, Tcl_Obj *objPtr,
 			    Tk_Window *tkwinPtr));
 static int		ParseEventDescription _ANSI_ARGS_((Tcl_Interp *interp,
-			    char **eventStringPtr, Pattern *patPtr,
+			    CONST char **eventStringPtr, Pattern *patPtr,
 			    unsigned long *eventMaskPtr));
 static void		DoWarp _ANSI_ARGS_((ClientData clientData));
 
@@ -972,9 +972,9 @@ Tk_CreateBinding(interp, bindingTable, object, eventString, command, append)
 				/* Table in which to create binding. */
     ClientData object;		/* Token for object with which binding is
 				 * associated. */
-    char *eventString;		/* String describing event sequence that
+    CONST char *eventString;	/* String describing event sequence that
 				 * triggers binding. */
-    char *command;		/* Contains Tcl command to execute when
+    CONST char *command;	/* Contains Tcl command to execute when
 				 * binding triggers. */
     int append;			/* 0 means replace any existing binding for
 				 * eventString; 1 means append to that
@@ -1076,7 +1076,7 @@ TkCreateBindingProcedure(interp, bindingTable, object, eventString,
 				/* Table in which to create binding. */
     ClientData object;		/* Token for object with which binding is
 				 * associated. */
-    char *eventString;		/* String describing event sequence that
+    CONST char *eventString;	/* String describing event sequence that
 				 * triggers binding. */
     TkBindEvalProc *eventProc;	/* Procedure to invoke when binding
 				 * triggers.  Must not be NULL. */
@@ -1154,7 +1154,7 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
     Tk_BindingTable bindingTable;	/* Table in which to delete binding. */
     ClientData object;			/* Token for object with which binding
 					 * is associated. */
-    char *eventString;			/* String describing event sequence
+    CONST char *eventString;		/* String describing event sequence
 					 * that triggers binding. */
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
@@ -1243,14 +1243,14 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_GetBinding(interp, bindingTable, object, eventString)
     Tcl_Interp *interp;			/* Interpreter for error reporting. */
     Tk_BindingTable bindingTable;	/* Table in which to look for
 					 * binding. */
     ClientData object;			/* Token for object with which binding
 					 * is associated. */
-    char *eventString;			/* String describing event sequence
+    CONST char *eventString;		/* String describing event sequence
 					 * that triggers binding. */
 {
     BindingTable *bindPtr = (BindingTable *) bindingTable;
@@ -1263,7 +1263,7 @@ Tk_GetBinding(interp, bindingTable, object, eventString)
 	return NULL;
     }
     if (psPtr->eventProc == EvalTclBinding) {
-	return (char *) psPtr->clientData;
+	return (CONST char *) psPtr->clientData;
     }
     return "";
 }
@@ -2306,7 +2306,7 @@ static void
 ExpandPercents(winPtr, before, eventPtr, keySym, dsPtr)
     TkWindow *winPtr;		/* Window where event occurred:  needed to
 				 * get input context. */
-    char *before;		/* Command containing percent expressions
+    CONST char *before;		/* Command containing percent expressions
 				 * to be replaced. */
     XEvent *eventPtr;		/* X event containing information to be
 				 * used in % replacements. */
@@ -2319,7 +2319,7 @@ ExpandPercents(winPtr, before, eventPtr, keySym, dsPtr)
 				 * list element. */
     int number, flags, length;
 #define NUM_SIZE 40
-    char *string;
+    CONST char *string;
     Tcl_DString buf;
     char numStorage[NUM_SIZE+1];
 
@@ -3279,7 +3279,8 @@ HandleEventGenerate(interp, mainWin, objc, objv)
     Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
     XEvent event;    
-    char *name, *p, *windowName;
+    CONST char *p;
+    char *name, *windowName;
     int count, flags, synch, i, number, warp;
     Tcl_QueuePosition pos;
     Pattern pat;
@@ -3951,7 +3952,7 @@ FindSequence(interp, patternTablePtr, object, eventString, create,
     ClientData object;		/* For binding table, token for object with
 				 * which binding is associated.
 				 * For virtual event table, NULL. */
-    char *eventString;		/* String description of pattern to
+    CONST char *eventString;	/* String description of pattern to
 				 * match on.  See user documentation
 				 * for details. */
     int create;			/* 0 means don't create the entry if
@@ -3967,7 +3968,7 @@ FindSequence(interp, patternTablePtr, object, eventString, create,
 
     Pattern pats[EVENT_BUFFER_SIZE];
     int numPats, virtualFound;
-    char *p;
+    CONST char *p;
     Pattern *patPtr;
     PatSeq *psPtr;
     Tcl_HashEntry *hPtr;
@@ -4122,7 +4123,7 @@ static int
 ParseEventDescription(interp, eventStringPtr, patPtr,
 	eventMaskPtr)
     Tcl_Interp *interp;		/* For error messages. */
-    char **eventStringPtr;	/* On input, holds a pointer to start of
+    CONST char **eventStringPtr;/* On input, holds a pointer to start of
 				 * event string.  On exit, gets pointer to
 				 * rest of string after parsed event. */
     Pattern *patPtr;		/* Filled with the pattern parsed from the
@@ -4136,8 +4137,10 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 #define FIELD_SIZE 48
     char field[FIELD_SIZE];
     Tcl_HashEntry *hPtr;
+    Tcl_DString copy;
 
-    p = *eventStringPtr;
+    Tcl_DStringInit(&copy);
+    p = Tcl_DStringAppend(&copy, *eventStringPtr, -1);
 
     patPtr->eventType = -1;
     patPtr->needMods = 0;
@@ -4166,7 +4169,8 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 		
 		sprintf(buf, "bad ASCII character 0x%x", (unsigned char) *p);
 		Tcl_SetResult(interp, buf, TCL_VOLATILE);
-		return 0;
+		count = 0;
+		goto done;
 	    }
 	}
 	p++;
@@ -4207,12 +4211,14 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 	if (p == field) {
 	    Tcl_SetResult(interp, "virtual event \"<<>>\" is badly formed",
 		    TCL_STATIC);
-	    return 0;
+	    count = 0;
+	    goto done;
 	}	    
 	if ((p == NULL) || (p[1] != '>')) {
 	    Tcl_SetResult(interp, "missing \">\" in virtual binding",
 		    TCL_STATIC);
-	    return 0;
+	    count = 0;
+	    goto done;
 	}
 	*p = '\0';
 	patPtr->eventType = VirtualEvent;
@@ -4275,7 +4281,8 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 	    } else if ((eventFlags & BUTTON) == 0) {
 		Tcl_AppendResult(interp, "specified button \"", field,
 			"\" for non-button event", (char *) NULL);
-		return 0;
+		count = 0;
+		goto done;
 	    }
 	    patPtr->detail.button = (*field - '0');
 	} else {
@@ -4284,7 +4291,8 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 	    if (patPtr->detail.keySym == NoSymbol) {
 		Tcl_AppendResult(interp, "bad event type or keysym \"",
 			field, "\"", (char *) NULL);
-		return 0;
+		count = 0;
+		goto done;
 	    }
 	    if (eventFlags == 0) {
 		patPtr->eventType = KeyPress;
@@ -4292,13 +4300,15 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 	    } else if ((eventFlags & KEY) == 0) {
 		Tcl_AppendResult(interp, "specified keysym \"", field,
 			"\" for non-key event", (char *) NULL);
-		return 0;
+		count = 0;
+		goto done;
 	    }
 	}
     } else if (eventFlags == 0) {
 	Tcl_SetResult(interp, "no event type or button # or keysym",
 		TCL_STATIC);
-	return 0;
+	count = 0;
+	goto done;
     }
 
     while ((*p == '-') || isspace(UCHAR(*p))) {
@@ -4311,17 +4321,21 @@ ParseEventDescription(interp, eventStringPtr, patPtr,
 		Tcl_SetResult(interp,
 			"extra characters after detail in binding",
 			TCL_STATIC);
-		return 0;
+		count = 0;
+		goto done;
 	    }
 	}
 	Tcl_SetResult(interp, "missing \">\" in binding", TCL_STATIC);
-	return 0;
+	count = 0;
+	goto done;
     }
     p++;
 
 end:
-    *eventStringPtr = p;
+    *eventStringPtr += (p - Tcl_DStringValue(&copy));
     *eventMaskPtr |= eventMask;
+done:
+    Tcl_DStringFree(&copy);
     return count;
 }
 
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index fc445f6..3f9e2e6 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkBitmap.c,v 1.9 2001/08/15 15:44:36 dkf Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -87,7 +87,7 @@ typedef struct TkBitmap {
  */
 
 typedef struct {
-    char *source;		/* Bitmap bits. */
+    CONST char *source;		/* Bitmap bits. */
     int width, height;		/* Dimensions of bitmap. */
 } DataKey;
 
@@ -468,7 +468,7 @@ Tk_DefineBitmap(interp, name, source, width, height)
     Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
     CONST char *name;		/* Name to use for bitmap.  Must not already
 				 * be defined as a bitmap. */
-    char *source;		/* Address of bits for bitmap. */
+    CONST char *source;		/* Address of bits for bitmap. */
     int width;			/* Width of bitmap. */
     int height;			/* Height of bitmap. */
 {
@@ -523,7 +523,7 @@ Tk_DefineBitmap(interp, name, source, width, height)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfBitmap(display, bitmap)
     Display *display;			/* Display for which bitmap was
 					 * allocated. */
@@ -809,7 +809,7 @@ Pixmap
 Tk_GetBitmapFromData(interp, tkwin, source, width, height)
     Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
     Tk_Window tkwin;		/* Window in which bitmap will be used. */
-    char *source;		/* Bitmap data for bitmap shape. */
+    CONST char *source;		/* Bitmap data for bitmap shape. */
     int width, height;		/* Dimensions of bitmap. */
 {
     DataKey nameKey;
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 429916f..141f69f 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkButton.c,v 1.18 2002/06/17 10:54:29 drh Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.19 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkButton.h"
@@ -524,11 +524,11 @@ static void		ButtonSelectImageProc _ANSI_ARGS_((
 			    ClientData clientData, int x, int y, int width,
 			    int height, int imgWidth, int imgHeight));
 static char *		ButtonTextVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static char *		ButtonVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static int		ButtonWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]));
@@ -1552,7 +1552,7 @@ static char *
 ButtonVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
@@ -1631,7 +1631,7 @@ static char *
 ButtonTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Not used. */
+    CONST char *name1;		/* Not used. */
     CONST char *name2;		/* Not used. */
     int flags;			/* Information about what happened. */
 {
diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c
index d1d5f68..317c272 100644
--- a/generic/tkCanvArc.c
+++ b/generic/tkCanvArc.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvArc.c,v 1.9 2001/07/03 06:03:44 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvArc.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -467,8 +467,8 @@ ConfigureArc(interp, canvas, itemPtr, objc, objv, flags)
     Tk_State state;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv,
-	    (char *) arcPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) arcPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c
index 39cf6a2..cc35dad 100644
--- a/generic/tkCanvBmap.c
+++ b/generic/tkCanvBmap.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvBmap.c,v 1.5 2001/07/03 06:03:44 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvBmap.c,v 1.6 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -336,8 +336,8 @@ ConfigureBitmap(interp, canvas, itemPtr, objc, objv, flags)
     Tk_State state;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv,
-	    (char *) bmapPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) bmapPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c
index 144b755..212ac2f 100644
--- a/generic/tkCanvImg.c
+++ b/generic/tkCanvImg.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvImg.c,v 1.4 1999/12/14 06:52:25 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvImg.c,v 1.5 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -319,8 +319,8 @@ ConfigureImage(interp, canvas, itemPtr, argc, argv, flags)
     Tk_Image image;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, argc, (char **) argv,
-	    (char *) imgPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, argc,
+	    (CONST char **) argv, (char *) imgPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 1263249..6431830 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvLine.c,v 1.10 2002/01/25 21:09:36 dgp Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.11 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -496,8 +496,8 @@ ConfigureLine(interp, canvas, itemPtr, objc, objv, flags)
     Tk_State state;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv,
-	    (char *) linePtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) linePtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index c4adf3c..b3f5374 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvPoly.c,v 1.8 2001/07/04 00:40:11 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.9 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -451,8 +451,8 @@ ConfigurePolygon(interp, canvas, itemPtr, objc, objv, flags)
     Tk_State state;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv,
-	    (char *) polyPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) polyPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index 47aa841..643f2a9 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvPs.c,v 1.9 2002/06/25 16:27:43 a_kovalenko Exp $
+ * RCS: @(#) $Id: tkCanvPs.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -146,7 +146,7 @@ TkCanvPostscriptCmd(canvasPtr, interp, argc, argv)
     TkCanvas *canvasPtr;		/* Information about canvas widget. */
     Tcl_Interp *interp;			/* Current interpreter. */
     int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings.  Caller has
+    CONST char **argv;			/* Argument strings.  Caller has
 					 * already parsed this command enough
 					 * to know that argv[1] is
 					 * "postscript". */
@@ -739,7 +739,7 @@ Tk_PostscriptFont(interp, psInfo, tkfont)
 	int argc;
 	double size;
 	CONST char **argv;
-	char *name;
+	CONST char *name;
 
 	name = Tk_NameOfFont(tkfont);
 	list = Tcl_GetVar2(interp, psInfoPtr->fontVar, name, 0);
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index 5254431..a7b9aa3 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvText.c,v 1.13 2002/05/26 09:09:19 pspjuth Exp $
+ * RCS: @(#) $Id: tkCanvText.c,v 1.14 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -407,8 +407,8 @@ ConfigureText(interp, canvas, itemPtr, objc, objv, flags)
     Tk_State state;
 
     tkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv,
-	    (char *) textPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) textPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c
index 87aadc9..80ba194 100644
--- a/generic/tkCanvUtil.c
+++ b/generic/tkCanvUtil.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvUtil.c,v 1.6 2002/01/25 21:09:36 dgp Exp $
+ * RCS: @(#) $Id: tkCanvUtil.c,v 1.7 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -369,7 +369,7 @@ Tk_CanvasTagsParseProc(clientData, interp, tkwin, value, widgRec, offset)
     ClientData clientData;		/* Not used.*/
     Tcl_Interp *interp;			/* Used for reporting errors. */
     Tk_Window tkwin;			/* Window containing canvas widget. */
-    char *value;			/* Value of option (list of tag
+    CONST char *value;			/* Value of option (list of tag
 					 * names). */
     char *widgRec;			/* Pointer to record for item. */
     int offset;				/* Offset into item (ignored). */
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c
index 65d09bd..c197584 100644
--- a/generic/tkCanvWind.c
+++ b/generic/tkCanvWind.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvWind.c,v 1.6 2002/06/14 22:25:12 jenglish Exp $
+ * RCS: @(#) $Id: tkCanvWind.c,v 1.7 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include <stdio.h>
@@ -329,8 +329,8 @@ ConfigureWinItem(interp, canvas, itemPtr, objc, objv, flags)
 
     oldWindow = winItemPtr->tkwin;
     canvasTkwin = Tk_CanvasTkwin(canvas);
-    if (Tk_ConfigureWidget(interp, canvasTkwin, configSpecs, objc, (char **) objv,
-	    (char *) winItemPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+    if (TCL_OK != Tk_ConfigureWidget(interp, canvasTkwin, configSpecs, objc,
+	    (CONST char **) objv, (char *) winItemPtr, flags|TK_CONFIG_OBJS)) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 37f9683..97adaf3 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvas.c,v 1.19 2002/07/24 19:41:38 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.20 2002/08/05 04:30:38 dgp Exp $
  */
 
 /* #define USE_OLD_TAG_SEARCH 1 */
@@ -291,7 +291,7 @@ static int		FindArea _ANSI_ARGS_((Tcl_Interp *interp,
 			    TkCanvas *canvasPtr, Tcl_Obj *CONST *argv, Tk_Uid uid,
 			    int enclosed));
 static double		GridAlign _ANSI_ARGS_((double coord, double spacing));
-static char**		GetStringsFromObjs _ANSI_ARGS_((int argc,
+static CONST char**	GetStringsFromObjs _ANSI_ARGS_((int argc,
 			    Tcl_Obj *CONST *objv));
 static void		InitCanvas _ANSI_ARGS_((void));
 #ifdef USE_OLD_TAG_SEARCH
@@ -770,7 +770,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 		goto done;
 	    }
 	} else if (argc == 4) {
-	    char *command;
+	    CONST char *command;
     
 	    command = Tk_GetBinding(interp, canvasPtr->bindingTable,
 		    object, Tcl_GetStringFromObj(argv[3], NULL));
@@ -791,7 +791,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 		    Tcl_ResetResult(interp);
 		}
 	    } else {
-		Tcl_SetResult(interp, command, TCL_STATIC);
+		Tcl_SetResult(interp, (char *) command, TCL_STATIC);
 	    }
 	} else {
 	    Tk_GetAllBindings(interp, canvasPtr->bindingTable, object);
@@ -900,7 +900,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 		result = (*itemPtr->typePtr->coordProc)(interp,
 			(Tk_Canvas) canvasPtr, itemPtr, argc-3, argv+3);
 	      } else {
-		char **args = GetStringsFromObjs(argc-3, argv+3);
+		CONST char **args = GetStringsFromObjs(argc-3, argv+3);
 		result = (*itemPtr->typePtr->coordProc)(interp,
 			(Tk_Canvas) canvasPtr, itemPtr, argc-3, (Tcl_Obj **) args);
 		if (args) ckfree((char *) args);
@@ -959,7 +959,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 	  result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr,
 		itemPtr, argc-3, argv+3);
 	} else {
-	  char **args = GetStringsFromObjs(argc-3, argv+3);
+	  CONST char **args = GetStringsFromObjs(argc-3, argv+3);
 	  result = (*typePtr->createProc)(interp, (Tk_Canvas) canvasPtr,
 		itemPtr, argc-3, (Tcl_Obj **) args);
 	  if (args) ckfree((char *) args);
@@ -1437,7 +1437,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 			(Tk_Canvas) canvasPtr, itemPtr, argc-3, argv+3,
 			TK_CONFIG_ARGV_ONLY);
 		} else {
-		char **args = GetStringsFromObjs(argc-3, argv+3);
+		CONST char **args = GetStringsFromObjs(argc-3, argv+3);
 		result = (*itemPtr->typePtr->configProc)(interp,
 			(Tk_Canvas) canvasPtr, itemPtr, argc-3, (Tcl_Obj **) args,
 			TK_CONFIG_ARGV_ONLY);
@@ -1526,7 +1526,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 	break;
       }
       case CANV_POSTSCRIPT: {
-	char **args = GetStringsFromObjs(argc, argv);
+	CONST char **args = GetStringsFromObjs(argc, argv);
 	result = TkCanvPostscriptCmd(canvasPtr, interp, argc, args);
 	if (args) ckfree((char *) args);
 	break;
@@ -1819,7 +1819,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 		    - canvasPtr->inset, canvasPtr->scrollX1,
 		    canvasPtr->scrollX2));
 	} else {
-	    char **args = GetStringsFromObjs(argc, argv);
+	    CONST char **args = GetStringsFromObjs(argc, argv);
 	    type = Tk_GetScrollInfo(interp, argc, args, &fraction, &count);
 	    if (args) ckfree((char *) args);
 	    switch (type) {
@@ -1863,7 +1863,7 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 		    - canvasPtr->inset, canvasPtr->scrollY1,
 		    canvasPtr->scrollY2));
 	} else {
-	    char **args = GetStringsFromObjs(argc, argv);
+	    CONST char **args = GetStringsFromObjs(argc, argv);
 	    type = Tk_GetScrollInfo(interp, argc, args, &fraction, &count);
 	    if (args) ckfree((char *) args);
 	    switch (type) {
@@ -2008,7 +2008,8 @@ ConfigureCanvas(interp, canvasPtr, argc, argv, flags)
     GC new;
 
     if (Tk_ConfigureWidget(interp, canvasPtr->tkwin, configSpecs,
-	    argc, (char **) argv, (char *) canvasPtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
+	    argc, (CONST char **) argv, (char *) canvasPtr,
+	    flags|TK_CONFIG_OBJS) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -5485,17 +5486,17 @@ CanvasSetOrigin(canvasPtr, xOrigin, yOrigin)
  *----------------------------------------------------------------------
  */
 /* ARGSUSED */
-static char **
+static CONST char **
 GetStringsFromObjs(argc, objv)
     int argc;
     Tcl_Obj *CONST objv[];
 {
     register int i;
-    char **argv;
+    CONST char **argv;
     if (argc <= 0) {
 	return NULL;
     }
-    argv = (char **) ckalloc((argc+1) * sizeof(char *));
+    argv = (CONST char **) ckalloc((argc+1) * sizeof(char *));
     for (i = 0; i < argc; i++) {
 	argv[i]=Tcl_GetStringFromObj(objv[i], (int *) NULL);
     }
diff --git a/generic/tkCanvas.h b/generic/tkCanvas.h
index 9d2c392..70cb03d 100644
--- a/generic/tkCanvas.h
+++ b/generic/tkCanvas.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: tkCanvas.h,v 1.4 1999/12/14 06:52:27 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvas.h,v 1.5 2002/08/05 04:30:38 dgp Exp $
  */
 
 #ifndef _TKCANVAS
@@ -293,7 +293,7 @@ typedef struct TkCanvas {
  */
 
 extern int		TkCanvPostscriptCmd _ANSI_ARGS_((TkCanvas *canvasPtr,
-			    Tcl_Interp *interp, int argc, char **argv));
+			    Tcl_Interp *interp, int argc, CONST char **argv));
 
 /*
  * The following definition is shared between tkCanvPs.c and tkCanvImg.c, 
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index 83fb376..2efdeac 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkClipboard.c,v 1.11 2002/06/19 20:40:55 mdejong Exp $
+ * RCS: @(#) $Id: tkClipboard.c,v 1.12 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -141,7 +141,7 @@ ClipboardAppHandler(clientData, offset, buffer, maxBytes)
 {
     TkDisplay *dispPtr = (TkDisplay *) clientData;
     size_t length;
-    char *p;
+    CONST char *p;
 
     p = dispPtr->clipboardAppPtr->winPtr->nameUid;
     length = strlen(p);
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 6b08149..e1cac65 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCmds.c,v 1.28 2002/06/17 20:09:01 hobbs Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.29 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -32,8 +32,8 @@
 
 static TkWindow *	GetToplevel _ANSI_ARGS_((Tk_Window tkwin));
 static char *		WaitVariableProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static void		WaitVisibilityProc _ANSI_ARGS_((ClientData clientData,
 			    XEvent *eventPtr));
 static void		WaitWindowProc _ANSI_ARGS_((ClientData clientData,
@@ -193,7 +193,7 @@ Tk_BindObjCmd(clientData, interp, objc, objv)
 	    return TCL_ERROR;
 	}
     } else if (objc == 3) {
-	char *command;
+	CONST char *command;
 
 	command = Tk_GetBinding(interp, winPtr->mainPtr->bindingTable,
 		object, Tcl_GetString(objv[2]));
@@ -201,7 +201,7 @@ Tk_BindObjCmd(clientData, interp, objc, objv)
 	    Tcl_ResetResult(interp);
 	    return TCL_OK;
 	}
-	Tcl_SetResult(interp, command, TCL_STATIC);
+	Tcl_SetResult(interp, (char *) command, TCL_STATIC);
     } else {
 	Tk_GetAllBindings(interp, winPtr->mainPtr->bindingTable, object);
     }
@@ -939,7 +939,7 @@ static char *
 WaitVariableProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Pointer to integer to set to 1. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
@@ -1410,7 +1410,7 @@ Tk_WinfoObjCmd(clientData, interp, objc, objv)
 	    break;
 	}
 	case WIN_ATOMNAME: {
-	    char *name;
+	    CONST char *name;
 	    long id;
 	    
 	    skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
@@ -1966,7 +1966,7 @@ TkDeadAppCmd(clientData, interp, argc, argv)
     ClientData clientData;	/* Dummy. */
     Tcl_Interp *interp;		/* Current interpreter. */
     int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
+    CONST char **argv;		/* Argument strings. */
 {
     Tcl_AppendResult(interp, "can't invoke \"", argv[0],
 	    "\" command:  application has been destroyed", (char *) NULL);
diff --git a/generic/tkColor.c b/generic/tkColor.c
index 7a9ced2..b3cc9bb 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkColor.c,v 1.8 2001/08/15 15:44:36 dkf Exp $
+ * RCS: @(#) $Id: tkColor.c,v 1.9 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkColor.h"
@@ -187,7 +187,7 @@ Tk_GetColor(interp, tkwin, name)
     Tcl_Interp *interp;		/* Place to leave error message if
 				 * color can't be found. */
     Tk_Window tkwin;		/* Window in which color will be used. */
-    char *name;			/* Name of color to be allocated (in form
+    Tk_Uid name;		/* Name of color to be allocated (in form
 				 * suitable for passing to XParseColor). */
 {
     Tcl_HashEntry *nameHashPtr;
@@ -363,7 +363,7 @@ Tk_GetColorByValue(tkwin, colorPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfColor(colorPtr)
     XColor *colorPtr;		/* Color whose name is desired. */
 {
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 6572e23..643ef81 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConfig.c,v 1.17 2002/06/18 23:51:46 dkf Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.18 2002/08/05 04:30:38 dgp Exp $
  */
 
 /*
@@ -465,7 +465,7 @@ Tk_InitOptions(interp, recordPtr, optionTable, tkwin)
     OptionTable *tablePtr = (OptionTable *) optionTable;
     Option *optionPtr;
     int count;
-    char *value;
+    Tk_Uid value;
     Tcl_Obj *valuePtr;
     enum {
 	OPTION_DATABASE, SYSTEM_DEFAULT, TABLE_DEFAULT
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index e004155..c8e2c8a 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConsole.c,v 1.17 2002/04/12 06:51:50 hobbs Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.18 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tk.h"
@@ -48,12 +48,12 @@ TCL_DECLARE_MUTEX(consoleMutex)
  */
  
 static int	ConsoleCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
+		    Tcl_Interp *interp, int argc, CONST char **argv));
 static void	ConsoleDeleteProc _ANSI_ARGS_((ClientData clientData));
 static void	ConsoleEventProc _ANSI_ARGS_((ClientData clientData,
 		    XEvent *eventPtr));
 static int	InterpreterCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
+		    Tcl_Interp *interp, int argc, CONST char **argv));
 
 static int	ConsoleInput _ANSI_ARGS_((ClientData instanceData,
 		    char *buf, int toRead, int *errorCode));
@@ -560,7 +560,7 @@ ConsoleCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Not used. */
     Tcl_Interp *interp;			/* Current interpreter. */
     int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
+    CONST char **argv;			/* Argument strings. */
 {
     ConsoleInfo *info = (ConsoleInfo *) clientData;
     char c;
@@ -637,7 +637,7 @@ InterpreterCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Not used. */
     Tcl_Interp *interp;			/* Current interpreter. */
     int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
+    CONST char **argv;			/* Argument strings. */
 {
     ConsoleInfo *info = (ConsoleInfo *) clientData;
     char c;
diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index 89c40ae..ce6b381 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCursor.c,v 1.8 2001/10/23 08:40:47 dkf Exp $
+ * RCS: @(#) $Id: tkCursor.c,v 1.9 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -26,8 +26,8 @@
  */
 
 typedef struct {
-    char *source;		/* Cursor bits. */
-    char *mask;			/* Mask bits. */
+    CONST char *source;		/* Cursor bits. */
+    CONST char *mask;		/* Mask bits. */
     int width, height;		/* Dimensions of cursor (and data
 				 * and mask). */
     int xHot, yHot;		/* Location of cursor hot-spot. */
@@ -45,7 +45,7 @@ static void		DupCursorObjProc _ANSI_ARGS_((Tcl_Obj *srcObjPtr,
 static void		FreeCursor _ANSI_ARGS_((TkCursor *cursorPtr));
 static void		FreeCursorObjProc _ANSI_ARGS_((Tcl_Obj *objPtr));
 static TkCursor *	GetCursor _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tk_Window tkwin, char *name));
+			    Tk_Window tkwin, CONST char *name));
 static TkCursor *	GetCursorFromObj _ANSI_ARGS_((Tk_Window tkwin,
 			    Tcl_Obj *objPtr));
 static void		InitCursorObj _ANSI_ARGS_((Tcl_Obj *objPtr));
@@ -189,7 +189,7 @@ Tk_Cursor
 Tk_GetCursor(interp, tkwin, string)
     Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
     Tk_Window tkwin;		/* Window in which cursor will be used. */
-    char *string;		/* Description of cursor.  See manual entry
+    Tk_Uid string;		/* Description of cursor.  See manual entry
 				 * for details on legal syntax. */
 {
     TkCursor *cursorPtr = GetCursor(interp, tkwin, string);
@@ -230,7 +230,7 @@ static TkCursor *
 GetCursor(interp, tkwin, string)
     Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
     Tk_Window tkwin;		/* Window in which cursor will be used. */
-    char *string;		/* Description of cursor.  See manual entry
+    CONST char *string;		/* Description of cursor.  See manual entry
 				 * for details on legal syntax. */
 {
     Tcl_HashEntry *nameHashPtr;
@@ -318,8 +318,8 @@ Tk_GetCursorFromData(interp, tkwin, source, mask, width, height,
 	xHot, yHot, fg, bg)
     Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
     Tk_Window tkwin;		/* Window in which cursor will be used. */
-    char *source;		/* Bitmap data for cursor shape. */
-    char *mask;			/* Bitmap data for cursor mask. */
+    CONST char *source;		/* Bitmap data for cursor shape. */
+    CONST char *mask;		/* Bitmap data for cursor mask. */
     int width, height;		/* Dimensions of cursor. */
     int xHot, yHot;		/* Location of hot-spot in cursor. */
     Tk_Uid fg;			/* Foreground color for cursor. */
@@ -418,7 +418,7 @@ Tk_GetCursorFromData(interp, tkwin, source, mask, width, height,
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfCursor(display, cursor)
     Display *display;		/* Display for which cursor was allocated. */
     Tk_Cursor cursor;		/* Identifier for cursor whose name is
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index c0d55bc..fd5aadd 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.22 2002/06/18 23:51:46 dkf Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.23 2002/08/05 04:30:38 dgp Exp $
  */
 
 #ifndef _TKDECLS
@@ -97,7 +97,7 @@ EXTERN void		Tk_CanvasSetStippleOrigin _ANSI_ARGS_((
 /* 18 */
 EXTERN int		Tk_CanvasTagsParseProc _ANSI_ARGS_((
 				ClientData clientData, Tcl_Interp * interp, 
-				Tk_Window tkwin, char * value, 
+				Tk_Window tkwin, CONST char * value, 
 				char * widgRec, int offset));
 /* 19 */
 EXTERN char *		Tk_CanvasTagsPrintProc _ANSI_ARGS_((
@@ -131,16 +131,18 @@ EXTERN int		Tk_ClipboardClear _ANSI_ARGS_((Tcl_Interp * interp,
 /* 27 */
 EXTERN int		Tk_ConfigureInfo _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				char * widgRec, char * argvName, int flags));
+				char * widgRec, CONST char * argvName, 
+				int flags));
 /* 28 */
 EXTERN int		Tk_ConfigureValue _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				char * widgRec, char * argvName, int flags));
+				char * widgRec, CONST char * argvName, 
+				int flags));
 /* 29 */
 EXTERN int		Tk_ConfigureWidget _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, Tk_ConfigSpec * specs, 
-				int argc, char ** argv, char * widgRec, 
-				int flags));
+				int argc, CONST84 char ** argv, 
+				char * widgRec, int flags));
 /* 30 */
 EXTERN void		Tk_ConfigureWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				unsigned int valueMask, 
@@ -156,8 +158,8 @@ EXTERN Tk_Window	Tk_CoordsToWindow _ANSI_ARGS_((int rootX, int rootY,
 /* 33 */
 EXTERN unsigned long	Tk_CreateBinding _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_BindingTable bindingTable, 
-				ClientData object, char * eventStr, 
-				char * command, int append));
+				ClientData object, CONST char * eventStr, 
+				CONST char * command, int append));
 /* 34 */
 EXTERN Tk_BindingTable	Tk_CreateBindingTable _ANSI_ARGS_((
 				Tcl_Interp * interp));
@@ -188,16 +190,17 @@ EXTERN void		Tk_CreateSelHandler _ANSI_ARGS_((Tk_Window tkwin,
 				ClientData clientData, Atom format));
 /* 42 */
 EXTERN Tk_Window	Tk_CreateWindow _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tk_Window parent, char * name, 
-				char * screenName));
+				Tk_Window parent, CONST char * name, 
+				CONST char * screenName));
 /* 43 */
 EXTERN Tk_Window	Tk_CreateWindowFromPath _ANSI_ARGS_((
 				Tcl_Interp * interp, Tk_Window tkwin, 
-				char * pathName, char * screenName));
+				CONST char * pathName, 
+				CONST char * screenName));
 /* 44 */
 EXTERN int		Tk_DefineBitmap _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * name, char * source, int width, 
-				int height));
+				CONST char * name, CONST char * source, 
+				int width, int height));
 /* 45 */
 EXTERN void		Tk_DefineCursor _ANSI_ARGS_((Tk_Window window, 
 				Tk_Cursor cursor));
@@ -208,7 +211,7 @@ EXTERN void		Tk_DeleteAllBindings _ANSI_ARGS_((
 /* 47 */
 EXTERN int		Tk_DeleteBinding _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_BindingTable bindingTable, 
-				ClientData object, char * eventStr));
+				ClientData object, CONST char * eventStr));
 /* 48 */
 EXTERN void		Tk_DeleteBindingTable _ANSI_ARGS_((
 				Tk_BindingTable bindingTable));
@@ -224,14 +227,14 @@ EXTERN void		Tk_DeleteGenericHandler _ANSI_ARGS_((
 				Tk_GenericProc * proc, ClientData clientData));
 /* 52 */
 EXTERN void		Tk_DeleteImage _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name));
+				CONST char * name));
 /* 53 */
 EXTERN void		Tk_DeleteSelHandler _ANSI_ARGS_((Tk_Window tkwin, 
 				Atom selection, Atom target));
 /* 54 */
 EXTERN void		Tk_DestroyWindow _ANSI_ARGS_((Tk_Window tkwin));
 /* 55 */
-EXTERN char *		Tk_DisplayName _ANSI_ARGS_((Tk_Window tkwin));
+EXTERN CONST84_RETURN char * Tk_DisplayName _ANSI_ARGS_((Tk_Window tkwin));
 /* 56 */
 EXTERN int		Tk_DistanceToTextLayout _ANSI_ARGS_((
 				Tk_TextLayout layout, int x, int y));
@@ -270,7 +273,7 @@ EXTERN void		Tk_Fill3DRectangle _ANSI_ARGS_((Tk_Window tkwin,
 				int borderWidth, int relief));
 /* 64 */
 EXTERN Tk_PhotoHandle	Tk_FindPhoto _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * imageName));
+				CONST char * imageName));
 /* 65 */
 EXTERN Font		Tk_FontId _ANSI_ARGS_((Tk_Font font));
 /* 66 */
@@ -319,24 +322,24 @@ EXTERN void		Tk_GetAllBindings _ANSI_ARGS_((Tcl_Interp * interp,
 				ClientData object));
 /* 82 */
 EXTERN int		Tk_GetAnchor _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, Tk_Anchor * anchorPtr));
+				CONST char * str, Tk_Anchor * anchorPtr));
 /* 83 */
-EXTERN char *		Tk_GetAtomName _ANSI_ARGS_((Tk_Window tkwin, 
+EXTERN CONST84_RETURN char * Tk_GetAtomName _ANSI_ARGS_((Tk_Window tkwin, 
 				Atom atom));
 /* 84 */
-EXTERN char *		Tk_GetBinding _ANSI_ARGS_((Tcl_Interp * interp, 
+EXTERN CONST84_RETURN char * Tk_GetBinding _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_BindingTable bindingTable, 
-				ClientData object, char * eventStr));
+				ClientData object, CONST char * eventStr));
 /* 85 */
 EXTERN Pixmap		Tk_GetBitmap _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, CONST char * str));
 /* 86 */
 EXTERN Pixmap		Tk_GetBitmapFromData _ANSI_ARGS_((
 				Tcl_Interp * interp, Tk_Window tkwin, 
-				char * source, int width, int height));
+				CONST char * source, int width, int height));
 /* 87 */
 EXTERN int		Tk_GetCapStyle _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * capPtr));
+				CONST char * str, int * capPtr));
 /* 88 */
 EXTERN XColor *		Tk_GetColor _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, Tk_Uid name));
@@ -345,16 +348,16 @@ EXTERN XColor *		Tk_GetColorByValue _ANSI_ARGS_((Tk_Window tkwin,
 				XColor * colorPtr));
 /* 90 */
 EXTERN Colormap		Tk_GetColormap _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tk_Window tkwin, char * str));
+				Tk_Window tkwin, CONST char * str));
 /* 91 */
 EXTERN Tk_Cursor	Tk_GetCursor _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, Tk_Uid str));
 /* 92 */
 EXTERN Tk_Cursor	Tk_GetCursorFromData _ANSI_ARGS_((
 				Tcl_Interp * interp, Tk_Window tkwin, 
-				char * source, char * mask, int width, 
-				int height, int xHot, int yHot, Tk_Uid fg, 
-				Tk_Uid bg));
+				CONST char * source, CONST char * mask, 
+				int width, int height, int xHot, int yHot, 
+				Tk_Uid fg, Tk_Uid bg));
 /* 93 */
 EXTERN Tk_Font		Tk_GetFont _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, CONST char * str));
@@ -370,26 +373,26 @@ EXTERN GC		Tk_GetGC _ANSI_ARGS_((Tk_Window tkwin,
 				XGCValues * valuePtr));
 /* 97 */
 EXTERN Tk_Image		Tk_GetImage _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tk_Window tkwin, char * name, 
+				Tk_Window tkwin, CONST char * name, 
 				Tk_ImageChangedProc * changeProc, 
 				ClientData clientData));
 /* 98 */
 EXTERN ClientData	Tk_GetImageMasterData _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name, 
+				Tcl_Interp * interp, CONST char * name, 
 				Tk_ImageType ** typePtrPtr));
 /* 99 */
 EXTERN Tk_ItemType *	Tk_GetItemTypes _ANSI_ARGS_((void));
 /* 100 */
 EXTERN int		Tk_GetJoinStyle _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * joinPtr));
+				CONST char * str, int * joinPtr));
 /* 101 */
 EXTERN int		Tk_GetJustify _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, Tk_Justify * justifyPtr));
+				CONST char * str, Tk_Justify * justifyPtr));
 /* 102 */
 EXTERN int		Tk_GetNumMainWindows _ANSI_ARGS_((void));
 /* 103 */
 EXTERN Tk_Uid		Tk_GetOption _ANSI_ARGS_((Tk_Window tkwin, 
-				char * name, char * className));
+				CONST char * name, CONST char * className));
 /* 104 */
 EXTERN int		Tk_GetPixels _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, CONST char * str, 
@@ -399,14 +402,14 @@ EXTERN Pixmap		Tk_GetPixmap _ANSI_ARGS_((Display * display,
 				Drawable d, int width, int height, int depth));
 /* 106 */
 EXTERN int		Tk_GetRelief _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, int * reliefPtr));
+				CONST char * name, int * reliefPtr));
 /* 107 */
 EXTERN void		Tk_GetRootCoords _ANSI_ARGS_((Tk_Window tkwin, 
 				int * xPtr, int * yPtr));
 /* 108 */
 EXTERN int		Tk_GetScrollInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv, double * dblPtr, 
-				int * intPtr));
+				int argc, CONST84 char ** argv, 
+				double * dblPtr, int * intPtr));
 /* 109 */
 EXTERN int		Tk_GetScreenMM _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, CONST char * str, 
@@ -419,8 +422,8 @@ EXTERN int		Tk_GetSelection _ANSI_ARGS_((Tcl_Interp * interp,
 EXTERN Tk_Uid		Tk_GetUid _ANSI_ARGS_((CONST char * str));
 /* 112 */
 EXTERN Visual *		Tk_GetVisual _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tk_Window tkwin, char * str, int * depthPtr, 
-				Colormap * colormapPtr));
+				Tk_Window tkwin, CONST char * str, 
+				int * depthPtr, Colormap * colormapPtr));
 /* 113 */
 EXTERN void		Tk_GetVRootGeometry _ANSI_ARGS_((Tk_Window tkwin, 
 				int * xPtr, int * yPtr, int * widthPtr, 
@@ -441,7 +444,7 @@ EXTERN void		Tk_ImageChanged _ANSI_ARGS_((Tk_ImageMaster master,
 EXTERN int		Tk_Init _ANSI_ARGS_((Tcl_Interp * interp));
 /* 119 */
 EXTERN Atom		Tk_InternAtom _ANSI_ARGS_((Tk_Window tkwin, 
-				char * name));
+				CONST char * name));
 /* 120 */
 EXTERN int		Tk_IntersectTextLayout _ANSI_ARGS_((
 				Tk_TextLayout layout, int x, int y, 
@@ -473,30 +476,32 @@ EXTERN void		Tk_MoveWindow _ANSI_ARGS_((Tk_Window tkwin, int x,
 EXTERN void		Tk_MoveToplevelWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int x, int y));
 /* 130 */
-EXTERN char *		Tk_NameOf3DBorder _ANSI_ARGS_((Tk_3DBorder border));
+EXTERN CONST84_RETURN char * Tk_NameOf3DBorder _ANSI_ARGS_((
+				Tk_3DBorder border));
 /* 131 */
-EXTERN char *		Tk_NameOfAnchor _ANSI_ARGS_((Tk_Anchor anchor));
+EXTERN CONST84_RETURN char * Tk_NameOfAnchor _ANSI_ARGS_((Tk_Anchor anchor));
 /* 132 */
-EXTERN char *		Tk_NameOfBitmap _ANSI_ARGS_((Display * display, 
+EXTERN CONST84_RETURN char * Tk_NameOfBitmap _ANSI_ARGS_((Display * display, 
 				Pixmap bitmap));
 /* 133 */
-EXTERN char *		Tk_NameOfCapStyle _ANSI_ARGS_((int cap));
+EXTERN CONST84_RETURN char * Tk_NameOfCapStyle _ANSI_ARGS_((int cap));
 /* 134 */
-EXTERN char *		Tk_NameOfColor _ANSI_ARGS_((XColor * colorPtr));
+EXTERN CONST84_RETURN char * Tk_NameOfColor _ANSI_ARGS_((XColor * colorPtr));
 /* 135 */
-EXTERN char *		Tk_NameOfCursor _ANSI_ARGS_((Display * display, 
+EXTERN CONST84_RETURN char * Tk_NameOfCursor _ANSI_ARGS_((Display * display, 
 				Tk_Cursor cursor));
 /* 136 */
-EXTERN char *		Tk_NameOfFont _ANSI_ARGS_((Tk_Font font));
+EXTERN CONST84_RETURN char * Tk_NameOfFont _ANSI_ARGS_((Tk_Font font));
 /* 137 */
-EXTERN char *		Tk_NameOfImage _ANSI_ARGS_((
+EXTERN CONST84_RETURN char * Tk_NameOfImage _ANSI_ARGS_((
 				Tk_ImageMaster imageMaster));
 /* 138 */
-EXTERN char *		Tk_NameOfJoinStyle _ANSI_ARGS_((int join));
+EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle _ANSI_ARGS_((int join));
 /* 139 */
-EXTERN char *		Tk_NameOfJustify _ANSI_ARGS_((Tk_Justify justify));
+EXTERN CONST84_RETURN char * Tk_NameOfJustify _ANSI_ARGS_((
+				Tk_Justify justify));
 /* 140 */
-EXTERN char *		Tk_NameOfRelief _ANSI_ARGS_((int relief));
+EXTERN CONST84_RETURN char * Tk_NameOfRelief _ANSI_ARGS_((int relief));
 /* 141 */
 EXTERN Tk_Window	Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp * interp, 
 				CONST char * pathName, Tk_Window tkwin));
@@ -564,14 +569,14 @@ EXTERN Tk_RestrictProc * Tk_RestrictEvents _ANSI_ARGS_((
 /* 159 */
 EXTERN int		Tk_SafeInit _ANSI_ARGS_((Tcl_Interp * interp));
 /* 160 */
-EXTERN char *		Tk_SetAppName _ANSI_ARGS_((Tk_Window tkwin, 
-				char * name));
+EXTERN CONST char *	Tk_SetAppName _ANSI_ARGS_((Tk_Window tkwin, 
+				CONST char * name));
 /* 161 */
 EXTERN void		Tk_SetBackgroundFromBorder _ANSI_ARGS_((
 				Tk_Window tkwin, Tk_3DBorder border));
 /* 162 */
 EXTERN void		Tk_SetClass _ANSI_ARGS_((Tk_Window tkwin, 
-				char * className));
+				CONST char * className));
 /* 163 */
 EXTERN void		Tk_SetGrid _ANSI_ARGS_((Tk_Window tkwin, 
 				int reqWidth, int reqHeight, int gridWidth, 
@@ -833,7 +838,7 @@ EXTERN void		Tk_DeleteClientMessageHandler _ANSI_ARGS_((
 /* 241 */
 EXTERN Tk_Window	Tk_CreateAnonymousWindow _ANSI_ARGS_((
 				Tcl_Interp * interp, Tk_Window parent, 
-				char * screenName));
+				CONST char * screenName));
 /* 242 */
 EXTERN void		Tk_SetClassProcs _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_ClassProcs * procs, 
@@ -861,16 +866,16 @@ EXTERN void		Tk_PhotoPutZoomedBlock _ANSI_ARGS_((
 EXTERN int		Tk_CollapseMotionEvents _ANSI_ARGS_((
 				Display * display, int collapse));
 /* 249 */
-EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine _ANSI_ARGS_((char * name, 
-				Tk_StyleEngine parent));
+EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine _ANSI_ARGS_((
+				CONST char * name, Tk_StyleEngine parent));
 /* 250 */
-EXTERN Tk_StyleEngine	Tk_GetStyleEngine _ANSI_ARGS_((char * name));
+EXTERN Tk_StyleEngine	Tk_GetStyleEngine _ANSI_ARGS_((CONST char * name));
 /* 251 */
 EXTERN int		Tk_RegisterStyledElement _ANSI_ARGS_((
 				Tk_StyleEngine engine, 
 				Tk_ElementSpec * templatePtr));
 /* 252 */
-EXTERN int		Tk_GetElementId _ANSI_ARGS_((char * name));
+EXTERN int		Tk_GetElementId _ANSI_ARGS_((CONST char * name));
 /* 253 */
 EXTERN Tk_Style		Tk_CreateStyle _ANSI_ARGS_((CONST char * name, 
 				Tk_StyleEngine engine, ClientData clientData));
@@ -941,7 +946,7 @@ typedef struct TkStubs {
     int (*tk_CanvasPsStipple) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, Pixmap bitmap)); /* 15 */
     double (*tk_CanvasPsY) _ANSI_ARGS_((Tk_Canvas canvas, double y)); /* 16 */
     void (*tk_CanvasSetStippleOrigin) _ANSI_ARGS_((Tk_Canvas canvas, GC gc)); /* 17 */
-    int (*tk_CanvasTagsParseProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, char * value, char * widgRec, int offset)); /* 18 */
+    int (*tk_CanvasTagsParseProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset)); /* 18 */
     char * (*tk_CanvasTagsPrintProc) _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr)); /* 19 */
     Tk_Window (*tk_CanvasTkwin) _ANSI_ARGS_((Tk_Canvas canvas)); /* 20 */
     void (*tk_CanvasWindowCoords) _ANSI_ARGS_((Tk_Canvas canvas, double x, double y, short * screenXPtr, short * screenYPtr)); /* 21 */
@@ -950,13 +955,13 @@ typedef struct TkStubs {
     void (*tk_ClearSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection)); /* 24 */
     int (*tk_ClipboardAppend) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Atom target, Atom format, char* buffer)); /* 25 */
     int (*tk_ClipboardClear) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin)); /* 26 */
-    int (*tk_ConfigureInfo) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, char * argvName, int flags)); /* 27 */
-    int (*tk_ConfigureValue) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, char * argvName, int flags)); /* 28 */
-    int (*tk_ConfigureWidget) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, char ** argv, char * widgRec, int flags)); /* 29 */
+    int (*tk_ConfigureInfo) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags)); /* 27 */
+    int (*tk_ConfigureValue) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, char * widgRec, CONST char * argvName, int flags)); /* 28 */
+    int (*tk_ConfigureWidget) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs, int argc, CONST84 char ** argv, char * widgRec, int flags)); /* 29 */
     void (*tk_ConfigureWindow) _ANSI_ARGS_((Tk_Window tkwin, unsigned int valueMask, XWindowChanges * valuePtr)); /* 30 */
     Tk_TextLayout (*tk_ComputeTextLayout) _ANSI_ARGS_((Tk_Font font, CONST char * str, int numChars, int wrapLength, Tk_Justify justify, int flags, int * widthPtr, int * heightPtr)); /* 31 */
     Tk_Window (*tk_CoordsToWindow) _ANSI_ARGS_((int rootX, int rootY, Tk_Window tkwin)); /* 32 */
-    unsigned long (*tk_CreateBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, char * eventStr, char * command, int append)); /* 33 */
+    unsigned long (*tk_CreateBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr, CONST char * command, int append)); /* 33 */
     Tk_BindingTable (*tk_CreateBindingTable) _ANSI_ARGS_((Tcl_Interp * interp)); /* 34 */
     Tk_ErrorHandler (*tk_CreateErrorHandler) _ANSI_ARGS_((Display * display, int errNum, int request, int minorCode, Tk_ErrorProc * errorProc, ClientData clientData)); /* 35 */
     void (*tk_CreateEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData)); /* 36 */
@@ -965,20 +970,20 @@ typedef struct TkStubs {
     void (*tk_CreateItemType) _ANSI_ARGS_((Tk_ItemType * typePtr)); /* 39 */
     void (*tk_CreatePhotoImageFormat) _ANSI_ARGS_((Tk_PhotoImageFormat * formatPtr)); /* 40 */
     void (*tk_CreateSelHandler) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc * proc, ClientData clientData, Atom format)); /* 41 */
-    Tk_Window (*tk_CreateWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, char * name, char * screenName)); /* 42 */
-    Tk_Window (*tk_CreateWindowFromPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * pathName, char * screenName)); /* 43 */
-    int (*tk_DefineBitmap) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, char * source, int width, int height)); /* 44 */
+    Tk_Window (*tk_CreateWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, CONST char * name, CONST char * screenName)); /* 42 */
+    Tk_Window (*tk_CreateWindowFromPath) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * pathName, CONST char * screenName)); /* 43 */
+    int (*tk_DefineBitmap) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, CONST char * source, int width, int height)); /* 44 */
     void (*tk_DefineCursor) _ANSI_ARGS_((Tk_Window window, Tk_Cursor cursor)); /* 45 */
     void (*tk_DeleteAllBindings) _ANSI_ARGS_((Tk_BindingTable bindingTable, ClientData object)); /* 46 */
-    int (*tk_DeleteBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, char * eventStr)); /* 47 */
+    int (*tk_DeleteBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr)); /* 47 */
     void (*tk_DeleteBindingTable) _ANSI_ARGS_((Tk_BindingTable bindingTable)); /* 48 */
     void (*tk_DeleteErrorHandler) _ANSI_ARGS_((Tk_ErrorHandler handler)); /* 49 */
     void (*tk_DeleteEventHandler) _ANSI_ARGS_((Tk_Window token, unsigned long mask, Tk_EventProc * proc, ClientData clientData)); /* 50 */
     void (*tk_DeleteGenericHandler) _ANSI_ARGS_((Tk_GenericProc * proc, ClientData clientData)); /* 51 */
-    void (*tk_DeleteImage) _ANSI_ARGS_((Tcl_Interp * interp, char * name)); /* 52 */
+    void (*tk_DeleteImage) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 52 */
     void (*tk_DeleteSelHandler) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Atom target)); /* 53 */
     void (*tk_DestroyWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 54 */
-    char * (*tk_DisplayName) _ANSI_ARGS_((Tk_Window tkwin)); /* 55 */
+    CONST84_RETURN char * (*tk_DisplayName) _ANSI_ARGS_((Tk_Window tkwin)); /* 55 */
     int (*tk_DistanceToTextLayout) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 56 */
     void (*tk_Draw3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 57 */
     void (*tk_Draw3DRectangle) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief)); /* 58 */
@@ -987,7 +992,7 @@ typedef struct TkStubs {
     void (*tk_DrawTextLayout) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar)); /* 61 */
     void (*tk_Fill3DPolygon) _ANSI_ARGS_((Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint * pointPtr, int numPoints, int borderWidth, int leftRelief)); /* 62 */
     void (*tk_Fill3DRectangle) _ANSI_ARGS_((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) _ANSI_ARGS_((Tcl_Interp * interp, char * imageName)); /* 64 */
+    Tk_PhotoHandle (*tk_FindPhoto) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * imageName)); /* 64 */
     Font (*tk_FontId) _ANSI_ARGS_((Tk_Font font)); /* 65 */
     void (*tk_Free3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 66 */
     void (*tk_FreeBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 67 */
@@ -1005,44 +1010,44 @@ typedef struct TkStubs {
     void (*tk_GeometryRequest) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight)); /* 79 */
     Tk_3DBorder (*tk_Get3DBorder) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid colorName)); /* 80 */
     void (*tk_GetAllBindings) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object)); /* 81 */
-    int (*tk_GetAnchor) _ANSI_ARGS_((Tcl_Interp * interp, char * str, Tk_Anchor * anchorPtr)); /* 82 */
-    char * (*tk_GetAtomName) _ANSI_ARGS_((Tk_Window tkwin, Atom atom)); /* 83 */
-    char * (*tk_GetBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, char * eventStr)); /* 84 */
+    int (*tk_GetAnchor) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, Tk_Anchor * anchorPtr)); /* 82 */
+    CONST84_RETURN char * (*tk_GetAtomName) _ANSI_ARGS_((Tk_Window tkwin, Atom atom)); /* 83 */
+    CONST84_RETURN char * (*tk_GetBinding) _ANSI_ARGS_((Tcl_Interp * interp, Tk_BindingTable bindingTable, ClientData object, CONST char * eventStr)); /* 84 */
     Pixmap (*tk_GetBitmap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 85 */
-    Pixmap (*tk_GetBitmapFromData) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * source, int width, int height)); /* 86 */
-    int (*tk_GetCapStyle) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * capPtr)); /* 87 */
+    Pixmap (*tk_GetBitmapFromData) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * source, int width, int height)); /* 86 */
+    int (*tk_GetCapStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int * capPtr)); /* 87 */
     XColor * (*tk_GetColor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid name)); /* 88 */
     XColor * (*tk_GetColorByValue) _ANSI_ARGS_((Tk_Window tkwin, XColor * colorPtr)); /* 89 */
-    Colormap (*tk_GetColormap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * str)); /* 90 */
+    Colormap (*tk_GetColormap) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 90 */
     Tk_Cursor (*tk_GetCursor) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Tk_Uid str)); /* 91 */
-    Tk_Cursor (*tk_GetCursorFromData) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * source, char * mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg)); /* 92 */
+    Tk_Cursor (*tk_GetCursorFromData) _ANSI_ARGS_((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) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str)); /* 93 */
     Tk_Font (*tk_GetFontFromObj) _ANSI_ARGS_((Tk_Window tkwin, Tcl_Obj * objPtr)); /* 94 */
     void (*tk_GetFontMetrics) _ANSI_ARGS_((Tk_Font font, Tk_FontMetrics * fmPtr)); /* 95 */
     GC (*tk_GetGC) _ANSI_ARGS_((Tk_Window tkwin, unsigned long valueMask, XGCValues * valuePtr)); /* 96 */
-    Tk_Image (*tk_GetImage) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * name, Tk_ImageChangedProc * changeProc, ClientData clientData)); /* 97 */
-    ClientData (*tk_GetImageMasterData) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tk_ImageType ** typePtrPtr)); /* 98 */
+    Tk_Image (*tk_GetImage) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * name, Tk_ImageChangedProc * changeProc, ClientData clientData)); /* 97 */
+    ClientData (*tk_GetImageMasterData) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, Tk_ImageType ** typePtrPtr)); /* 98 */
     Tk_ItemType * (*tk_GetItemTypes) _ANSI_ARGS_((void)); /* 99 */
-    int (*tk_GetJoinStyle) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * joinPtr)); /* 100 */
-    int (*tk_GetJustify) _ANSI_ARGS_((Tcl_Interp * interp, char * str, Tk_Justify * justifyPtr)); /* 101 */
+    int (*tk_GetJoinStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int * joinPtr)); /* 100 */
+    int (*tk_GetJustify) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, Tk_Justify * justifyPtr)); /* 101 */
     int (*tk_GetNumMainWindows) _ANSI_ARGS_((void)); /* 102 */
-    Tk_Uid (*tk_GetOption) _ANSI_ARGS_((Tk_Window tkwin, char * name, char * className)); /* 103 */
+    Tk_Uid (*tk_GetOption) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name, CONST char * className)); /* 103 */
     int (*tk_GetPixels) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * intPtr)); /* 104 */
     Pixmap (*tk_GetPixmap) _ANSI_ARGS_((Display * display, Drawable d, int width, int height, int depth)); /* 105 */
-    int (*tk_GetRelief) _ANSI_ARGS_((Tcl_Interp * interp, char * name, int * reliefPtr)); /* 106 */
+    int (*tk_GetRelief) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, int * reliefPtr)); /* 106 */
     void (*tk_GetRootCoords) _ANSI_ARGS_((Tk_Window tkwin, int * xPtr, int * yPtr)); /* 107 */
-    int (*tk_GetScrollInfo) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, double * dblPtr, int * intPtr)); /* 108 */
+    int (*tk_GetScrollInfo) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, double * dblPtr, int * intPtr)); /* 108 */
     int (*tk_GetScreenMM) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, double * doublePtr)); /* 109 */
     int (*tk_GetSelection) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc * proc, ClientData clientData)); /* 110 */
     Tk_Uid (*tk_GetUid) _ANSI_ARGS_((CONST char * str)); /* 111 */
-    Visual * (*tk_GetVisual) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, char * str, int * depthPtr, Colormap * colormapPtr)); /* 112 */
+    Visual * (*tk_GetVisual) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * str, int * depthPtr, Colormap * colormapPtr)); /* 112 */
     void (*tk_GetVRootGeometry) _ANSI_ARGS_((Tk_Window tkwin, int * xPtr, int * yPtr, int * widthPtr, int * heightPtr)); /* 113 */
     int (*tk_Grab) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int grabGlobal)); /* 114 */
     void (*tk_HandleEvent) _ANSI_ARGS_((XEvent * eventPtr)); /* 115 */
     Tk_Window (*tk_IdToWindow) _ANSI_ARGS_((Display * display, Window window)); /* 116 */
     void (*tk_ImageChanged) _ANSI_ARGS_((Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight)); /* 117 */
     int (*tk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 118 */
-    Atom (*tk_InternAtom) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 119 */
+    Atom (*tk_InternAtom) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name)); /* 119 */
     int (*tk_IntersectTextLayout) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y, int width, int height)); /* 120 */
     void (*tk_MaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master, int x, int y, int width, int height)); /* 121 */
     Tk_Window (*tk_MainWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 122 */
@@ -1053,17 +1058,17 @@ typedef struct TkStubs {
     void (*tk_MoveResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height)); /* 127 */
     void (*tk_MoveWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 128 */
     void (*tk_MoveToplevelWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 129 */
-    char * (*tk_NameOf3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 130 */
-    char * (*tk_NameOfAnchor) _ANSI_ARGS_((Tk_Anchor anchor)); /* 131 */
-    char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 132 */
-    char * (*tk_NameOfCapStyle) _ANSI_ARGS_((int cap)); /* 133 */
-    char * (*tk_NameOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 134 */
-    char * (*tk_NameOfCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 135 */
-    char * (*tk_NameOfFont) _ANSI_ARGS_((Tk_Font font)); /* 136 */
-    char * (*tk_NameOfImage) _ANSI_ARGS_((Tk_ImageMaster imageMaster)); /* 137 */
-    char * (*tk_NameOfJoinStyle) _ANSI_ARGS_((int join)); /* 138 */
-    char * (*tk_NameOfJustify) _ANSI_ARGS_((Tk_Justify justify)); /* 139 */
-    char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 140 */
+    CONST84_RETURN char * (*tk_NameOf3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 130 */
+    CONST84_RETURN char * (*tk_NameOfAnchor) _ANSI_ARGS_((Tk_Anchor anchor)); /* 131 */
+    CONST84_RETURN char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 132 */
+    CONST84_RETURN char * (*tk_NameOfCapStyle) _ANSI_ARGS_((int cap)); /* 133 */
+    CONST84_RETURN char * (*tk_NameOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 134 */
+    CONST84_RETURN char * (*tk_NameOfCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 135 */
+    CONST84_RETURN char * (*tk_NameOfFont) _ANSI_ARGS_((Tk_Font font)); /* 136 */
+    CONST84_RETURN char * (*tk_NameOfImage) _ANSI_ARGS_((Tk_ImageMaster imageMaster)); /* 137 */
+    CONST84_RETURN char * (*tk_NameOfJoinStyle) _ANSI_ARGS_((int join)); /* 138 */
+    CONST84_RETURN char * (*tk_NameOfJustify) _ANSI_ARGS_((Tk_Justify justify)); /* 139 */
+    CONST84_RETURN char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 140 */
     Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * pathName, Tk_Window tkwin)); /* 141 */
     void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData)); /* 142 */
     int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, CONST84 char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 143 */
@@ -1083,9 +1088,9 @@ typedef struct TkStubs {
     int (*tk_RestackWindow) _ANSI_ARGS_((Tk_Window tkwin, int aboveBelow, Tk_Window other)); /* 157 */
     Tk_RestrictProc * (*tk_RestrictEvents) _ANSI_ARGS_((Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr)); /* 158 */
     int (*tk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 159 */
-    char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 160 */
+    CONST char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, CONST char * name)); /* 160 */
     void (*tk_SetBackgroundFromBorder) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border)); /* 161 */
-    void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, char * className)); /* 162 */
+    void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, CONST char * className)); /* 162 */
     void (*tk_SetGrid) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight)); /* 163 */
     void (*tk_SetInternalBorder) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 164 */
     void (*tk_SetWindowBackground) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 165 */
@@ -1164,7 +1169,7 @@ typedef struct TkStubs {
     int (*tk_PostscriptPhoto) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoImageBlock * blockPtr, Tk_PostscriptInfo psInfo, int width, int height)); /* 238 */
     void (*tk_CreateClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc * proc)); /* 239 */
     void (*tk_DeleteClientMessageHandler) _ANSI_ARGS_((Tk_ClientMessageProc * proc)); /* 240 */
-    Tk_Window (*tk_CreateAnonymousWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, char * screenName)); /* 241 */
+    Tk_Window (*tk_CreateAnonymousWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window parent, CONST char * screenName)); /* 241 */
     void (*tk_SetClassProcs) _ANSI_ARGS_((Tk_Window tkwin, Tk_ClassProcs * procs, ClientData instanceData)); /* 242 */
     void (*tk_SetInternalBorderEx) _ANSI_ARGS_((Tk_Window tkwin, int left, int right, int top, int bottom)); /* 243 */
     void (*tk_SetMinimumRequestSize) _ANSI_ARGS_((Tk_Window tkwin, int minWidth, int minHeight)); /* 244 */
@@ -1172,10 +1177,10 @@ typedef struct TkStubs {
     void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule)); /* 246 */
     void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((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) _ANSI_ARGS_((Display * display, int collapse)); /* 248 */
-    Tk_StyleEngine (*tk_RegisterStyleEngine) _ANSI_ARGS_((char * name, Tk_StyleEngine parent)); /* 249 */
-    Tk_StyleEngine (*tk_GetStyleEngine) _ANSI_ARGS_((char * name)); /* 250 */
+    Tk_StyleEngine (*tk_RegisterStyleEngine) _ANSI_ARGS_((CONST char * name, Tk_StyleEngine parent)); /* 249 */
+    Tk_StyleEngine (*tk_GetStyleEngine) _ANSI_ARGS_((CONST char * name)); /* 250 */
     int (*tk_RegisterStyledElement) _ANSI_ARGS_((Tk_StyleEngine engine, Tk_ElementSpec * templatePtr)); /* 251 */
-    int (*tk_GetElementId) _ANSI_ARGS_((char * name)); /* 252 */
+    int (*tk_GetElementId) _ANSI_ARGS_((CONST char * name)); /* 252 */
     Tk_Style (*tk_CreateStyle) _ANSI_ARGS_((CONST char * name, Tk_StyleEngine engine, ClientData clientData)); /* 253 */
     Tk_Style (*tk_GetStyle) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 254 */
     void (*tk_FreeStyle) _ANSI_ARGS_((Tk_Style style)); /* 255 */
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index a9bd94e..53e0d60 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkEntry.c,v 1.30 2002/07/25 21:19:01 hobbs Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.31 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -696,8 +696,8 @@ static void		EntrySetValue _ANSI_ARGS_((Entry *entryPtr,
 static void		EntrySelectTo _ANSI_ARGS_((
 			    Entry *entryPtr, int index));
 static char *		EntryTextVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static void		EntryUpdateScrollbar _ANSI_ARGS_((Entry *entryPtr));
 static int		EntryValidate _ANSI_ARGS_((Entry *entryPtr,
 			    char *cmd));
@@ -3288,7 +3288,7 @@ static char *
 EntryTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Not used. */
+    CONST char *name1;		/* Not used. */
     CONST char *name2;		/* Not used. */
     int flags;			/* Information about what happened. */
 {
diff --git a/generic/tkFont.c b/generic/tkFont.c
index a40f981..31d94e5 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFont.c,v 1.18 2002/07/17 14:37:55 dgp Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.19 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -1279,7 +1279,7 @@ SetFontFromAny(interp, objPtr)
  *---------------------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfFont(tkfont)
     Tk_Font tkfont;		/* Font whose name is desired. */
 {
@@ -1550,7 +1550,7 @@ Tk_PostscriptFontName(tkfont, dsPtr)
 				 * corresponds to tkfont will be appended. */
 {
     TkFont *fontPtr;
-    char *family, *weightString, *slantString;
+    Tk_Uid family, weightString, slantString;
     char *src, *dest;
     int upper, len;
 
@@ -2993,7 +2993,7 @@ GetAttributeInfoObj(interp, faPtr, objPtr)
 					 * returned for all options. */
 {
     int i, index, start, end;
-    char *str;
+    CONST char *str;
     Tcl_Obj *optionPtr, *valuePtr, *resultPtr;
 
     resultPtr = Tcl_GetObjResult(interp);
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index ec969d9..d5ed063 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFrame.c,v 1.12 2002/02/19 16:30:26 dkf Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.13 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "default.h"
@@ -484,7 +484,7 @@ CreateFrame(clientData, interp, objc, objv, type, appName)
     Frame *framePtr;
     Tk_OptionTable optionTable;
     Tk_Window new;
-    char *className, *screenName, *visualName, *colormapName, *arg, *useOption;
+    CONST char *className, *screenName, *visualName, *colormapName, *arg, *useOption;
     int i, c, depth;
     size_t length;
     unsigned int mask;
diff --git a/generic/tkGet.c b/generic/tkGet.c
index 95d7a54..4d62c27 100644
--- a/generic/tkGet.c
+++ b/generic/tkGet.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGet.c,v 1.9 2002/04/12 07:44:45 hobbs Exp $
+ * RCS: @(#) $Id: tkGet.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -107,7 +107,7 @@ Tk_GetAnchorFromObj(interp, objPtr, anchorPtr)
 int
 Tk_GetAnchor(interp, string, anchorPtr)
     Tcl_Interp *interp;		/* Use this for error reporting. */
-    char *string;		/* String describing a direction. */
+    CONST char *string;		/* String describing a direction. */
     Tk_Anchor *anchorPtr;	/* Where to store Tk_Anchor corresponding
 				 * to string. */
 {
@@ -181,7 +181,7 @@ Tk_GetAnchor(interp, string, anchorPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfAnchor(anchor)
     Tk_Anchor anchor;		/* Anchor for which identifying string
 				 * is desired. */
@@ -223,7 +223,7 @@ Tk_NameOfAnchor(anchor)
 int
 Tk_GetJoinStyle(interp, string, joinPtr)
     Tcl_Interp *interp;		/* Use this for error reporting. */
-    char *string;		/* String describing a justification style. */
+    CONST char *string;		/* String describing a justification style. */
     int *joinPtr;		/* Where to store join style corresponding
 				 * to string. */
 {
@@ -269,7 +269,7 @@ Tk_GetJoinStyle(interp, string, joinPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfJoinStyle(join)
     int join;			/* Join style for which identifying string
 				 * is desired. */
@@ -305,7 +305,7 @@ Tk_NameOfJoinStyle(join)
 int
 Tk_GetCapStyle(interp, string, capPtr)
     Tcl_Interp *interp;		/* Use this for error reporting. */
-    char *string;		/* String describing a justification style. */
+    CONST char *string;		/* String describing a justification style. */
     int *capPtr;		/* Where to store cap style corresponding
 				 * to string. */
 {
@@ -351,7 +351,7 @@ Tk_GetCapStyle(interp, string, capPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfCapStyle(cap)
     int cap;			/* Cap style for which identifying string
 				 * is desired. */
@@ -424,7 +424,7 @@ Tk_GetJustifyFromObj(interp, objPtr, justifyPtr)
 int
 Tk_GetJustify(interp, string, justifyPtr)
     Tcl_Interp *interp;		/* Use this for error reporting. */
-    char *string;		/* String describing a justification style. */
+    CONST char *string;		/* String describing a justification style. */
     Tk_Justify *justifyPtr;	/* Where to store Tk_Justify corresponding
 				 * to string. */
 {
@@ -470,7 +470,7 @@ Tk_GetJustify(interp, string, justifyPtr)
  *--------------------------------------------------------------
  */
 
-char *
+CONST char *
 Tk_NameOfJustify(justify)
     Tk_Justify justify;		/* Justification style for which
 				 * identifying string is desired. */
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 9934ec6..27f9dde 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrid.c,v 1.23 2002/06/22 09:15:51 hobbs Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.24 2002/08/05 04:30:38 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -900,7 +900,7 @@ GridRowColumnConfigureCommand(tkwin, interp, objc, objv)
 	
 	if (objc == 4) {
 	    int minsize = 0, pad = 0, weight = 0;
-	    char *uniform = NULL;
+	    Tk_Uid uniform = NULL;
 	    Tcl_Obj *res = Tcl_NewListObj(0, NULL);
 	 
 	    if (ok == TCL_OK) {
@@ -968,7 +968,7 @@ GridRowColumnConfigureCommand(tkwin, interp, objc, objv)
 	    }
 	    else if (index == ROWCOL_UNIFORM) {
 		if (objc == 5) {
-		    char *value;
+		    Tk_Uid value;
 		    value = (ok == TCL_OK) ? slotPtr[slot].uniform : "";
 		    if (value == NULL) {
 			value = "";
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 2a2aef8..548be74 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c