various "const" additions, in line with TIP #27

fix bug #1627732

51 files changed, 163 insertions, 163 deletions

diff --git a/doc/3DBorder.3 b/doc/3DBorder.3
index b122e3b..88829f2 100644
--- a/doc/3DBorder.3
+++ b/doc/3DBorder.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: 3DBorder.3,v 1.6 2005/04/06 21:11:53 dkf Exp $
+'\" RCS: @(#) $Id: 3DBorder.3,v 1.7 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_Alloc3DBorderFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -46,7 +46,7 @@ void
 void
 \fBTk_SetBackgroundFromBorder(\fItkwin, border\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOf3DBorder(\fIborder\fB)\fR
 .sp
 XColor *
diff --git a/doc/AddOption.3 b/doc/AddOption.3
index 2b02622..eccc8f2 100644
--- a/doc/AddOption.3
+++ b/doc/AddOption.3
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\" 
-'\" RCS: @(#) $Id: AddOption.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: AddOption.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 '\"
 .so man.macros
@@ -19,9 +19,9 @@ void
 .SH ARGUMENTS
 .AP Tk_Window tkwin in
 Token for window.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Multi-element name of option.
-.AP "CONST char" *value in
+.AP "const char" *value in
 Value of option.
 .AP int priority in
 Overall priority level to use for option.
diff --git a/doc/BindTable.3 b/doc/BindTable.3
index 8668d64..688fa7f 100644
--- a/doc/BindTable.3
+++ b/doc/BindTable.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: BindTable.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: BindTable.3,v 1.5 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateBindingTable 3 4.0 Tk "Tk Library Procedures"
@@ -27,7 +27,7 @@ unsigned long
 int
 \fBTk_DeleteBinding(\fIinterp, bindingTable, object, eventString\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_GetBinding(\fIinterp, bindingTable, object, eventString\fB)\fR
 .sp
 \fBTk_GetAllBindings(\fIinterp, bindingTable, object\fB)\fR
@@ -45,7 +45,7 @@ Token for binding table;  must have been returned by some previous
 call to \fBTk_CreateBindingTable\fR.
 .AP ClientData object in
 Identifies object with which binding is associated.
-.AP "CONST char" *eventString in
+.AP "const char" *eventString in
 String describing event sequence.
 .AP char *script in
 Tcl script to invoke when binding triggers.
diff --git a/doc/CanvTkwin.3 b/doc/CanvTkwin.3
index 7a35766..efa9125 100644
--- a/doc/CanvTkwin.3
+++ b/doc/CanvTkwin.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: CanvTkwin.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: CanvTkwin.3,v 1.5 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures"
@@ -38,7 +38,7 @@ Tk_OptionPrintProc *\fBTk_CanvasTagsPrintProc\fR;
 A token that identifies a canvas widget.
 .AP Tcl_Interp *interp in/out
 Interpreter to use for error reporting.
-.AP "CONST char" *string in
+.AP "const char" *string in
 Textual description of a canvas coordinate.
 .AP double *doublePtr out
 Points to place to store a converted coordinate.
diff --git a/doc/ConfigWidg.3 b/doc/ConfigWidg.3
index e0b6425..4a1bcda 100644
--- a/doc/ConfigWidg.3
+++ b/doc/ConfigWidg.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ConfigWidg.3,v 1.15 2006/11/15 13:29:17 dkf Exp $
+'\" RCS: @(#) $Id: ConfigWidg.3,v 1.16 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_ConfigureWidget 3 4.1 Tk "Tk Library Procedures"
@@ -37,7 +37,7 @@ Pointer to table specifying legal configuration options for this
 widget.
 .AP int argc in
 Number of arguments in \fIargv\fR.
-.AP "CONST char" **argv in
+.AP "const char" **argv in
 Command-line options for configuring widget.
 .AP char *widgRec in/out
 Points to widget record structure.  Fields in this structure get
@@ -52,7 +52,7 @@ selectively disable entries in \fIspecs\fR.
 The name of the type of a widget record.
 .AP "field name" field in
 The name of a field in records of type \fItype\fR.
-.AP "CONST char" *argvName in
+.AP "const char" *argvName in
 The name used on Tcl command lines to refer to a particular option
 (e.g. when creating a widget or invoking the \fBconfigure\fR widget
 command).  If non-NULL, then information is returned only for this
diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index ed03d54..77fc6c8 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: CrtImgType.3,v 1.9 2005/04/06 21:11:53 dkf Exp $
+'\" RCS: @(#) $Id: CrtImgType.3,v 1.10 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateImageType 3 8.3 Tk "Tk Library Procedures"
@@ -30,7 +30,7 @@ Must be static: a
 pointer to this structure is retained by the image code.
 .AP Tcl_Interp *interp in
 Interpreter in which image was created.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name of existing image.
 .AP Tk_ImageType **typePtrPtr out
 Points to word in which to store a pointer to type information for
@@ -124,7 +124,7 @@ typedef int Tk_ImageCreateProc(
     Tcl_Interp *\fIinterp\fR,
     char *\fIname\fR,
     int \fIobjc\fR,
-    Tcl_Obj *CONST \fIobjv\fR[],
+    Tcl_Obj *const \fIobjv\fR[],
     Tk_ImageType *\fItypePtr\fR,
     Tk_ImageMaster \fImaster\fR,
     ClientData *\fImasterDataPtr\fR);
diff --git a/doc/CrtItemType.3 b/doc/CrtItemType.3
index d83e58e..0922e5a 100644
--- a/doc/CrtItemType.3
+++ b/doc/CrtItemType.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: CrtItemType.3,v 1.9 2005/08/17 06:20:25 georgeps Exp $
+'\" RCS: @(#) $Id: CrtItemType.3,v 1.10 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures"
@@ -186,7 +186,7 @@ typedef int Tk_ItemCreateProc(
     Tk_Canvas \fIcanvas\fR,
     Tk_Item *\fIitemPtr\fR,
     int \fIobjc\fR,
-    Tcl_Obj* CONST \fIobjv\fR[]);
+    Tcl_Obj* const \fIobjv\fR[]);
 .CE
 The \fIinterp\fR argument is the interpreter in which the canvas's
 \fBcreate\fR widget command was invoked, and \fIcanvas\fR is a
@@ -242,7 +242,7 @@ typedef int Tk_ItemConfigureProc(
     Tk_Canvas \fIcanvas\fR,
     Tk_Item *\fIitemPtr\fR,
     int \fIobjc\fR,
-    Tcl_Obj* CONST \fIobjv\fR[],
+    Tcl_Obj* const \fIobjv\fR[],
     int \fIflags\fR);
 .CE
 The \fIinterp\fR objument identifies the interpreter in which the
@@ -277,7 +277,7 @@ typedef int Tk_ItemCoordProc(
     Tk_Canvas \fIcanvas\fR,
     Tk_Item *\fIitemPtr\fR,
     int \fIobjc\fR,
-    Tcl_Obj* CONST \fIobjv\fR[]);
+    Tcl_Obj* const \fIobjv\fR[]);
 .CE
 The arguments \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR
 all have the standard meanings, and \fIobjc\fR and \fIobjv\fR
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index 49cb65e..a0c972b 100644
--- a/doc/CrtPhImgFmt.3
+++ b/doc/CrtPhImgFmt.3
@@ -9,7 +9,7 @@
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
-'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.7 2007/01/05 00:00:49 nijtmans Exp $
 '\"
 .so man.macros
 .TH Tk_CreatePhotoImageFormat 3 8.3 Tk "Tk Library Procedures"
