From a46a8df372318c40d2d0c346578eef7412a7b257 Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Thu, 11 Jan 2007 14:49:45 +0000
Subject: Revert addition of contravariant 'const' qualifiers, to keep in sync
 with Tile codebase (which must remain compatible with Tk 8.4).

---
 ChangeLog                    |  7 +++++++
 generic/ttk/ttkButton.c      | 14 +++++++-------
 generic/ttk/ttkEntry.c       |  6 +++---
 generic/ttk/ttkFrame.c       |  8 ++++----
 generic/ttk/ttkManager.h     |  6 +++---
 generic/ttk/ttkNotebook.c    |  8 ++++----
 generic/ttk/ttkPanedwindow.c |  6 +++---
 generic/ttk/ttkProgress.c    |  4 ++--
 generic/ttk/ttkScale.c       |  4 ++--
 generic/ttk/ttkScrollbar.c   |  4 ++--
 generic/ttk/ttkSeparator.c   |  4 ++--
 generic/ttk/ttkSquare.c      |  4 ++--
 generic/ttk/ttkTreeview.c    | 12 ++++++------
 generic/ttk/ttkWidget.h      |  8 ++++----
 14 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c01b5d0..c47ced0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11  Joe English  <jenglish@users.sourceforge.net>
+
+	* generic/ttk/ttkManager.h, generic/ttk/ttk*.c:
+	Revert addition of contravariant 'const' qualifiers,
+	to keep in sync with Tile codebase (which must remain 
+	compatible with Tk 8.4).
+
 2007-01-03  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* doc/ManageGeom.3,
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index a054931..48dcea0 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -1,4 +1,4 @@
-/* $Id: ttkButton.c,v 1.5 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkButton.c,v 1.6 2007/01/11 14:49:46 jenglish Exp $
  * Copyright (c) 2003, Joe English
  *
  * label, button, checkbutton, radiobutton, and menubutton widgets.
@@ -54,7 +54,7 @@ typedef struct
     BasePart	base;
 } Base;
 
-static const Tk_OptionSpec BaseOptionSpecs[] =
+static Tk_OptionSpec BaseOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-text", "text", "Text", "",
 	Tk_Offset(Base,base.textObj), -1, 
@@ -219,7 +219,7 @@ typedef struct
     LabelPart	label;
 } Label;
 
-static const Tk_OptionSpec LabelOptionSpecs[] =
+static Tk_OptionSpec LabelOptionSpecs[] =
 {
     {TK_OPTION_BORDER, "-background", "frameColor", "FrameColor", 
 	NULL, Tk_Offset(Label,label.backgroundObj), -1,
@@ -296,7 +296,7 @@ typedef struct
 /*
  * Option specifications:
  */
-static const Tk_OptionSpec ButtonOptionSpecs[] =
+static Tk_OptionSpec ButtonOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
@@ -401,7 +401,7 @@ typedef struct
 /*
  * Option specifications:
  */
-static const Tk_OptionSpec CheckbuttonOptionSpecs[] =
+static Tk_OptionSpec CheckbuttonOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
@@ -593,7 +593,7 @@ typedef struct
 /*
  * Option specifications:
  */
-static const Tk_OptionSpec RadiobuttonOptionSpecs[] =
+static Tk_OptionSpec RadiobuttonOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
@@ -763,7 +763,7 @@ typedef struct
 static const char *directionStrings[] = {
     "above", "below", "left", "right", "flush", NULL
 };
-static const Tk_OptionSpec MenubuttonOptionSpecs[] =
+static Tk_OptionSpec MenubuttonOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index b2f75ad..1d4d765 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkEntry.c,v 1.5 2007/01/03 05:06:25 nijtmans Exp $
+ * $Id: ttkEntry.c,v 1.6 2007/01/11 14:49:47 jenglish Exp $
  *
  * DERIVED FROM: tk/generic/tkEntry.c r1.35.
  *
@@ -158,7 +158,7 @@ typedef struct
 #define DEF_ENTRY_FONT	"TkTextFont"
 #define DEF_LIST_HEIGHT	"10"
 
