Laxative patch: Revert contravariant const qualifiers added by the

previous commit to keep codebase in sync with the Tile extension,
which must remain 8.4 compatible.

13 files changed, 43 insertions, 44 deletions

diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 650fd86..88b2921 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkDecls.h,v 1.11 2010/02/05 17:42:21 nijtmans Exp $
+ * $Id: ttkDecls.h,v 1.12 2010/02/05 21:33:14 jenglish Exp $
  *
  * This file is (mostly) automatically generated from ttk.decls.
  */
@@ -139,7 +139,7 @@ typedef struct TtkStubs {
     int magic;
     int epoch;
     int revision;
-    const struct TtkStubHooks *hooks;
+    struct TtkStubHooks *hooks;
 
     Ttk_Theme (*ttk_GetTheme) (Tcl_Interp *interp, const char *name); /* 0 */
     Ttk_Theme (*ttk_GetDefaultTheme) (Tcl_Interp *interp); /* 1 */
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index 4d3729a..f8ad762 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1,4 +1,4 @@
-/* $Id: ttkDefaultTheme.c,v 1.16 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkDefaultTheme.c,v 1.17 2010/02/05 21:33:14 jenglish Exp $
  *
  * Copyright (c) 2003, Joe English
  *
@@ -682,7 +682,7 @@ typedef struct {
     Tcl_Obj *colorObj;
 } MenubuttonArrowElement;
 
-static const char *const directionStrings[] = {	/* See also: button.c */
+static const char *directionStrings[] = {	/* See also: button.c */
     "above", "below", "left", "right", "flush", NULL
 };
 enum { POST_ABOVE, POST_BELOW, POST_LEFT, POST_RIGHT, POST_FLUSH };
diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl
index 3575847..51c31c3 100644
--- a/generic/ttk/ttkGenStubs.tcl
+++ b/generic/ttk/ttkGenStubs.tcl
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# $Id: ttkGenStubs.tcl,v 1.5 2010/02/05 17:42:21 nijtmans Exp $
+# $Id: ttkGenStubs.tcl,v 1.6 2010/02/05 21:33:14 jenglish Exp $
 #
 # SOURCE: tcl/tools/genStubs.tcl, revision 1.20
 #
@@ -782,7 +782,7 @@ proc genStubs::emitInit {name textVar} {
 	append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n"
 	set sep "    "
 	foreach sub $hooks($name) {
-	    append text $sep "&${sub}ConstStubs"
+	    append text $sep "&${sub}Stubs"
 	    set sep ",\n    "
 	}
 	append text "\n\};\n"
@@ -797,9 +797,9 @@ proc genStubs::emitInit {name textVar} {
     }
 
     if {$root} {
-	append text "\nconst ${capName}Stubs ${name}ConstStubs = \{\n"
+	append text "\nconst ${capName}Stubs ${name}Stubs = \{\n"
     } else {
-	append text "\nstatic const ${capName}Stubs ${name}ConstStubs = \{\n"
+	append text "\nstatic const ${capName}Stubs ${name}Stubs = \{\n"
     }
     append text "    TCL_STUB_MAGIC,\n"
     append text "    ${CAPName}_STUBS_EPOCH,\n"
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index 859c4a8..6f84d9a 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -1,4 +1,4 @@
-/* $Id: ttkImage.c,v 1.9 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkImage.c,v 1.10 2010/02/05 21:33:14 jenglish Exp $
  *	Image specifications and image element factory.
  *
  * Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
@@ -314,7 +314,7 @@ Ttk_CreateImageElement(
     const char *elementName,
     int objc, Tcl_Obj *const objv[])
 {
-    const char *const optionStrings[] =
+    const char *optionStrings[] =
 	 { "-border","-height","-padding","-sticky","-width",NULL };
     enum { O_BORDER, O_HEIGHT, O_PADDING, O_STICKY, O_WIDTH };
 
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index 218faf1..dd7ca3a 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -1,4 +1,4 @@
-/* $Id: ttkInit.c,v 1.11 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkInit.c,v 1.12 2010/02/05 21:33:14 jenglish Exp $
  * Copyright (c) 2003, Joe English
  *
  * Ttk package: initialization routine and miscellaneous utilities.
@@ -13,7 +13,7 @@
  * Legal values for the button -default option.
  * See also: enum Ttk_ButtonDefaultState.
  */
-const char *const ttkDefaultStrings[] = {
+const char *ttkDefaultStrings[] = {
     "normal", "active", "disabled", NULL
 };
 
@@ -29,7 +29,7 @@ int Ttk_GetButtonDefaultStateFromObj(
  * Legal values for the -compound option.
  * See also: enum Ttk_Compound.
  */
-const char *const ttkCompoundStrings[] = {
+const char *ttkCompoundStrings[] = {
     "none", "text", "image", "center",
     "top", "bottom", "left", "right", NULL
 };
@@ -46,7 +46,7 @@ int Ttk_GetCompoundFromObj(
  * Legal values for the -orient option.
  * See also: enum Ttk_Orient.
  */
-const char *const ttkOrientStrings[] = {
+const char *ttkOrientStrings[] = {
     "horizontal", "vertical", NULL
 };
 
@@ -62,7 +62,7 @@ int Ttk_GetOrientFromObj(
  * Recognized values for the -state compatibility option.
  * Other options are accepted and interpreted as synonyms for "normal".
  */
-static const char *const ttkStateStrings[] = {
+static const char *ttkStateStrings[] = {
     "normal", "readonly", "disabled", "active", NULL
 };
 enum { 
@@ -259,7 +259,7 @@ static void RegisterThemes(Tcl_Interp *interp)
  * Ttk initialization.
  */
 
-extern const TtkStubs ttkConstStubs;
+extern const TtkStubs ttkStubs;
 
 MODULE_SCOPE int
 Ttk_Init(Tcl_Interp *interp)
@@ -276,8 +276,7 @@ Ttk_Init(Tcl_Interp *interp)
 
     Ttk_PlatformInit(interp);
 
-    Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL,
-	    (ClientData) &ttkConstStubs);
+    Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (ClientData)&ttkStubs);
 
     return TCL_OK;
 }
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 4085614..e3f6a02 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2003 Joe English.  Freely redistributable.
  *
- * $Id: ttkLayout.c,v 1.17 2010/02/05 17:42:21 nijtmans Exp $
+ * $Id: ttkLayout.c,v 1.18 2010/02/05 21:33:14 jenglish Exp $
  */
 
 #include <string.h>
@@ -605,14 +605,14 @@ Ttk_InstantiateLayout(Ttk_Theme theme, Ttk_TemplateNode *op)
  */
 
 /* NB: This must match bit definitions TTK_PACK_LEFT etc. */
-static const char *const packSideStrings[] =
+static const char *packSideStrings[] =
     { "left", "right", "top", "bottom", NULL };
 
 Ttk_LayoutTemplate Ttk_ParseLayoutTemplate(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
     enum {  OP_SIDE, OP_STICKY, OP_EXPAND, OP_BORDER, OP_UNIT, OP_CHILDREN };
-    static const char *const optStrings[] = {
-	    "-side", "-sticky", "-expand", "-border", "-unit", "-children", 0 };
+    static const char *optStrings[] = {
+	"-side", "-sticky", "-expand", "-border", "-unit", "-children", 0 };
 
     int i = 0, objc;
     Tcl_Obj **objv;
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index e6fdace..9c4d38f 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1,4 +1,4 @@
-/* $Id: ttkNotebook.c,v 1.24 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkNotebook.c,v 1.25 2010/02/05 21:33:14 jenglish Exp $
  * Copyright (c) 2004, Joe English
  */
 
@@ -1046,7 +1046,7 @@ static int NotebookHideCommand(
 static int NotebookIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    static const char *const whatTable[] = { "element", "tab", NULL };
+    static const char *whatTable[] = { "element", "tab", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_TAB };
     int what = IDENTIFY_ELEMENT;
     Notebook *nb = recordPtr;
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 21afebe..e6cfc79 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -1,4 +1,4 @@
-/* $Id: ttkPanedwindow.c,v 1.21 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkPanedwindow.c,v 1.22 2010/02/05 21:33:14 jenglish Exp $
  *
  * Copyright (c) 2005, Joe English.  Freely redistributable.
  *
@@ -713,7 +713,7 @@ static int PanedForgetCommand(
 static int PanedIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    const char *const whatTable[] = { "element", "sash", NULL };
+    const char *whatTable[] = { "element", "sash", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_SASH };
     int what = IDENTIFY_SASH;
     Paned *pw = recordPtr;
diff --git a/generic/ttk/ttkStubInit.c b/generic/ttk/ttkStubInit.c
index 56c7696..4cf4279 100644
--- a/generic/ttk/ttkStubInit.c
+++ b/generic/ttk/ttkStubInit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkStubInit.c,v 1.3 2010/02/05 17:42:21 nijtmans Exp $
+ * $Id: ttkStubInit.c,v 1.4 2010/02/05 21:33:14 jenglish Exp $
  *
  * This file is (mostly) automatically generated from ttk.decls.
  * It is compiled and linked in with the ttk package proper.
@@ -8,11 +8,11 @@
 #include "tk.h"
 #include "ttkTheme.h"
 
-MODULE_SCOPE const TtkStubs ttkConstStubs;
+MODULE_SCOPE const TtkStubs ttkStubs;
 
 /* !BEGIN!: Do not edit below this line. */
 
-const TtkStubs ttkConstStubs = {
+const TtkStubs ttkStubs = {
     TCL_STUB_MAGIC,
     TTK_STUBS_EPOCH,
     TTK_STUBS_REVISION,
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index d0c9174..5bf362d 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.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.
  *
- * $Id: ttkTheme.c,v 1.21 2010/02/05 17:42:21 nijtmans Exp $
+ * $Id: ttkTheme.c,v 1.22 2010/02/05 21:33:14 jenglish Exp $
  */
 
 #include <stdlib.h>
@@ -1372,7 +1372,7 @@ static int StyleThemeCreateCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     StylePackageData *pkgPtr = clientData;
-    static const char *const optStrings[] =
+    static const char *optStrings[] =
     	 { "-parent", "-settings", NULL };
     enum { OP_PARENT, OP_SETTINGS };
     Ttk_Theme parentTheme = pkgPtr->defaultTheme, newTheme;
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index ece8e3a..7fbe6c8 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTreeview.c,v 1.35 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkTreeview.c,v 1.36 2010/02/05 21:33:14 jenglish Exp $
  * Copyright (c) 2004, Joe English
  *
  * ttk::treeview widget implementation.
@@ -321,14 +321,14 @@ static Tk_OptionSpec HeadingOptionSpecs[] = {
 
 #define DEFAULT_SHOW	"tree headings"
 
-static const char *const showStrings[] = {
+static const char *showStrings[] = {
     "tree", "headings", NULL
 };
 
 static int GetEnumSetFromObj(
     Tcl_Interp *interp,
     Tcl_Obj *objPtr,
-    const char *const table[],
+    const char *table[],
     unsigned *resultPtr)
 {
     unsigned result = 0;
@@ -434,7 +434,7 @@ typedef struct {
 #define SCROLLCMD_CHANGED	(USER_MASK<<2)
 #define SHOW_CHANGED 		(USER_MASK<<3)
 
-static const char *const SelectModeStrings[] = { "none", "browse", "extended", NULL };
+static const char *SelectModeStrings[] = { "none", "browse", "extended", NULL };
 
 static Tk_OptionSpec TreeviewOptionSpecs[] = {
     WIDGET_TAKES_FOCUS,
@@ -1506,7 +1506,7 @@ typedef enum {
     REGION_CELL
 } TreeRegion;
 
-static const char *const regionStrings[] = {
+static const char *regionStrings[] = {
     "nothing", "heading", "separator", "tree", "cell", 0
 };
 
@@ -2253,7 +2253,7 @@ done:
 static int TreeviewIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    static const char *const submethodStrings[] =
+    static const char *submethodStrings[] =
 	 { "region", "item", "column", "row", "element", NULL };
     enum { I_REGION, I_ITEM, I_COLUMN, I_ROW, I_ELEMENT };
 
@@ -2910,7 +2910,7 @@ static int TreeviewSelectionCommand(
     enum {
 	SELECTION_SET, SELECTION_ADD, SELECTION_REMOVE, SELECTION_TOGGLE
     };
-    static const char *const selopStrings[] = {
+    static const char *selopStrings[] = {
 	"set", "add", "remove", "toggle", NULL
     };
 
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index dbd88b0..55ab563 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.c,v 1.25 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkWidget.c,v 1.26 2010/02/05 21:33:14 jenglish Exp $
  * Copyright (c) 2003, Joe English
  *
  * Core widget utilities.
@@ -755,7 +755,7 @@ int TtkWidgetIdentifyCommand(
 {
     WidgetCore *corePtr = recordPtr;
     Ttk_Element element;
-    static const char *const whatTable[] = { "element", NULL };
+    static const char *whatTable[] = { "element", NULL };
     int x, y, what;
 
     if (objc < 4 || objc > 5) {
diff --git a/generic/ttk/ttkWidget.h b/generic/ttk/ttkWidget.h
index db15fd7..a5694be 100644
--- a/generic/ttk/ttkWidget.h
+++ b/generic/ttk/ttkWidget.h
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.h,v 1.13 2010/02/05 17:42:21 nijtmans Exp $
+/* $Id: ttkWidget.h,v 1.14 2010/02/05 21:33:14 jenglish Exp $
  * Copyright (c) 2003, Joe English
  * Helper routines for widget implementations.
  */
@@ -240,9 +240,9 @@ MODULE_SCOPE Tk_OptionSpec ttkCoreOptionSpecs[];
  * String tables for widget resource specifications:
  */
 
-MODULE_SCOPE const char *const ttkOrientStrings[];
-MODULE_SCOPE const char *const ttkCompoundStrings[];
-MODULE_SCOPE const char *const ttkDefaultStrings[];
+MODULE_SCOPE const char *ttkOrientStrings[];
+MODULE_SCOPE const char *ttkCompoundStrings[];
+MODULE_SCOPE const char *ttkDefaultStrings[];
 
 /*
  * ... other option types...