@@ -95,7 +95,7 @@ suitable for reading data in a given file.
 .CS
 typedef int Tk_ImageFileMatchProc(
     Tcl_Channel \fIchan\fR,
-    CONST char *\fIfileName\fR,
+    const char *\fIfileName\fR,
     Tcl_Obj *\fIformat\fR,
     int *\fIwidthPtr\fR,
     int *\fIheightPtr\fR,
@@ -140,7 +140,7 @@ Tk to call to read data from an image file into a photo image.
 typedef int Tk_ImageFileReadProc(
     Tcl_Interp *\fIinterp\fR,
     Tcl_Channel \fIchan\fR,
-    CONST char *\fIfileName\fR,
+    const char *\fIfileName\fR,
     Tcl_Obj *\fIformat\fR,
     PhotoHandle \fIimageHandle\fR,
     int \fIdestX\fR, int \fIdestY\fR,
@@ -196,7 +196,7 @@ Tk to call to write data from a photo image to a file.
 .CS
 typedef int Tk_ImageFileWriteProc(
     Tcl_Interp *\fIinterp\fR,
-    CONST char *\fIfileName\fR,
+    const char *\fIfileName\fR,
     Tcl_Obj *\fIformat\fR,
     Tk_PhotoImageBlock *\fIblockPtr\fR);
 .CE
diff --git a/doc/CrtWindow.3 b/doc/CrtWindow.3
index a7bf3d4..b938c2f 100644
--- a/doc/CrtWindow.3
+++ b/doc/CrtWindow.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: CrtWindow.3,v 1.7 2005/04/06 21:11:53 dkf Exp $
+'\" RCS: @(#) $Id: CrtWindow.3,v 1.8 2007/01/05 00:00:47 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateWindow 3 4.2 Tk "Tk Library Procedures"
@@ -36,10 +36,10 @@ then \fI*interp\fR isn't modified.
 .AP Tk_Window parent in
 Token for the window that is to serve as the logical parent of
 the new window.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name to use for this window.  Must be unique among all children of
 the same \fIparent\fR.
-.AP "CONST char" *topLevScreen in
+.AP "const char" *topLevScreen in
 Has same format as \fIscreenName\fR.  If NULL, then new window is
 created as an internal window.  If non-NULL, new window is created as
 a top-level window on screen \fItopLevScreen\fR.  If \fItopLevScreen\fR
@@ -47,7 +47,7 @@ is an empty string (``'') then new
 window is created as top-level window of \fIparent\fR's screen.
 .AP Tk_Window tkwin in
 Token for window.
-.AP "CONST char" *pathName in
+.AP "const char" *pathName in
 Name of new window, specified as path name within application
 (e.g. \fB.a.b.c\fR).
 .BE
diff --git a/doc/DeleteImg.3 b/doc/DeleteImg.3
index 797b489..2dcf2ed 100644
--- a/doc/DeleteImg.3
+++ b/doc/DeleteImg.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: DeleteImg.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: DeleteImg.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_DeleteImage 3 4.0 Tk "Tk Library Procedures"
@@ -20,7 +20,7 @@ Tk_DeleteImage \- Destroy an image.
 .AS Tcl_Interp *interp
 .AP Tcl_Interp *interp in
 Interpreter for which the image was created.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name of the image.
 .BE
 
diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3
index 1b8387b..8e1b683 100644
--- a/doc/FindPhoto.3
+++ b/doc/FindPhoto.3
@@ -9,7 +9,7 @@
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
-'\" RCS: @(#) $Id: FindPhoto.3,v 1.9 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: FindPhoto.3,v 1.10 2007/01/05 00:00:48 nijtmans Exp $
 '\"
 .so man.macros
 .TH Tk_FindPhoto 3 8.0 Tk "Tk Library Procedures"
@@ -56,7 +56,7 @@ int
 .AP Tcl_Interp *interp in
 Interpreter in which image was created and in which error reporting is
 to be done.
-.AP "CONST char" *imageName in
+.AP "const char" *imageName in
 Name of the photo image.
 .AP Tk_PhotoHandle handle in
 Opaque handle identifying the photo image to be affected.
diff --git a/doc/GetAnchor.3 b/doc/GetAnchor.3
index 6fe0692..b52583f 100644
--- a/doc/GetAnchor.3
+++ b/doc/GetAnchor.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetAnchor.3,v 1.5 2005/04/06 21:11:53 dkf Exp $
+'\" RCS: @(#) $Id: GetAnchor.3,v 1.6 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetAnchorFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -22,7 +22,7 @@ int
 int
 \fBTk_GetAnchor(\fIinterp, string, anchorPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfAnchor(\fIanchor\fB)\fR
 .SH ARGUMENTS
 .AS "Tk_Anchor" *anchorPtr
@@ -32,7 +32,7 @@ Interpreter to use for error reporting, or NULL.
 String value contains name of anchor point: \fBn\fR, \fBne\fR,
 \fBe\fR, \fBse\fR, \fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, or \fBcenter\fR;
 internal rep will be modified to cache corresponding Tk_Anchor.
-.AP "CONST char" *string in
+.AP "const char" *string in
 Same as \fIobjPtr\fR except description of anchor point is passed as
 a string.
 .AP int *anchorPtr out
diff --git a/doc/GetBitmap.3 b/doc/GetBitmap.3
index 9848081..9742785 100644
--- a/doc/GetBitmap.3
+++ b/doc/GetBitmap.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetBitmap.3,v 1.9 2005/06/21 22:58:53 dkf Exp $
+'\" RCS: @(#) $Id: GetBitmap.3,v 1.10 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -28,7 +28,7 @@ Pixmap
 int
 \fBTk_DefineBitmap(\fIinterp, name, source, width, height\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfBitmap(\fIdisplay, bitmap\fB)\fR
 .sp
 \fBTk_SizeOfBitmap(\fIdisplay, bitmap, widthPtr, heightPtr\fB)\fR
@@ -46,12 +46,12 @@ Token for window in which the bitmap will be used.
 .AP Tcl_Obj *objPtr in/out
 String value describes desired bitmap; internal rep will be
 modified to cache pointer to corresponding Pixmap.
-.AP "CONST char" *info in
+.AP "const char" *info in
 Same as \fIobjPtr\fR except description of bitmap is passed as a string and
 resulting Pixmap isn't cached.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name for new bitmap to be defined.
-.AP "CONST char" *source in
+.AP "const char" *source in
 Data for bitmap, in standard bitmap format.
 Must be stored in static memory whose value will never change.
 .AP "int" width in
diff --git a/doc/GetCapStyl.3 b/doc/GetCapStyl.3
index 4cf3b50..e0e04a2 100644
--- a/doc/GetCapStyl.3
+++ b/doc/GetCapStyl.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetCapStyl.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetCapStyl.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetCapStyle 3 "" Tk "Tk Library Procedures"
@@ -19,13 +19,13 @@ Tk_GetCapStyle, Tk_NameOfCapStyle \- translate between strings and cap styles
 int
 \fBTk_GetCapStyle(\fIinterp, string, capPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfCapStyle(\fIcap\fB)\fR
 .SH ARGUMENTS
 .AS "Tcl_Interp" *capPtr
 .AP Tcl_Interp *interp in
 Interpreter to use for error reporting.
-.AP "CONST char" *string in
+.AP "const char" *string in
 String containing name of cap style: one of ```butt'', ``projecting'',
 or ``round''.
 .AP int *capPtr out
diff --git a/doc/GetClrmap.3 b/doc/GetClrmap.3
index ebd08a0..ebdb17f 100644
--- a/doc/GetClrmap.3
+++ b/doc/GetClrmap.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetClrmap.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetClrmap.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetColormap 3 4.0 Tk "Tk Library Procedures"
@@ -26,7 +26,7 @@ Colormap
 Interpreter to use for error reporting.
 .AP Tk_Window tkwin in
 Token for window in which colormap will be used.
-.AP "CONST char" *string in
+.AP "const char" *string in
 Selects a colormap:  either \fBnew\fR or the name of a window
 with the same screen and visual as \fItkwin\fR.
 .AP Display *display in
diff --git a/doc/GetColor.3 b/doc/GetColor.3
index 786dad7..ec1a40b 100644
--- a/doc/GetColor.3
+++ b/doc/GetColor.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetColor.3,v 1.5 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: GetColor.3,v 1.6 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocColorFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -28,7 +28,7 @@ XColor *
 XColor *
 \fBTk_GetColorByValue(\fItkwin, prefPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfColor(\fIcolorPtr\fB)\fR
 .sp
 GC
diff --git a/doc/GetCursor.3 b/doc/GetCursor.3
index 6d3d28d..0b9efb6 100644
--- a/doc/GetCursor.3
+++ b/doc/GetCursor.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetCursor.3,v 1.8 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: GetCursor.3,v 1.9 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocCursorFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -28,7 +28,7 @@ Tk_Cursor
 Tk_Cursor
 \fBTk_GetCursorFromData(\fIinterp, tkwin, source, mask, width, height, xHot, yHot, fg, bg\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfCursor(\fIdisplay, cursor\fB)\fR
 .sp
 \fBTk_FreeCursorFromObj(\fItkwin, objPtr\fB)\fR
@@ -46,9 +46,9 @@ modified to cache pointer to corresponding Tk_Cursor.
 .AP char *name in
 Same as \fIobjPtr\fR except description of cursor is passed as a string and
 resulting Tk_Cursor isn't cached.
-.AP "CONST char" *source in
+.AP "const char" *source in
 Data for cursor cursor, in standard cursor format.
-.AP "CONST char" *mask in
+.AP "const char" *mask in
 Data for mask cursor, in standard cursor format.
 .AP "int" width in
 Width of \fIsource\fR and \fImask\fR.
diff --git a/doc/GetDash.3 b/doc/GetDash.3
index eb6483a..eeaffa8 100644
--- a/doc/GetDash.3
+++ b/doc/GetDash.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetDash.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: GetDash.3,v 1.5 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetDash 3 8.3 Tk "Tk Library Procedures"
@@ -22,7 +22,7 @@ int
 .AS Tk_Dash *dashPtr
 .AP Tcl_Interp *interp in
 Interpreter to use for error reporting.
-.AP "CONST char *" string in
+.AP "const char *" string in
 Textual value to be converted.
 .AP Tk_Dash *dashPtr out
 Points to place to store the dash pattern
diff --git a/doc/GetFont.3 b/doc/GetFont.3
index d344b1e..6d085ce 100644
--- a/doc/GetFont.3
+++ b/doc/GetFont.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetFont.3,v 1.8 2005/11/22 11:59:04 dkf Exp $
+'\" RCS: @(#) $Id: GetFont.3,v 1.9 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocFontFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -25,7 +25,7 @@ Tk_Font
 Tk_Font 
 \fBTk_GetFontFromObj(\fItkwin, objPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfFont(\fItkfont\fB)\fR
 .sp
 Tk_Font 
diff --git a/doc/GetImage.3 b/doc/GetImage.3
index 640db54..32cd2d6 100644
--- a/doc/GetImage.3
+++ b/doc/GetImage.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetImage.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: GetImage.3,v 1.7 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetImage 3 4.0 Tk "Tk Library Procedures"
@@ -30,7 +30,7 @@ Tk_Image
 Place to leave error message.
 .AP Tk_Window tkwin in
 Window in which image will be used.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name of image.
 .AP Tk_ImageChangedProc *changeProc in
 Procedure for Tk to invoke whenever image content or size changes.
diff --git a/doc/GetJoinStl.3 b/doc/GetJoinStl.3
index 1139582..b715424 100644
--- a/doc/GetJoinStl.3
+++ b/doc/GetJoinStl.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetJoinStl.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetJoinStl.3,v 1.4 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetJoinStyle 3 "" Tk "Tk Library Procedures"
@@ -19,13 +19,13 @@ Tk_GetJoinStyle, Tk_NameOfJoinStyle \- translate between strings and join styles
 int
 \fBTk_GetJoinStyle(\fIinterp, string, joinPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfJoinStyle(\fIjoin\fB)\fR
 .SH ARGUMENTS
 .AS "Tcl_Interp" *joinPtr
 .AP Tcl_Interp *interp in
 Interpreter to use for error reporting.
-.AP "CONST char" *string in
+.AP "const char" *string in
 String containing name of join style: one of ``bevel'', ``miter'',
 or ``round''.
 .AP int *joinPtr out
diff --git a/doc/GetJustify.3 b/doc/GetJustify.3
index f4d74af..47df31e 100644
--- a/doc/GetJustify.3
+++ b/doc/GetJustify.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetJustify.3,v 1.5 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: GetJustify.3,v 1.6 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetJustifyFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -22,7 +22,7 @@ int
 int
 \fBTk_GetJustify(\fIinterp, string, justifyPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfJustify(\fIjustify\fB)\fR
 .SH ARGUMENTS
 .AS "Tk_Justify" *justifyPtr
@@ -32,7 +32,7 @@ Interpreter to use for error reporting, or NULL.
 String value contains name of justification style (\fBleft\fR, \fBright\fR, or
 \fBcenter\fR).  The
 internal rep will be modified to cache corresponding justify value.
-.AP "CONST char" *string in
+.AP "const char" *string in
 Same as \fIobjPtr\fR except description of justification style is passed as
 a string.
 .AP int *justifyPtr out
diff --git a/doc/GetOption.3 b/doc/GetOption.3
index 909b044..c321680 100644
--- a/doc/GetOption.3
+++ b/doc/GetOption.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetOption.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetOption.3,v 1.4 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetOption 3 "" Tk "Tk Library Procedures"
@@ -22,9 +22,9 @@ Tk_Uid
 .AS Tk_Window *class
 .AP Tk_Window tkwin in
 Token for window.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name of desired option.
-.AP "CONST char" *class in
+.AP "const char" *class in
 Class of desired option.  Null means there is no class for
 this option;  do lookup based on name only.
 .BE
diff --git a/doc/GetPixels.3 b/doc/GetPixels.3
index 99b8a73..f0d674d 100644
--- a/doc/GetPixels.3
+++ b/doc/GetPixels.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetPixels.3,v 1.5 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: GetPixels.3,v 1.6 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetPixelsFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -37,7 +37,7 @@ units and pixels.
 .AP Tcl_Obj *objPtr in/out
 String value specifies a distance on the screen;
 internal rep will be modified to cache converted distance.
-.AP "CONST char" *string in
+.AP "const char" *string in
 Same as \fIobjPtr\fR except specification of distance is passed as
 a string.
 .AP int *intPtr out
diff --git a/doc/GetRelief.3 b/doc/GetRelief.3
index 94971c5..3ba3b34 100644
--- a/doc/GetRelief.3
+++ b/doc/GetRelief.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetRelief.3,v 1.6 2005/04/06 21:11:54 dkf Exp $
+'\" RCS: @(#) $Id: GetRelief.3,v 1.7 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetReliefFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -22,7 +22,7 @@ int
 int
 \fBTk_GetRelief(\fIinterp, name, reliefPtr\fB)\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfRelief(\fIrelief\fB)\fR
 .SH ARGUMENTS
 .AS "Tcl_Interp" *reliefPtr
@@ -38,7 +38,7 @@ a string.
 .AP int *reliefPtr out
 Pointer to location in which to store relief value corresponding to
 \fIobjPtr\fR or \fIname\fR.
-.AP "CONST char" *name
+.AP "const char" *name
 Name of the relief.
 .AP int relief in
 Relief value (one of \fBTK_RELIEF_FLAT\fR, \fBTK_RELIEF_RAISED\fR,
diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index 96514a4..f9090ef 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetScroll.3,v 1.5 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetScroll.3,v 1.6 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetScrollInfo 3 8.0 Tk "Tk Library Procedures"
@@ -27,13 +27,13 @@ int
 Interpreter to use for error reporting.
 .AP int argc in
 Number of strings in \fIargv\fR array.
-.AP "CONST char" *argv[] in
+.AP "const char" *argv[] in
 Argument strings.  These represent the entire widget command, of
 which the first word is typically the widget name and the second
 word is typically \fBxview\fR or \fByview\fR.
 .AP int objc in
 Number of Tcl_Obj's in \fIobjv\fR array.
-.AP "Tcl_Obj *CONST" objv[] in
+.AP "Tcl_Obj *const" objv[] in
 Argument objects.  These represent the entire widget command, of
 which the first word is typically the widget name and the second
 word is typically \fBxview\fR or \fByview\fR.
diff --git a/doc/GetVisual.3 b/doc/GetVisual.3
index eea3ca4..f4f94c6 100644
--- a/doc/GetVisual.3
+++ b/doc/GetVisual.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: GetVisual.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetVisual.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetVisual 3 4.0 Tk "Tk Library Procedures"
@@ -24,7 +24,7 @@ Visual *
 Interpreter to use for error reporting.
 .AP Tk_Window tkwin in
 Token for window in which the visual will be used.
-.AP "CONST char" *string in
+.AP "const char" *string in
 String that identifies the desired visual.  See below for
 valid formats.
 .AP int *depthPtr out
diff --git a/doc/InternAtom.3 b/doc/InternAtom.3
index 1c1b6aa..fbe62b9 100644
--- a/doc/InternAtom.3
+++ b/doc/InternAtom.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: InternAtom.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: InternAtom.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures"
@@ -19,13 +19,13 @@ Tk_InternAtom, Tk_GetAtomName \- manage cache of X atoms
 Atom
 \fBTk_InternAtom(\fItkwin, name\fR)
 .sp
-CONST char *
+const char *
 \fBTk_GetAtomName(\fItkwin, atom\fR)
 .SH ARGUMENTS
 .AS Tk_Window parent
 .AP Tk_Window tkwin in
 Token for window.  Used to map atom or name relative to a particular display.
-.AP "CONST char" *name in
+.AP "const char" *name in
 String name for which atom is desired.
 .AP Atom atom in
 Atom for which corresponding string name is desired.
diff --git a/doc/Name.3 b/doc/Name.3
index 9357a3b..e6cc727 100644
--- a/doc/Name.3
+++ b/doc/Name.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: Name.3,v 1.4 2004/03/25 12:12:35 vincentdarley Exp $
+'\" RCS: @(#) $Id: Name.3,v 1.5 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_Name 3 "" Tk "Tk Library Procedures"
@@ -30,7 +30,7 @@ Tk_Window
 Token for window.
 .AP Tcl_Interp *interp out
 Interpreter to use for error reporting.
-.AP "CONST char" *pathName in
+.AP "const char" *pathName in
 Character string containing path name of window.
 .BE
 
diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3
index 6de79f2..9553318 100644
--- a/doc/NameOfImg.3
+++ b/doc/NameOfImg.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: NameOfImg.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: NameOfImg.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_NameOfImage 3 4.0 Tk "Tk Library Procedures"
@@ -15,7 +15,7 @@ Tk_NameOfImage \- Return name of image.
 .nf
 \fB#include <tk.h>\fR
 .sp
-CONST char *
+const char *
 \fBTk_NameOfImage\fR(\fItypePtr\fR)
 .SH ARGUMENTS
 .AS Tk_ImageMaster *masterPtr
diff --git a/doc/ParseArgv.3 b/doc/ParseArgv.3
index 7de1ab3..de4feb7 100644
--- a/doc/ParseArgv.3
+++ b/doc/ParseArgv.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ParseArgv.3,v 1.5 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: ParseArgv.3,v 1.6 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_ParseArgv 3 "" Tk "Tk Library Procedures"
@@ -28,7 +28,7 @@ no Tk options will be processed.
 .AP int argcPtr in/out
 Pointer to number of arguments in argv;  gets modified to hold
 number of unprocessed arguments that remain after the call.
-.AP "CONST char" **argv in/out
+.AP "const char" **argv in/out
 Command line arguments passed to main program.  Modified to
 hold unprocessed arguments that remain after the call.
 .AP Tk_ArgvInfo *argTable in
diff --git a/doc/SetAppName.3 b/doc/SetAppName.3
index 17264a9..9a93185 100644
--- a/doc/SetAppName.3
+++ b/doc/SetAppName.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: SetAppName.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: SetAppName.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_SetAppName 3 4.0 Tk "Tk Library Procedures"
@@ -16,14 +16,14 @@ Tk_SetAppName \- Set the name of an application for ``send'' commands
 .nf
 \fB#include <tk.h>\fR
 .sp
-CONST char *
+const char *
 \fBTk_SetAppName\fR(\fItkwin, name\fR)
 .SH ARGUMENTS
 .AS Tk_Window parent
 .AP Tk_Window tkwin in
 Token for window in application.  Used only to select a particular
 application.
-.AP "CONST char" *name in
+.AP "const char" *name in
 Name under which to register the application.
 .BE
 
diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index e178a27..4e94bfc 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: SetOptions.3,v 1.12 2004/11/12 09:03:19 das Exp $
+'\" RCS: @(#) $Id: SetOptions.3,v 1.13 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures"
@@ -41,13 +41,13 @@ Tcl_Obj *
 int
 \fBTk_Offset(\fItype, field\fB)\fR
 .SH ARGUMENTS
-.AS Tk_SavedOptions "*CONST objv[]" in/out
+.AS Tk_SavedOptions "*const objv[]" in/out
 .AP Tcl_Interp *interp in
 A Tcl interpreter.  Most procedures use this only for returning error
 messages; if it is NULL then no error messages are returned.  For
 \fBTk_CreateOptionTable\fR the value cannot be NULL; it gives the
 interpreter in which the option table will be used.
-.AP Tk_OptionSpec *templatePtr in
+.AP "const Tk_OptionSpec" *templatePtr in
 Points to an array of static information that describes the configuration
 options that are supported.  Used to build a Tk_OptionTable.  The information
 pointed to by this argument must exist for the lifetime of the Tk_OptionTable.
@@ -65,7 +65,7 @@ no window-dependent options, then a NULL value may be supplied for
 this argument.
 .AP int objc in
 Number of values in \fIobjv\fR.
-.AP Tcl_Obj "*CONST objv[]" in
+.AP Tcl_Obj "*const objv[]" in
 Command-line arguments for setting configuring options.
 .AP Tk_SavedOptions *savePtr out
 If not NULL, the structure pointed to by this argument is filled
@@ -253,10 +253,10 @@ one configuration option and has the following fields:
 .CS
 typedef struct {
     Tk_OptionType \fItype\fR;
-    char *\fIoptionName\fR;
-    char *\fIdbName\fR;
-    char *\fIdbClass\fR;
-    char *\fIdefValue\fR;
+    const char *\fIoptionName\fR;
+    const char *\fIdbName\fR;
+    const char *\fIdbClass\fR;
+    const char *\fIdefValue\fR;
     int \fIobjOffset\fR;
     int \fIinternalOffset\fR;
     int \fIflags\fR;
diff --git a/doc/TkInitStubs.3 b/doc/TkInitStubs.3
index 124fd6b..4deb307 100644
--- a/doc/TkInitStubs.3
+++ b/doc/TkInitStubs.3
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: TkInitStubs.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
+'\" RCS: @(#) $Id: TkInitStubs.3,v 1.5 2007/01/05 00:00:48 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_InitStubs 3 8.4 Tk "Tk Library Procedures"
@@ -15,7 +15,7 @@ Tk_InitStubs \- initialize the Tk stubs mechanism
 .nf
 \fB#include <tk.h>\fR
 .sp
-CONST char *
+const char *
 \fBTk_InitStubs\fR(\fIinterp, version, exact\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp *interp in
diff --git a/doc/WindowId.3 b/doc/WindowId.3
index b412c21..9c5a2e9 100644
--- a/doc/WindowId.3
+++ b/doc/WindowId.3
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: WindowId.3,v 1.10 2006/10/16 16:28:23 andreas_kupries Exp $
+'\" RCS: @(#) $Id: WindowId.3,v 1.11 2007/01/05 00:00:49 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_WindowId 3 "8.4" Tk "Tk Library Procedures"
@@ -25,7 +25,7 @@ Tk_Window
 Display *
 \fBTk_Display\fR(\fItkwin\fR)
 .sp
-CONST char *
+const char *
 \fBTk_DisplayName\fR(\fItkwin\fR)
 .sp
 int
diff --git a/generic/tk.h b/generic/tk.h
index 6927370..560967a 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.92 2007/01/03 05:06:26 nijtmans Exp $
+ * RCS: @(#) $Id: tk.h,v 1.93 2007/01/05 00:00:50 nijtmans Exp $
  */
 
 #ifndef _TK
@@ -163,11 +163,11 @@ typedef struct Tk_OptionSpec {
     Tk_OptionType type;		/* Type of option, such as TK_OPTION_COLOR;
 				 * see definitions above. Last option in table
 				 * must have type TK_OPTION_END. */
-    char *optionName;		/* Name used to specify option in Tcl
+    const char *optionName; /* Name used to specify option in Tcl
 				 * commands. */
-    char *dbName;		/* Name for option in option database. */
-    char *dbClass;		/* Class for option in database. */
-    char *defValue;		/* Default value for option if not specified
+    const char *dbName;		/* Name for option in option database. */
+    const char *dbClass;		/* Class for option in database. */
+    const char *defValue;		/* Default value for option if not specified
 				 * in command line, the option database, or
 				 * the system. */
     int objOffset;		/* Where in record to store a Tcl_Obj * that
@@ -223,7 +223,7 @@ typedef void (Tk_CustomOptionFreeProc) _ANSI_ARGS_((ClientData clientData,
 	Tk_Window tkwin, char *internalPtr));
 
 typedef struct Tk_ObjCustomOption {
-    char *name;			/* Name of the custom option. */
+    const char *name; /* Name of the custom option. */
     Tk_CustomOptionSetProc *setProc;
 				/* Function to use to set a record's option
 				 * value from a Tcl_Obj */
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 0af1702..8794b47 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.25 2007/01/03 04:10:54 nijtmans Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.26 2007/01/05 00:00:50 nijtmans Exp $
  */
 
 #include "tkButton.h"
@@ -61,7 +61,7 @@ static const char *compoundStrings[] = {
  * separate table for each of the four widget classes.
  */
 
-static const Tk_OptionSpec labelOptionSpecs[] = {
+static Tk_OptionSpec labelOptionSpecs[] = {
     {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground",
 	DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder),
 	0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0},
@@ -146,7 +146,7 @@ static const Tk_OptionSpec labelOptionSpecs[] = {
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0}
 };
 
-static const Tk_OptionSpec buttonOptionSpecs[] = {
+static Tk_OptionSpec buttonOptionSpecs[] = {
     {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground",
 	DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder),
 	0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0},
@@ -247,7 +247,7 @@ static const Tk_OptionSpec buttonOptionSpecs[] = {
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0}
 };
 
-static const Tk_OptionSpec checkbuttonOptionSpecs[] = {
+static Tk_OptionSpec checkbuttonOptionSpecs[] = {
     {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground",
 	DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder),
 	0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0},
@@ -360,7 +360,7 @@ static const Tk_OptionSpec checkbuttonOptionSpecs[] = {
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0}
 };
 
-static const Tk_OptionSpec radiobuttonOptionSpecs[] = {
+static Tk_OptionSpec radiobuttonOptionSpecs[] = {
     {TK_OPTION_BORDER, "-activebackground", "activeBackground", "Foreground",
 	DEF_BUTTON_ACTIVE_BG_COLOR, -1, Tk_Offset(TkButton, activeBorder),
 	0, (ClientData) DEF_BUTTON_ACTIVE_BG_MONO, 0},
@@ -477,7 +477,7 @@ static const Tk_OptionSpec radiobuttonOptionSpecs[] = {
  * such as TYPE_LABEL, to the option template for that class of widgets.
  */
 
-static const Tk_OptionSpec * const optionSpecs[] = {
+static Tk_OptionSpec * const optionSpecs[] = {
     labelOptionSpecs,
     buttonOptionSpecs,
     checkbuttonOptionSpecs,
@@ -490,7 +490,7 @@ static const Tk_OptionSpec * const optionSpecs[] = {
  * enumerated type used to dispatch the widget command.
  */
 
-static CONST char *commandNames[][8] = {
+static const char *commandNames[][8] = {
     {"cget", "configure", NULL},
     {"cget", "configure", "flash", "invoke", NULL},
     {"cget", "configure", "deselect", "flash", "invoke", "select",
@@ -517,7 +517,7 @@ static enum command map[][8] = {
 static void		ButtonCmdDeletedProc(ClientData clientData);
 static int		ButtonCreate(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[], int type);
+			    Tcl_Obj *const objv[], int type);
 static void		ButtonEventProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		ButtonImageProc(ClientData clientData,
@@ -530,16 +530,16 @@ static void		ButtonTristateImageProc(ClientData clientData,
 			    int x, int y, int width, int height,
 			    int imgWidth, int imgHeight);
 static char *		ButtonTextVarProc(ClientData clientData,
-			    Tcl_Interp *interp, CONST char *name1,
-			    CONST char *name2, int flags);
+			    Tcl_Interp *interp, const char *name1,
+			    const char *name2, int flags);
 static char *		ButtonVarProc(ClientData clientData,
-			    Tcl_Interp *interp, CONST char *name1,
-			    CONST char *name2, int flags);
+			    Tcl_Interp *interp, const char *name1,
+			    const char *name2, int flags);
 static int		ButtonWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]);
+			    Tcl_Obj *const objv[]);
 static int		ConfigureButton(Tcl_Interp *interp, TkButton *butPtr,
-			    int objc, Tcl_Obj *CONST objv[]);
+			    int objc, Tcl_Obj *const objv[]);
 static void		DestroyButton(TkButton *butPtr);
 
 /*
@@ -566,7 +566,7 @@ Tk_ButtonObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     return ButtonCreate(clientData, interp, objc, objv, TYPE_BUTTON);
 }
@@ -576,7 +576,7 @@ Tk_CheckbuttonObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     return ButtonCreate(clientData, interp, objc, objv, TYPE_CHECK_BUTTON);
 }
@@ -586,7 +586,7 @@ Tk_LabelObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     return ButtonCreate(clientData, interp, objc, objv, TYPE_LABEL);
 }
@@ -596,7 +596,7 @@ Tk_RadiobuttonObjCmd(
     ClientData clientData,	/* Either NULL or pointer to option table. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     return ButtonCreate(clientData, interp, objc, objv, TYPE_RADIO_BUTTON);
 }
@@ -624,7 +624,7 @@ ButtonCreate(
     ClientData clientData,	/* NULL. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[],	/* Argument values. */
+    Tcl_Obj *const objv[],	/* Argument values. */
     int type)			/* Type of button to create: TYPE_LABEL,
 				 * TYPE_BUTTON, TYPE_CHECK_BUTTON, or
 				 * TYPE_RADIO_BUTTON. */
@@ -780,7 +780,7 @@ ButtonWidgetObjCmd(
     ClientData clientData,	/* Information about button widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     TkButton *butPtr = (TkButton *) clientData;
     int index;
@@ -1029,7 +1029,7 @@ ConfigureButton(
     register TkButton *butPtr,	/* Information about widget;  may or may
 				 * not already have values for some fields. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument values. */
+    Tcl_Obj *const objv[])	/* Argument values. */
 {
     Tk_SavedOptions savedOptions;
     Tcl_Obj *errorResult = NULL;
@@ -1589,8 +1589,8 @@ static char *
 ButtonVarProc(
     ClientData clientData,	/* Information about button. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    CONST char *name1,		/* Name of variable. */
-    CONST char *name2,		/* Second part of variable name. */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     register TkButton *butPtr = (TkButton *) clientData;
@@ -1675,8 +1675,8 @@ static char *
 ButtonTextVarProc(
     ClientData clientData,	/* Information about button. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    CONST char *name1,		/* Not used. */
-    CONST char *name2,		/* Not used. */
+    const char *name1,		/* Not used. */
+    const char *name2,		/* Not used. */
     int flags)			/* Information about what happened. */
 {
     TkButton *butPtr = (TkButton *) clientData;
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c
index 752dc00..27cf963 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.13 2006/05/12 18:17:48 das Exp $
+ * RCS: @(#) $Id: tkCanvWind.c,v 1.14 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #include <stdio.h>
@@ -143,7 +143,7 @@ Tk_ItemType tkWindowType = {
  * geometry manager):
  */
 
-static Tk_GeomMgr canvasGeomType = {
+static const Tk_GeomMgr canvasGeomType = {
     "canvas",				/* name */
     WinItemRequestProc,			/* requestProc */
     WinItemLostSlaveProc,		/* lostSlaveProc */
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index b7cb2bc..b0a591b 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFrame.c,v 1.25 2007/01/03 05:06:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.26 2007/01/05 00:00:50 nijtmans Exp $
  */
 
 #include "default.h"
@@ -340,7 +340,7 @@ static Tk_ClassProcs frameClass = {
  * geometry manager:
  */
 
-static Tk_GeomMgr frameGeomType = {
+static const Tk_GeomMgr frameGeomType = {
     "labelframe",		/* name */
     FrameRequestProc,		/* requestProc */
     FrameLostSlaveProc		/* lostSlaveProc */
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index fa3281b..6d625c0 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.44 2006/04/11 21:52:20 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.45 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -303,7 +303,7 @@ static void		StickyToString(int flags, char *result);
 static int		StringToSticky(char *string);
 static void		Unlink(Gridder *gridPtr);
 
-static Tk_GeomMgr gridMgrType = {
+static const Tk_GeomMgr gridMgrType = {
     "grid",			/* name */
     GridReqProc,		/* requestProc */
     GridLostSlaveProc,		/* lostSlaveProc */
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index 1863c9d..0c726a0 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -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: tkMenu.h,v 1.11 2005/11/27 02:36:14 das Exp $
+ * RCS: @(#) $Id: tkMenu.h,v 1.12 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #ifndef _TKMENU
@@ -546,7 +546,7 @@ MODULE_SCOPE void	TkpDestroyMenu(TkMenu *menuPtr);
 MODULE_SCOPE void	TkpDestroyMenuEntry(TkMenuEntry *mEntryPtr);
 MODULE_SCOPE void	TkpDrawMenuEntry(TkMenuEntry *mePtr,
 			    Drawable d, Tk_Font tkfont,
-			    CONST Tk_FontMetrics *menuMetricsPtr, int x,
+			    const Tk_FontMetrics *menuMetricsPtr, int x,
 			    int y, int width, int height, int strictMotif,
 			    int drawArrow);
 MODULE_SCOPE void	TkpMenuInit(void);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 416d197..67074f7 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPack.c,v 1.24 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.25 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #include "tkPort.h"
@@ -107,7 +107,7 @@ static void		PackReqProc(ClientData clientData, Tk_Window tkwin);
 static void		PackLostSlaveProc(ClientData clientData,
 			    Tk_Window tkwin);
 
-static Tk_GeomMgr packerType = {
+static const Tk_GeomMgr packerType = {
     "pack",			/* name */
     PackReqProc,		/* requestProc */
     PackLostSlaveProc,		/* lostSlaveProc */
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 661e513..283061d 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPanedWindow.c,v 1.26 2007/01/03 05:06:25 nijtmans Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.27 2007/01/05 00:00:50 nijtmans Exp $
  */
 
 #include "tkPort.h"
@@ -244,7 +244,7 @@ static int		PanedWindowIdentifyCoords(PanedWindow *pwPtr,
 #define ValidSashIndex(pwPtr, sash) \
 	(((sash) >= 0) && ((sash) < ((pwPtr)->numSlaves-1)))
 
-static Tk_GeomMgr panedWindowMgrType = {
+static const Tk_GeomMgr panedWindowMgrType = {
     "panedwindow",		/* name */
     PanedWindowReqProc,		/* requestProc */
     PanedWindowLostSlaveProc,	/* lostSlaveProc */
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index e3ec254..9effd23 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlace.c,v 1.19 2007/01/03 05:06:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkPlace.c,v 1.20 2007/01/05 00:00:50 nijtmans Exp $
  */
 
 #include "tkPort.h"
@@ -153,7 +153,7 @@ static void		PlaceRequestProc(ClientData clientData,
 static void		PlaceLostSlaveProc(ClientData clientData,
 			    Tk_Window tkwin);
 
-static Tk_GeomMgr placerType = {
+static const Tk_GeomMgr placerType = {
     "place",				/* name */
     PlaceRequestProc,			/* requestProc */
     PlaceLostSlaveProc,			/* lostSlaveProc */
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index 73d8973..4a577c8 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.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: tkTextWind.c,v 1.18 2007/01/03 05:06:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkTextWind.c,v 1.19 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #include "tk.h"
@@ -28,7 +28,7 @@ static void		EmbWinRequestProc(ClientData clientData,
 static void		EmbWinLostSlaveProc(ClientData clientData,
 			    Tk_Window tkwin);
 
-static Tk_GeomMgr textGeomType = {
+static const Tk_GeomMgr textGeomType = {
     "text",			/* name */
     EmbWinRequestProc,		/* requestProc */
     EmbWinLostSlaveProc,	/* lostSlaveProc */
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index ef276b6..25b6b7d 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.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: tkMacOSXPort.h,v 1.9 2006/09/10 17:06:32 das Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.10 2007/01/05 00:00:51 nijtmans Exp $
  */
 
 #ifndef _TKMACPORT
@@ -119,12 +119,12 @@
  */
 
 #ifndef strcasecmp
-extern int		strcasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2));
+extern int		strcasecmp _ANSI_ARGS_((const char *s1,
+			    const char *s2));
 #endif
 #ifndef strncasecmp			    
-extern int		strncasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2, size_t n));
+extern int		strncasecmp _ANSI_ARGS_((const char *s1,
+			    const char *s2, size_t n));
 #endif
 
 /*
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index c250f92..8d47c4b 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.45 2006/12/01 06:19:24 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.46 2007/01/05 00:00:52 nijtmans Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -57,7 +57,7 @@ static int wmTracing = 0;
 static void		TopLevelReqProc _ANSI_ARGS_((ClientData dummy,
 	Tk_Window tkwin));
 
-static Tk_GeomMgr wmMgrType = {
+static const Tk_GeomMgr wmMgrType = {
     "wm",				/* name */
     TopLevelReqProc,			/* requestProc */
     (Tk_GeomLostSlaveProc *) NULL,	/* lostSlaveProc */
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index 7382dcf..9e45a84 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -50,7 +50,7 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXWm.h,v 1.6 2006/03/24 14:58:01 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.h,v 1.7 2007/01/05 00:00:51 nijtmans Exp $
  */
  
 #ifndef _TKMACWM
@@ -218,7 +218,7 @@ typedef struct TkWmInfo {
     ProtocolHandler *protPtr;	/* First in list of protocol handlers for
 				 * this window (NULL means none). */
     int cmdArgc;		/* Number of elements in cmdArgv below. */
-    CONST char **cmdArgv;		/* Array of strings to store in the
+    const char **cmdArgv;		/* Array of strings to store in the
 				 * WM_COMMAND property.  NULL means nothing
 				 * available. */
     char *clientMachine;	/* String to store in WM_CLIENT_MACHINE
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index dadc5f6..6ee1d0b 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.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: tkUnixWm.c,v 1.53 2006/12/11 13:33:32 dkf Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.54 2007/01/05 00:00:53 nijtmans Exp $
  */
 
 #include "tkPort.h"
@@ -294,12 +294,12 @@ typedef struct TkWmInfo {
 static void		TopLevelReqProc(ClientData dummy, Tk_Window tkwin);
 static void		MenubarReqProc(ClientData clientData, Tk_Window tkwin);
 
-static Tk_GeomMgr wmMgrType = {
+static const Tk_GeomMgr wmMgrType = {
     "wm",				/* name */
     TopLevelReqProc,			/* requestProc */
     NULL,				/* lostSlaveProc */
 };
-static Tk_GeomMgr menubarMgrType = {
+static const Tk_GeomMgr menubarMgrType = {
     "menubar",				/* name */
     MenubarReqProc,			/* requestProc */
     NULL,				/* lostSlaveProc */
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 9b5c36a..1f54c65 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -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: tkWinInt.h,v 1.26 2005/12/02 13:42:29 dkf Exp $
+ * RCS: @(#) $Id: tkWinInt.h,v 1.27 2007/01/05 00:00:52 nijtmans Exp $
  */
 
 #ifndef _TKWININT
@@ -203,7 +203,7 @@ typedef struct TkWinProcs {
 	    UINT Msg, WPARAM wParam, LPARAM lParam);
     LRESULT (WINAPI *defWindowProc)(HWND hWnd, UINT Msg, WPARAM wParam,
 	    LPARAM lParam);
-    ATOM (WINAPI *registerClass)(CONST WNDCLASS *lpWndClass);
+    ATOM (WINAPI *registerClass)(const WNDCLASS *lpWndClass);
     BOOL (WINAPI *setWindowText)(HWND hWnd, LPCTSTR lpString);
     HWND (WINAPI *createWindowEx)(DWORD dwExStyle, LPCTSTR lpClassName,
 	    LPCTSTR lpWindowName, DWORD dwStyle, int x, int y,
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 86360fb..ce53b89 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.110 2006/12/01 19:48:00 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.111 2007/01/05 00:00:52 nijtmans Exp $
  */
 
 #include "tkWinInt.h"
@@ -358,7 +358,7 @@ typedef struct TkWmInfo {
 
 static void		TopLevelReqProc(ClientData dummy, Tk_Window tkwin);
 
-static Tk_GeomMgr wmMgrType = {
+static const Tk_GeomMgr wmMgrType = {
     "wm",			/* name */
     TopLevelReqProc,		/* requestProc */
     NULL,			/* lostSlaveProc */