-static const Tk_OptionSpec EntryOptionSpecs[] =
+static Tk_OptionSpec EntryOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
@@ -1690,7 +1690,7 @@ typedef struct {
     ComboboxPart combobox;
 } Combobox;
 
-static const Tk_OptionSpec ComboboxOptionSpecs[] =
+static Tk_OptionSpec ComboboxOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-height", "height", "Height",
         DEF_LIST_HEIGHT, Tk_Offset(Combobox, combobox.heightObj), -1,
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c
index b4b8654..ee5259f 100644
--- a/generic/ttk/ttkFrame.c
+++ b/generic/ttk/ttkFrame.c
@@ -1,4 +1,4 @@
-/* $Id: ttkFrame.c,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkFrame.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (c) 2004, Joe English
  *
  * ttk::frame and ttk::labelframe widgets.
@@ -29,7 +29,7 @@ typedef struct
     FramePart	frame;
 } Frame;
 
-static const Tk_OptionSpec FrameOptionSpecs[] =
+static Tk_OptionSpec FrameOptionSpecs[] =
 {
     {TK_OPTION_PIXELS, "-borderwidth", "borderWidth", "BorderWidth", NULL,
 	Tk_Offset(Frame,frame.borderWidthObj), -1,
@@ -250,7 +250,7 @@ typedef struct
 
 #define LABELWIDGET_CHANGED 0x100
 
-static const Tk_OptionSpec LabelframeOptionSpecs[] =
+static Tk_OptionSpec LabelframeOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-labelanchor", "labelAnchor", "LabelAnchor",
 	"nw", Tk_Offset(Labelframe, label.labelAnchorObj),-1,
@@ -480,7 +480,7 @@ static void LabelframeLostSlave(ClientData clientData, Tk_Window slaveWindow)
     Ttk_LostSlaveProc(clientData, slaveWindow);
 }
 
-static const Tk_OptionSpec LabelOptionSpecs[] = {
+static Tk_OptionSpec LabelOptionSpecs[] = {
     {TK_OPTION_END, 0,0,0, NULL, -1,-1, 0, 0,0}
 };
 
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index 5c7fce8..c03c3da 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -1,4 +1,4 @@
-/* $Id: ttkManager.h,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkManager.h,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  *
  * Copyright (c) 2005, Joe English.  Freely redistributable.
  *
@@ -31,7 +31,7 @@ typedef struct TtkSlave_ Ttk_Slave; /* forward */
  */
 typedef struct {			/* Manager hooks */
     Tk_GeomMgr tkGeomMgr;		/* "real" Tk Geometry Manager */
-    const Tk_OptionSpec *slaveOptionSpecs;	/* slave record options */
+    Tk_OptionSpec *slaveOptionSpecs;	/* slave record options */
     size_t slaveSize;			/* size of slave record */
 
     int  (*RequestedSize)(void *managerData, int *widthPtr, int *heightPtr);
@@ -59,7 +59,7 @@ struct TtkSlave_
 
 struct TtkManager_
 {
-    const Ttk_ManagerSpec	*managerSpec;
+    Ttk_ManagerSpec	*managerSpec;
     void 		*managerData;
     Tk_Window   	masterWindow;
     Tk_OptionTable 	slaveOptionTable;
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index de499ce..cd5847e 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1,4 +1,4 @@
-/* $Id: ttkNotebook.c,v 1.5 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkNotebook.c,v 1.6 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (c) 2004, Joe English
  *
  * NOTE-ACTIVE: activeTabIndex is not always correct (it's
@@ -62,7 +62,7 @@ typedef struct
  * PaneOptionSpecs includes additional options for child window placement
  * and is used to configure the slave.
  */
-static const Tk_OptionSpec TabOptionSpecs[] =
+static Tk_OptionSpec TabOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-state", "", "",
 	"normal", -1,Tk_Offset(Tab,state),
@@ -79,7 +79,7 @@ static const Tk_OptionSpec TabOptionSpecs[] =
     {TK_OPTION_END}
 };
 
-static const Tk_OptionSpec PaneOptionSpecs[] =
+static Tk_OptionSpec PaneOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-padding", "padding", "Padding", "0",
 	Tk_Offset(Tab,paddingObj), -1, 0,0,GEOMETRY_CHANGED },
