diff options
author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-19 09:55:18 (GMT) |
---|---|---|
committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-19 09:55:18 (GMT) |
commit | 54873af19f269ce0bf55cb91d31e0ff4aa43eb29 (patch) | |
tree | 047c7883c2e3add51b74078a8e69f0012cc4645c /generic/tkTest.c | |
parent | 67fbe2530b1f554399831b61f7d03ab1ef722ef7 (diff) | |
download | tk-54873af19f269ce0bf55cb91d31e0ff4aa43eb29.zip tk-54873af19f269ce0bf55cb91d31e0ff4aa43eb29.tar.gz tk-54873af19f269ce0bf55cb91d31e0ff4aa43eb29.tar.bz2 |
SetOptions.3: minor doc fix
make various other tables CONST
(All backported from Tk 8.6)
Diffstat (limited to 'generic/tkTest.c')
-rw-r--r-- | generic/tkTest.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/generic/tkTest.c b/generic/tkTest.c index fdd70b7..6cb776c 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -649,7 +649,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) * created by commands below; indexed * with same values as "options" * array. */ - static Tk_ObjCustomOption CustomOption = { + static CONST Tk_ObjCustomOption CustomOption = { "custom option", CustomOptionSet, CustomOptionGet, @@ -674,7 +674,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *extension4ObjPtr; Tcl_Obj *extension5ObjPtr; } ExtensionWidgetRecord; - static Tk_OptionSpec baseSpecs[] = { + static CONST Tk_OptionSpec baseSpecs[] = { {TK_OPTION_STRING, "-one", "one", "One", "one", Tk_Offset(ExtensionWidgetRecord, base1ObjPtr), -1}, @@ -717,9 +717,9 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *customPtr; } TypesRecord; TypesRecord *recordPtr; - static CONST char *stringTable[] = {"one", "two", "three", "four", + static CONST char *CONST stringTable[] = {"one", "two", "three", "four", (char *) NULL}; - static Tk_OptionSpec typesSpecs[] = { + static CONST Tk_OptionSpec typesSpecs[] = { {TK_OPTION_BOOLEAN, "-boolean", "boolean", "Boolean", "1", Tk_Offset(TypesRecord, booleanPtr), -1, 0, 0, 0x1}, @@ -893,7 +893,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) case CHAIN2: { ExtensionWidgetRecord *recordPtr; - static Tk_OptionSpec extensionSpecs[] = { + static CONST Tk_OptionSpec extensionSpecs[] = { {TK_OPTION_STRING, "-three", "three", "Three", "three", Tk_Offset(ExtensionWidgetRecord, extension3ObjPtr), @@ -961,7 +961,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *intPtr; } ErrorWidgetRecord; ErrorWidgetRecord widgetRecord; - static Tk_OptionSpec errorSpecs[] = { + static CONST Tk_OptionSpec errorSpecs[] = { {TK_OPTION_INT, "-int", "integer", "Integer", "bogus", Tk_Offset(ErrorWidgetRecord, intPtr)}, @@ -1035,7 +1035,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) static CONST char *internalStringTable[] = { "one", "two", "three", "four", (char *) NULL }; - static Tk_OptionSpec internalSpecs[] = { + static CONST Tk_OptionSpec internalSpecs[] = { {TK_OPTION_BOOLEAN, "-boolean", "boolean", "Boolean", "1", -1, Tk_Offset(InternalRecord, boolean), 0, 0, 0x1}, @@ -1173,7 +1173,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *five; } FiveRecord; FiveRecord *recordPtr; - static Tk_OptionSpec smallSpecs[] = { + static CONST Tk_OptionSpec smallSpecs[] = { {TK_OPTION_INT, "-one", "one", "One", "1", @@ -1239,7 +1239,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *fooObjPtr; } NotEnoughRecord; NotEnoughRecord record; - static Tk_OptionSpec errorSpecs[] = { + static CONST Tk_OptionSpec errorSpecs[] = { {TK_OPTION_INT, "-foo", "foo", "Foo", "0", Tk_Offset(NotEnoughRecord, fooObjPtr)}, @@ -1274,7 +1274,7 @@ TestobjconfigObjCmd(clientData, interp, objc, objv) Tcl_Obj *windowPtr; } SlaveRecord; SlaveRecord *recordPtr; - static Tk_OptionSpec slaveSpecs[] = { + static CONST Tk_OptionSpec slaveSpecs[] = { {TK_OPTION_WINDOW, "-window", "window", "Window", ".bar", Tk_Offset(SlaveRecord, windowPtr), -1, |