summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-18 18:08:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-18 18:08:37 (GMT)
commit95c5b39b2e335c0fc08a25281ad9097a29aee1ae (patch)
treebab392895ed17f917311f2fb0119304a49a10671 /generic
parent15bcec02d97d8789fa796cabdc76859618f22387 (diff)
downloadtk-95c5b39b2e335c0fc08a25281ad9097a29aee1ae.zip
tk-95c5b39b2e335c0fc08a25281ad9097a29aee1ae.tar.gz
tk-95c5b39b2e335c0fc08a25281ad9097a29aee1ae.tar.bz2
make some more internal tables CONST
Diffstat (limited to 'generic')
-rw-r--r--generic/tkArgv.c2
-rw-r--r--generic/tkAtom.c4
-rw-r--r--generic/tkButton.c8
-rw-r--r--generic/tkEntry.c4
-rw-r--r--generic/tkFrame.c6
-rw-r--r--generic/tkImgBmap.c2
-rw-r--r--generic/tkListbox.c4
-rw-r--r--generic/tkMenubutton.c6
-rw-r--r--generic/tkPanedWindow.c2
-rw-r--r--generic/tkPlace.c2
-rw-r--r--generic/tkScale.c4
-rw-r--r--generic/tkTest.c4
12 files changed, 24 insertions, 24 deletions
diff --git a/generic/tkArgv.c b/generic/tkArgv.c
index 4821f41..4ee3b78 100644
--- a/generic/tkArgv.c
+++ b/generic/tkArgv.c
@@ -355,7 +355,7 @@ PrintUsage(interp, argTable, flags)
register Tk_ArgvInfo *infoPtr;
int width, i, numSpaces;
#define NUM_SPACES 20
- static char spaces[] = " ";
+ static CONST char spaces[] = " ";
char tmp[TCL_DOUBLE_SPACE];
/*
diff --git a/generic/tkAtom.c b/generic/tkAtom.c
index f94af81..108e989 100644
--- a/generic/tkAtom.c
+++ b/generic/tkAtom.c
@@ -22,7 +22,7 @@
* They should match those found in xatom.h
*/
-static char * atomNameArray[] = {
+static CONST char *atomNameArray[] = {
"PRIMARY", "SECONDARY", "ARC",
"ATOM", "BITMAP", "CARDINAL",
"COLORMAP", "CURSOR", "CUT_BUFFER0",
@@ -199,7 +199,7 @@ AtomInit(dispPtr)
for (atom = 1; atom <= XA_LAST_PREDEFINED; atom++) {
hPtr = Tcl_FindHashEntry(&dispPtr->atomTable, (char *) atom);
if (hPtr == NULL) {
- char *name;
+ CONST char *name;
int new;
name = atomNameArray[atom - 1];
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 3783985..e844cec 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -25,14 +25,14 @@ static Tcl_ThreadDataKey dataKey;
* in tkButton.h.
*/
-static char *classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"};
+static CONST char *classNames[] = {"Label", "Button", "Checkbutton", "Radiobutton"};
/*
* The following table defines the legal values for the -default option.
* It is used together with the "enum defaultValue" declaration in tkButton.h.
*/
-static char *defaultStrings[] = {
+static CONST char *defaultStrings[] = {
"active", "disabled", "normal", (char *) NULL
};
@@ -41,7 +41,7 @@ static char *defaultStrings[] = {
* It is used together with the "enum state" declaration in tkButton.h.
*/
-static char *stateStrings[] = {
+static CONST char *stateStrings[] = {
"active", "disabled", "normal", (char *) NULL
};
@@ -50,7 +50,7 @@ static char *stateStrings[] = {
* It is used with the "enum compound" declaration in tkButton.h
*/
-static char *compoundStrings[] = {
+static CONST char *compoundStrings[] = {
"bottom", "center", "left", "none", "right", "top", (char *) NULL
};
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index afd6b15..c6eed1b 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -35,7 +35,7 @@
#define DOUBLES_EQ(d1, d2) (fabs((d1) - (d2)) < MIN_DBL_VAL)
-static char *stateStrings[] = {
+static CONST char *stateStrings[] = {
"disabled", "normal", "readonly", (char *) NULL
};
@@ -43,7 +43,7 @@ static char *stateStrings[] = {
* Definitions for -validate option values:
*/
-static char *validateStrings[] = {
+static CONST char *validateStrings[] = {
"all", "key", "focus", "focusin", "focusout", "none", (char *) NULL
};
enum validateType {
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 453ad73..a416b22 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -170,7 +170,7 @@ enum labelanchor {
LABELANCHOR_W, LABELANCHOR_WN, LABELANCHOR_WS
};
-static char *labelAnchorStrings[] = {
+static CONST char *labelAnchorStrings[] = {
"e", "en", "es", "n", "ne", "nw", "s", "se", "sw", "w", "wn", "ws",
(char *) NULL
};
@@ -302,7 +302,7 @@ static Tk_OptionSpec labelframeOptSpec[] = {
* Class names for widgets, indexed by FrameType.
*/
-static char *classNames[] = {"Frame", "Toplevel", "Labelframe"};
+static CONST char *classNames[] = {"Frame", "Toplevel", "Labelframe"};
/*
* The following table maps from FrameType to the option template for
@@ -312,7 +312,7 @@ static char *classNames[] = {"Frame", "Toplevel", "Labelframe"};
static Tk_OptionSpec *optionSpecs[] = {
frameOptSpec,
toplevelOptSpec,
- labelframeOptSpec,
+ labelframeOptSpec
};
/*
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index e1ccecb..2542697 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -1159,7 +1159,7 @@ ImgBmapPsImagemask(interp, width, height, data)
* on the left.) The following array is used to reverse the order of bits
* within a byte so that the bits will be in the order postscript expects.
*/
- static unsigned char bit_reverse[] = {
+ static CONST unsigned char bit_reverse[] = {
0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240,
8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248,
4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244,
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index cc73937..6f8156f 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -210,7 +210,7 @@ enum state {
STATE_DISABLED, STATE_NORMAL
};
-static char *stateStrings[] = {
+static CONST char *stateStrings[] = {
"disabled", "normal", (char *) NULL
};
@@ -218,7 +218,7 @@ enum activeStyle {
ACTIVE_STYLE_DOTBOX, ACTIVE_STYLE_NONE, ACTIVE_STYLE_UNDERLINE
};
-static char *activeStyleStrings[] = {
+static CONST char *activeStyleStrings[] = {
"dotbox", "none", "underline", (char *) NULL
};
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index 8292b32..7e9a11a 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.c
@@ -21,7 +21,7 @@
* in tkMenubutton.h.
*/
-static char *directionStrings[] = {
+static CONST char *directionStrings[] = {
"above", "below", "flush", "left", "right", (char *) NULL
};
@@ -30,7 +30,7 @@ static char *directionStrings[] = {
* It is used together with the "enum state" declaration in tkMenubutton.h.
*/
-static char *stateStrings[] = {
+static CONST char *stateStrings[] = {
"active", "disabled", "normal", (char *) NULL
};
@@ -39,7 +39,7 @@ static char *stateStrings[] = {
* It is used with the "enum compound" declaration in tkMenuButton.h
*/
-static char *compoundStrings[] = {
+static CONST char *compoundStrings[] = {
"bottom", "center", "left", "none", "right", "top", (char *) NULL
};
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 57670ba..09106dd 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -34,7 +34,7 @@
* The following table defines the legal values for the -orient option.
*/
-static char *orientStrings[] = {
+static CONST char *orientStrings[] = {
"horizontal", "vertical", (char *) NULL
};
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index b239947..6178d26 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -26,7 +26,7 @@
* master's actual window size.
*/
-static char *borderModeStrings[] = {
+static CONST char *borderModeStrings[] = {
"inside", "outside", "ignore", (char *) NULL
};
diff --git a/generic/tkScale.c b/generic/tkScale.c
index 676f84b..9b582fe 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -30,7 +30,7 @@
* It is used together with the "enum orient" declaration in tkScale.h.
*/
-static char *orientStrings[] = {
+static CONST char *orientStrings[] = {
"horizontal", "vertical", (char *) NULL
};
@@ -39,7 +39,7 @@ static char *orientStrings[] = {
* It is used together with the "enum state" declaration in tkScale.h.
*/
-static char *stateStrings[] = {
+static CONST char *stateStrings[] = {
"active", "disabled", "normal", (char *) NULL
};
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 0d6657a..fdd70b7 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -717,7 +717,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv)
Tcl_Obj *customPtr;
} TypesRecord;
TypesRecord *recordPtr;
- static char *stringTable[] = {"one", "two", "three", "four",
+ static CONST char *stringTable[] = {"one", "two", "three", "four",
(char *) NULL};
static Tk_OptionSpec typesSpecs[] = {
{TK_OPTION_BOOLEAN,
@@ -1032,7 +1032,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv)
char *custom;
} InternalRecord;
InternalRecord *recordPtr;
- static char *internalStringTable[] = {
+ static CONST char *internalStringTable[] = {
"one", "two", "three", "four", (char *) NULL
};
static Tk_OptionSpec internalSpecs[] = {