summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-04-27 22:38:54 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-04-27 22:38:54 (GMT)
commit4513cb9f431ea8c6b151913a016ec6c75bcac559 (patch)
tree681f7c2354a3726da3ab7da646d316c1275f540d /generic/ttk
parent1876f5f7ee429456ad89540bcf659c092245bf1b (diff)
downloadtk-4513cb9f431ea8c6b151913a016ec6c75bcac559.zip
tk-4513cb9f431ea8c6b151913a016ec6c75bcac559.tar.gz
tk-4513cb9f431ea8c6b151913a016ec6c75bcac559.tar.bz2
Get rid of pre-C89-isms (esp. CONST vs const).
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkButton.c6
-rw-r--r--generic/ttk/ttkImage.c4
-rw-r--r--generic/ttk/ttkInit.c4
-rw-r--r--generic/ttk/ttkNotebook.c20
-rw-r--r--generic/ttk/ttkPanedwindow.c18
-rw-r--r--generic/ttk/ttkProgress.c10
-rw-r--r--generic/ttk/ttkScale.c8
-rw-r--r--generic/ttk/ttkScrollbar.c10
-rw-r--r--generic/ttk/ttkTheme.c30
-rw-r--r--generic/ttk/ttkTrace.c6
-rw-r--r--generic/ttk/ttkTreeview.c6
-rw-r--r--generic/ttk/ttkWidget.c16
12 files changed, 69 insertions, 69 deletions
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index bae3e6a..4d1adcd 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -1,4 +1,4 @@
-/* $Id: ttkButton.c,v 1.8 2007/12/13 15:26:24 dgp Exp $
+/* $Id: ttkButton.c,v 1.9 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2003, Joe English
*
* label, button, checkbutton, radiobutton, and menubutton widgets.
@@ -519,7 +519,7 @@ CheckbuttonPostConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
*/
static int
CheckbuttonInvokeCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Checkbutton *checkPtr = recordPtr;
WidgetCore *corePtr = &checkPtr->core;
@@ -705,7 +705,7 @@ RadiobuttonPostConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
*/
static int
RadiobuttonInvokeCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Radiobutton *radioPtr = recordPtr;
WidgetCore *corePtr = &radioPtr->core;
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index 3dcb379..8c50485 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -1,4 +1,4 @@
-/* $Id: ttkImage.c,v 1.7 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkImage.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
* Image specifications and image element factory.
*
* Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
@@ -312,7 +312,7 @@ Ttk_CreateImageElement(
void *clientData,
Ttk_Theme theme,
const char *elementName,
- int objc, Tcl_Obj *CONST objv[])
+ int objc, Tcl_Obj *const objv[])
{
const char *optionStrings[] =
{ "-border","-height","-padding","-sticky","-width",NULL };
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index c0d930a..76d1768 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -1,4 +1,4 @@
-/* $Id: ttkInit.c,v 1.7 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkInit.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2003, Joe English
*
* Ttk package: initialization routine and miscellaneous utilities.
@@ -46,7 +46,7 @@ int Ttk_GetCompoundFromObj(
* Legal values for the -orient option.
* See also: enum Ttk_Orient.
*/
-CONST char *ttkOrientStrings[] = {
+const char *ttkOrientStrings[] = {
"horizontal", "vertical", NULL
};
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 68fd665..7b10300 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1,4 +1,4 @@
-/* $Id: ttkNotebook.c,v 1.13 2008/01/28 00:36:08 jenglish Exp $
+/* $Id: ttkNotebook.c,v 1.14 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2004, Joe English
*/
@@ -208,7 +208,7 @@ static void DestroyTab(Notebook *nb, Tab *tab)
static int ConfigureTab(
Tcl_Interp *interp, Notebook *nb, Tab *tab, Tk_Window slaveWindow,
- int objc, Tcl_Obj *CONST objv[])
+ int objc, Tcl_Obj *const objv[])
{
Ttk_Sticky sticky = tab->sticky;
Ttk_Padding padding = tab->padding;
@@ -854,7 +854,7 @@ static int GetTabIndex(
/* $nb add window ?options ... ?
*/
static int NotebookAddCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
int index = Ttk_NumberSlaves(nb->notebook.mgr);
@@ -968,7 +968,7 @@ static int NotebookInsertCommand(
* Removes the specified tab.
*/
static int NotebookForgetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
int index;
@@ -992,7 +992,7 @@ static int NotebookForgetCommand(
* Hides the specified tab.
*/
static int NotebookHideCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
int index;
@@ -1022,7 +1022,7 @@ static int NotebookHideCommand(
* Returns name of tab element at $x,$y; empty string if none.
*/
static int NotebookIdentifyCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
Ttk_LayoutNode *node = NULL;
@@ -1065,7 +1065,7 @@ static int NotebookIdentifyCommand(
* See above for valid item formats.
*/
static int NotebookIndexCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
int index, status;
@@ -1097,7 +1097,7 @@ static int NotebookIndexCommand(
* the currently-selected pane.
*/
static int NotebookSelectCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
@@ -1123,7 +1123,7 @@ static int NotebookSelectCommand(
* Return list of tabs.
*/
static int NotebookTabsCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
Ttk_Manager *mgr = nb->notebook.mgr;
@@ -1148,7 +1148,7 @@ static int NotebookTabsCommand(
/* $nb tab $tab ?-option ?value -option value...??
*/
static int NotebookTabCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Notebook *nb = recordPtr;
Ttk_Manager *mgr = nb->notebook.mgr;
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index cac3d20..bd9457c 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -1,4 +1,4 @@
-/* $Id: ttkPanedwindow.c,v 1.14 2008/02/23 17:35:28 jenglish Exp $
+/* $Id: ttkPanedwindow.c,v 1.15 2008/04/27 22:41:12 dkf Exp $
*
* Copyright (c) 2005, Joe English. Freely redistributable.
*
@@ -142,7 +142,7 @@ static void DestroyPane(Paned *pw, Pane *pane)
*/
static int ConfigurePane(
Tcl_Interp *interp, Paned *pw, Pane *pane, Tk_Window slaveWindow,
- int objc, Tcl_Obj *CONST objv[])
+ int objc, Tcl_Obj *const objv[])
{
Ttk_Manager *mgr = pw->paned.mgr;
Tk_SavedOptions savedOptions;
@@ -615,7 +615,7 @@ static void PanedDisplay(void *recordPtr, Drawable d)
/* $pw add window [ options ... ]
*/
static int PanedAddCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
Tk_Window slaveWindow;
@@ -640,7 +640,7 @@ static int PanedAddCommand(
* Insert new slave, or move existing one.
*/
static int PanedInsertCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
int nSlaves = Ttk_NumberSlaves(pw->paned.mgr);
@@ -685,7 +685,7 @@ static int PanedInsertCommand(
/* $pw forget $pane
*/
static int PanedForgetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
int paneIndex;
@@ -709,7 +709,7 @@ static int PanedForgetCommand(
* Return index of sash at $x,$y
*/
static int PanedIdentifyCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
int sashThickness = pw->paned.sashThickness;
@@ -743,7 +743,7 @@ static int PanedIdentifyCommand(
* Query/modify pane options.
*/
static int PanedPaneCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
int paneIndex;
@@ -780,7 +780,7 @@ static int PanedPaneCommand(
* Return list of managed panes.
*/
static int PanedPanesCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
Ttk_Manager *mgr = pw->paned.mgr;
@@ -807,7 +807,7 @@ static int PanedPanesCommand(
* Query or modify sash position.
*/
static int PanedSashposCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Paned *pw = recordPtr;
int sashIndex, position = -1;
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index 6d6db8d..b5883e1 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -1,4 +1,4 @@
-/* $Id: ttkProgress.c,v 1.5 2007/01/11 14:49:47 jenglish Exp $
+/* $Id: ttkProgress.c,v 1.6 2008/04/27 22:41:12 dkf Exp $
*
* Copyright (c) Joe English, Pat Thoyts, Michael Kirkham
*
@@ -399,7 +399,7 @@ static Ttk_Layout ProgressbarGetLayout(
/* $sb step ?amount?
*/
static int ProgressbarStepCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Progressbar *pb = recordPtr;
double value = 0.0, stepAmount = 1.0;
@@ -453,7 +453,7 @@ static int ProgressbarStepCommand(
* and pass to interpreter.
*/
static int ProgressbarStartStopCommand(
- Tcl_Interp *interp, const char *cmdName, int objc, Tcl_Obj *CONST objv[])
+ Tcl_Interp *interp, const char *cmdName, int objc, Tcl_Obj *const objv[])
{
Tcl_Obj *cmd = Tcl_NewListObj(objc, objv);
Tcl_Obj *prefix[2];
@@ -473,14 +473,14 @@ static int ProgressbarStartStopCommand(
}
static int ProgressbarStartCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
return ProgressbarStartStopCommand(
interp, "::ttk::progressbar::start", objc, objv);
}
static int ProgressbarStopCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
return ProgressbarStartStopCommand(
interp, "::ttk::progressbar::stop", objc, objv);
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index 4c8d1eb..68438a2 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -1,4 +1,4 @@
-/* $Id: ttkScale.c,v 1.7 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkScale.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
* Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
*
* ttk::scale widget.
@@ -252,7 +252,7 @@ static double ScaleFraction(Scale *scalePtr, double value)
*/
static int
ScaleGetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scale *scalePtr = recordPtr;
int x, y, r = TCL_OK;
@@ -280,7 +280,7 @@ ScaleGetCommand(
*/
static int
ScaleSetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scale *scalePtr = recordPtr;
double from = 0.0, to = 1.0, value;
@@ -348,7 +348,7 @@ ScaleSetCommand(
static int
ScaleCoordsCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scale *scalePtr = recordPtr;
double value;
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 82bb880..26656f2 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -1,4 +1,4 @@
-/* $Id: ttkScrollbar.c,v 1.7 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkScrollbar.c,v 1.8 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2003, Joe English
*
* ttk::scrollbar widget.
@@ -132,7 +132,7 @@ static void ScrollbarDoLayout(void *recordPtr)
*/
static int
ScrollbarSetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scrollbar *scrollbar = recordPtr;
Tcl_Obj *firstObj, *lastObj;
@@ -183,7 +183,7 @@ ScrollbarSetCommand(
*/
static int
ScrollbarGetCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scrollbar *scrollbar = recordPtr;
Tcl_Obj *result[2];
@@ -206,7 +206,7 @@ ScrollbarGetCommand(
*/
static int
ScrollbarDeltaCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scrollbar *sb = recordPtr;
double dx, dy;
@@ -246,7 +246,7 @@ ScrollbarDeltaCommand(
*/
static int
ScrollbarFractionCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
Scrollbar *sb = recordPtr;
Ttk_Box b = sb->scrollbar.troughBox;
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 598bc34..3439ef0 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.11 2007/12/13 15:26:26 dgp Exp $
+ * $Id: ttkTheme.c,v 1.12 2008/04/27 22:41:12 dkf Exp $
*/
#include <stdlib.h>
@@ -18,7 +18,7 @@
#include "ttkThemeInt.h"
#ifdef NO_PRIVATE_HEADERS
-EXTERN CONST Tk_OptionSpec *TkGetOptionSpec (CONST char *name,
+EXTERN const Tk_OptionSpec *TkGetOptionSpec(const char *name,
Tk_OptionTable optionTable);
#else
#include <tkInt.h>
@@ -832,7 +832,7 @@ int Ttk_RegisterElementFactory(
static int Ttk_CloneElement(
Tcl_Interp *interp, void *clientData,
Ttk_Theme theme, const char *elementName,
- int objc, Tcl_Obj *CONST objv[])
+ int objc, Tcl_Obj *const objv[])
{
Ttk_Theme fromTheme;
ElementImpl *fromElement;
@@ -1183,7 +1183,7 @@ StyleMapCmd(
ClientData clientData, /* Master StylePackageData pointer */
Tcl_Interp *interp, /* Current interpreter */
int objc, /* Number of arguments */
- Tcl_Obj * CONST objv[]) /* Argument objects */
+ Tcl_Obj *const objv[]) /* Argument objects */
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1247,7 +1247,7 @@ usage:
/* + style configure $style -option ?value...
*/
static int StyleConfigureCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1302,7 +1302,7 @@ usage:
/* + style lookup $style -option ?statespec? ?defaultValue?
*/
static int StyleLookupCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1346,7 +1346,7 @@ static int StyleLookupCmd(
/* + style theme create name ?-parent $theme? ?-settings { script }?
*/
static int StyleThemeCreateCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
static const char *optStrings[] =
@@ -1410,7 +1410,7 @@ static int StyleThemeCreateCmd(
* Return list of registered themes.
*/
static int StyleThemeNamesCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = clientData;
return EnumerateHashTable(interp, &pkgPtr->themeTable);
@@ -1426,7 +1426,7 @@ StyleThemeSettingsCmd(
ClientData clientData, /* Master StylePackageData pointer */
Tcl_Interp *interp, /* Current interpreter */
int objc, /* Number of arguments */
- Tcl_Obj * CONST objv[]) /* Argument objects */
+ Tcl_Obj *const objv[]) /* Argument objects */
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme oldTheme = pkgPtr->currentTheme;
@@ -1452,7 +1452,7 @@ StyleThemeSettingsCmd(
/* + style element create name type ? ...args ?
*/
static int StyleElementCreateCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1484,7 +1484,7 @@ static int StyleElementCreateCmd(
* Return a list of elements defined in the current theme.
*/
static int StyleElementNamesCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1500,7 +1500,7 @@ static int StyleElementNamesCmd(
* Return list of element options for specified element
*/
static int StyleElementOptionsCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1536,7 +1536,7 @@ static int StyleElementOptionsCmd(
/* + style layout name ?spec?
*/
static int StyleLayoutCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
StylePackageData *pkgPtr = (StylePackageData *)clientData;
Ttk_Theme theme = pkgPtr->currentTheme;
@@ -1576,7 +1576,7 @@ StyleThemeUseCmd(
ClientData clientData, /* Master StylePackageData pointer */
Tcl_Interp *interp, /* Current interpreter */
int objc, /* Number of arguments */
- Tcl_Obj * CONST objv[]) /* Argument objects */
+ Tcl_Obj *const objv[]) /* Argument objects */
{
StylePackageData *pkgPtr = clientData;
Ttk_Theme theme;
@@ -1635,7 +1635,7 @@ StyleObjCmd(
ClientData clientData, /* Master StylePackageData pointer */
Tcl_Interp *interp, /* Current interpreter */
int objc, /* Number of arguments */
- Tcl_Obj * CONST objv[]) /* Argument objects */
+ Tcl_Obj *const objv[]) /* Argument objects */
{
struct Ensemble *ensemble = StyleEnsemble;
int optPtr = 1;
diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c
index 37a319b..cb2f1c7 100644
--- a/generic/ttk/ttkTrace.c
+++ b/generic/ttk/ttkTrace.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTrace.c,v 1.1 2006/10/31 01:42:26 hobbs Exp $
+/* $Id: ttkTrace.c,v 1.2 2008/04/27 22:41:12 dkf Exp $
*
* Copyright 2003, Joe English
*
@@ -27,8 +27,8 @@ static char *
VarTraceProc(
ClientData clientData, /* Widget record pointer */
Tcl_Interp *interp, /* Interpreter containing variable. */
- CONST char *name1, /* (unused) */
- CONST char *name2, /* (unused) */
+ const char *name1, /* (unused) */
+ const char *name2, /* (unused) */
int flags) /* Information about what happened. */
{
Ttk_TraceHandle *tracePtr = clientData;
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index ad60f4b..95c9a99 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTreeview.c,v 1.23 2007/12/13 15:26:26 dgp Exp $
+/* $Id: ttkTreeview.c,v 1.24 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2004, Joe English
*
* ttk::treeview widget implementation.
@@ -2915,8 +2915,8 @@ static int TreeviewTagBindCommand(
Tcl_SetObjResult(interp, Tcl_NewStringObj(script,-1));
}
} else if (objc == 6) { /* $tv tag bind $tag $sequence $script */
- CONST char *sequence = Tcl_GetString(objv[4]);
- CONST char *script = Tcl_GetString(objv[5]);
+ const char *sequence = Tcl_GetString(objv[4]);
+ const char *script = Tcl_GetString(objv[5]);
unsigned long mask = Tk_CreateBinding(interp,
tv->tree.bindingTable, tag, sequence, script, 0);
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index ae00a32..43c6086 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWidget.c,v 1.11 2008/01/06 22:35:41 jenglish Exp $
+/* $Id: ttkWidget.c,v 1.12 2008/04/27 22:41:12 dkf Exp $
* Copyright (c) 2003, Joe English
*
* Core widget utilities.
@@ -180,7 +180,7 @@ WidgetInstanceObjCmd(
ClientData clientData, /* Widget record pointer */
Tcl_Interp *interp, /* Current interpreter. */
int objc, /* Number of arguments. */
- Tcl_Obj * const objv[]) /* Argument objects. */
+ Tcl_Obj *const objv[]) /* Argument objects. */
{
WidgetCore *corePtr = (WidgetCore *)clientData;
const WidgetCommandSpec *commands = corePtr->widgetSpec->commands;
@@ -345,7 +345,7 @@ static struct Tk_ClassProcs widgetClassProcs = {
* ClientData is a WidgetSpec *.
*/
int TtkWidgetConstructorObjCmd(
- ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+ ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
WidgetSpec *widgetSpec = (WidgetSpec *)clientData;
const char *className = widgetSpec->className;
@@ -594,7 +594,7 @@ int TtkWidgetSize(void *recordPtr, int *widthPtr, int *heightPtr)
/* $w cget -option
*/
int TtkWidgetCgetCommand(
-Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], void *recordPtr)
+Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
WidgetCore *corePtr = recordPtr;
Tcl_Obj *result;
@@ -614,7 +614,7 @@ Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[], void *recordPtr)
/* $w configure ?-option ?value ....??
*/
int TtkWidgetConfigureCommand(
-Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
WidgetCore *corePtr = recordPtr;
Tcl_Obj *result;
@@ -679,7 +679,7 @@ Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
*/
int TtkWidgetStateCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
WidgetCore *corePtr = recordPtr;
Ttk_StateSpec spec;
@@ -719,7 +719,7 @@ int TtkWidgetStateCommand(
*/
int TtkWidgetInstateCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
WidgetCore *corePtr = recordPtr;
Ttk_State state = corePtr->state;
@@ -749,7 +749,7 @@ int TtkWidgetInstateCommand(
* Returns: name of element at $x, $y
*/
int TtkWidgetIdentifyCommand(
- Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], void *recordPtr)
+ Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr)
{
WidgetCore *corePtr = recordPtr;
Ttk_LayoutNode *node;