diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-19 10:29:25 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-19 10:29:25 (GMT) |
commit | 6693fb8816631164cfb8cf78e33030fbceedba5b (patch) | |
tree | 71968a06df024ea74a2bc06c881ffd4d50c04891 /generic/tkScale.c | |
parent | 2765a470e02048d3bd73bf18d4cc7b5191faab0b (diff) | |
parent | 23abd217c7df90a80ee411cfe2090d75942cf750 (diff) | |
download | tk-6693fb8816631164cfb8cf78e33030fbceedba5b.zip tk-6693fb8816631164cfb8cf78e33030fbceedba5b.tar.gz tk-6693fb8816631164cfb8cf78e33030fbceedba5b.tar.bz2 |
SetOptions.3: minor doc fix
make various other tables const
(all backported from Tk 8.6)
Diffstat (limited to 'generic/tkScale.c')
-rw-r--r-- | generic/tkScale.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/generic/tkScale.c b/generic/tkScale.c index 91e04eb..28e5b16 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -26,7 +26,7 @@ * used together with the "enum orient" declaration in tkScale.h. */ -static CONST char *orientStrings[] = { +static const char *const orientStrings[] = { "horizontal", "vertical", NULL }; @@ -35,7 +35,7 @@ static CONST char *orientStrings[] = { * used together with the "enum state" declaration in tkScale.h. */ -static CONST char *stateStrings[] = { +static const char *const stateStrings[] = { "active", "disabled", "normal", NULL }; @@ -140,7 +140,7 @@ static const Tk_OptionSpec optionSpecs[] = { * scale widget command. */ -static CONST char *commandNames[] = { +static const char *commandNames[] = { "cget", "configure", "coords", "get", "identify", "set", NULL }; @@ -156,17 +156,17 @@ enum command { static void ComputeFormat(TkScale *scalePtr); static void ComputeScaleGeometry(TkScale *scalePtr); static int ConfigureScale(Tcl_Interp *interp, TkScale *scalePtr, - int objc, Tcl_Obj *CONST objv[]); + int objc, Tcl_Obj *const objv[]); static void DestroyScale(char *memPtr); static void ScaleCmdDeletedProc(ClientData clientData); static void ScaleEventProc(ClientData clientData, XEvent *eventPtr); static char * ScaleVarProc(ClientData clientData, - Tcl_Interp *interp, CONST char *name1, - CONST char *name2, int flags); + Tcl_Interp *interp, const char *name1, + const char *name2, int flags); static int ScaleWidgetObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, - Tcl_Obj *CONST objv[]); + Tcl_Obj *const objv[]); static void ScaleWorldChanged(ClientData instanceData); static void ScaleSetVariable(TkScale *scalePtr); @@ -202,7 +202,7 @@ Tk_ScaleObjCmd( ClientData clientData, /* NULL. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ - Tcl_Obj *CONST objv[]) /* Argument values. */ + Tcl_Obj *const objv[]) /* Argument values. */ { register TkScale *scalePtr; Tk_OptionTable optionTable; @@ -328,7 +328,7 @@ ScaleWidgetObjCmd( ClientData clientData, /* Information about scale widget. */ Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ - Tcl_Obj *CONST objv[]) /* Argument strings. */ + Tcl_Obj *const objv[]) /* Argument strings. */ { TkScale *scalePtr = (TkScale *) clientData; Tcl_Obj *objPtr; @@ -555,7 +555,7 @@ ConfigureScale( register TkScale *scalePtr, /* Information about widget; may or may not * already have values for some fields. */ int objc, /* Number of valid entries in objv. */ - Tcl_Obj *CONST objv[]) /* Argument values. */ + Tcl_Obj *const objv[]) /* Argument values. */ { Tk_SavedOptions savedOptions; Tcl_Obj *errorResult = NULL; @@ -1171,8 +1171,8 @@ static char * ScaleVarProc( ClientData clientData, /* Information about button. */ Tcl_Interp *interp, /* Interpreter containing variable. */ - CONST char *name1, /* Name of variable. */ - CONST char *name2, /* Second part of variable name. */ + const char *name1, /* Name of variable. */ + const char *name2, /* Second part of variable name. */ int flags) /* Information about what happened. */ { register TkScale *scalePtr = (TkScale *) clientData; |