@@ -114,7 +114,7 @@ typedef struct
     NotebookPart notebook;
 } Notebook;
 
-static const Tk_OptionSpec NotebookOptionSpecs[] =
+static Tk_OptionSpec NotebookOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 840f160..ccc376d 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -1,4 +1,4 @@
-/* $Id: ttkPanedwindow.c,v 1.8 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkPanedwindow.c,v 1.9 2007/01/11 14:49:47 jenglish Exp $
  *
  * Copyright (c) 2005, Joe English.  Freely redistributable.
  *
@@ -75,7 +75,7 @@ typedef struct {
 
 /* @@@ NOTE: -orient is readonly 'cause dynamic oriention changes NYI
  */
-static const Tk_OptionSpec PanedOptionSpecs[] = {
+static Tk_OptionSpec PanedOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
 	Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient),
 	0,(ClientData)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
@@ -92,7 +92,7 @@ typedef struct {
     int 	weight; 		/* Pane -weight, for resizing */
 } Pane;
 
-static const Tk_OptionSpec PaneOptionSpecs[] = {
+static Tk_OptionSpec PaneOptionSpecs[] = {
     {TK_OPTION_INT, "-weight", "weight", "Weight", "0",
 	-1,Tk_Offset(Pane,weight), 0,0,GEOMETRY_CHANGED },
     {TK_OPTION_END, 0,0,0, NULL, -1,-1, 0,0,0}
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index 1ae7b57..6d6db8d 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -1,4 +1,4 @@
-/* $Id: ttkProgress.c,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkProgress.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  *
  * Copyright (c) Joe English, Pat Thoyts, Michael Kirkham
  *
@@ -45,7 +45,7 @@ typedef struct {
     ProgressbarPart	progress;
 } Progressbar;
 
-static const Tk_OptionSpec ProgressbarOptionSpecs[] =
+static Tk_OptionSpec ProgressbarOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
 	"horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index 9bb60ce..1f32d13 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -1,4 +1,4 @@
-/* $Id: ttkScale.c,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkScale.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
  *
  * ttk::scale widget.
@@ -43,7 +43,7 @@ typedef struct
     ScalePart  scale;
 } Scale;
 
-static const Tk_OptionSpec ScaleOptionSpecs[] =
+static Tk_OptionSpec ScaleOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 48c62e3..c3be30f 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -1,4 +1,4 @@
-/* $Id: ttkScrollbar.c,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkScrollbar.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (c) 2003, Joe English
  *
  * ttk::scrollbar widget.
@@ -32,7 +32,7 @@ typedef struct
     ScrollbarPart scrollbar;
 } Scrollbar;
 
-static const Tk_OptionSpec ScrollbarOptionSpecs[] =
+static Tk_OptionSpec ScrollbarOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-command", "command", "Command", "",
 	Tk_Offset(Scrollbar,scrollbar.commandObj), -1, 0,0,0},
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c
index 614c92c..000db13 100644
--- a/generic/ttk/ttkSeparator.c
+++ b/generic/ttk/ttkSeparator.c
@@ -1,4 +1,4 @@
-/* $Id: ttkSeparator.c,v 1.4 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkSeparator.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
  *
  * Copyright (c) 2004, Joe English
  *
@@ -24,7 +24,7 @@ typedef struct
     SeparatorPart separator;
 } Separator;
 
-static const Tk_OptionSpec SeparatorOptionSpecs[] =
+static Tk_OptionSpec SeparatorOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	Tk_Offset(Separator,separator.orientObj),
diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c
index 86e4fbf..4f1bd0f 100644
--- a/generic/ttk/ttkSquare.c
+++ b/generic/ttk/ttkSquare.c
@@ -2,7 +2,7 @@
  *
  * Minimal sample ttk widget.
  *
- * $Id: ttkSquare.c,v 1.3 2007/01/03 05:06:25 nijtmans Exp $
+ * $Id: ttkSquare.c,v 1.4 2007/01/11 14:49:47 jenglish Exp $
  */
 
 #include <tk.h>
@@ -50,7 +50,7 @@ typedef struct
  * defined for all widgets.
  */
 
-static const Tk_OptionSpec SquareOptionSpecs[] =
+static Tk_OptionSpec SquareOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 0314b87..07a1b71 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTreeview.c,v 1.11 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkTreeview.c,v 1.12 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (c) 2004, Joe English
  *
  * ttk::treeview widget implementation.
@@ -52,7 +52,7 @@ struct TreeItemRec
     Tcl_Obj	*tagsObj;
 };
 
-static const Tk_OptionSpec ItemOptionSpecs[] =
+static Tk_OptionSpec ItemOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-text", "text", "Text",
 	"", Tk_Offset(TreeItem,textObj), -1,
@@ -174,7 +174,7 @@ typedef struct {
     Tcl_Obj *fontObj;
 } DisplayItem;
 
-static const Tk_OptionSpec TagOptionSpecs[] =
+static Tk_OptionSpec TagOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-text", "text", "Text",
 	NULL, Tk_Offset(DisplayItem,textObj), -1,
@@ -259,7 +259,7 @@ static void FreeColumn(TreeColumn *column)
     /* Don't touch column->data, it's scratch storage */
 }
 
-static const Tk_OptionSpec ColumnOptionSpecs[] =
+static Tk_OptionSpec ColumnOptionSpecs[] =
 {
     {TK_OPTION_INT, "-width", "width", "Width",
 	DEF_COLWIDTH, -1, Tk_Offset(TreeColumn,width),
@@ -279,7 +279,7 @@ static const Tk_OptionSpec ColumnOptionSpecs[] =
     {TK_OPTION_END, 0,0,0, NULL, -1,-1, 0,0,0}
 };
 
-static const Tk_OptionSpec HeadingOptionSpecs[] =
+static Tk_OptionSpec HeadingOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-text", "text", "Text",
 	"", Tk_Offset(TreeColumn,headingObj), -1,
@@ -425,7 +425,7 @@ typedef struct {
 
 static const char *SelectModeStrings[] = { "none", "browse", "extended", NULL };
 
-static const Tk_OptionSpec TreeviewOptionSpecs[] =
+static Tk_OptionSpec TreeviewOptionSpecs[] =
 {
     WIDGET_TAKES_FOCUS,
 
diff --git a/generic/ttk/ttkWidget.h b/generic/ttk/ttkWidget.h
index d5ac472..2049323 100644
--- a/generic/ttk/ttkWidget.h
+++ b/generic/ttk/ttkWidget.h
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.h,v 1.5 2007/01/03 05:06:25 nijtmans Exp $
+/* $Id: ttkWidget.h,v 1.6 2007/01/11 14:49:47 jenglish Exp $
  * Copyright (c) 2003, Joe English
  * Helper routines for widget implementations.
  */
@@ -70,7 +70,7 @@ struct WidgetSpec_
     const char 		*className;	/* Widget class name */
     size_t 		recordSize;	/* #bytes in widget record */
     const Tk_OptionSpec	*optionSpecs;	/* Option specifications */
-    const WidgetCommandSpec	*commands;	/* Widget instance subcommands */
+    const WidgetCommandSpec *commands;	/* Widget instance subcommands */
 
     /*
      * Hooks:
@@ -173,9 +173,9 @@ MODULE_SCOPE void TtkSendVirtualEvent(Tk_Window tgtWin, const char *eventName);
  * Helper routines for data accessor commands:
  */
 MODULE_SCOPE int TtkEnumerateOptions(
-    Tcl_Interp *, void *recordPtr, const Tk_OptionSpec *, Tk_OptionTable, Tk_Window);
+    Tcl_Interp *, void *, const Tk_OptionSpec *, Tk_OptionTable, Tk_Window);
 MODULE_SCOPE int TtkGetOptionValue(
-    Tcl_Interp *, void *recordPtr, Tcl_Obj *optName, Tk_OptionTable, Tk_Window);
+    Tcl_Interp *, void *, Tcl_Obj *optName, Tk_OptionTable, Tk_Window);
 
 /*
  * Helper routines for scrolling widgets (see scroll.c).
-- 
cgit v0.12