* cgen-asm.in: Update copyright year.

[pf3gnuchains/pf3gnuchains3x.git] / tk / generic / tkScale.c

diff --git a/tk/generic/tkScale.c b/tk/generic/tkScale.c
index fb88fc3..0b26072 100644 (file)
--- a/tk/generic/tkScale.c
+++ b/tk/generic/tkScale.c
@@ -147,7 +147,7 @@ static Tk_OptionSpec optionSpecs[] = {
  * to dispatch the scale widget command.
  */
 
-static char *commandNames[] = {
+static CONST char *commandNames[] = {
     "cget", "configure", "coords", "get", "identify", "set", (char *) NULL
 };
 
@@ -171,8 +171,8 @@ static void         ScaleCmdDeletedProc _ANSI_ARGS_((
 static void            ScaleEventProc _ANSI_ARGS_((ClientData clientData,
                            XEvent *eventPtr));
 static char *          ScaleVarProc _ANSI_ARGS_((ClientData clientData,
-                           Tcl_Interp *interp, char *name1, char *name2,
-                           int flags));
+                           Tcl_Interp *interp, CONST char *name1,
+                           CONST char *name2, int flags));
 static int             ScaleWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
                            Tcl_Interp *interp, int objc, 
                            Tcl_Obj *CONST objv[]));
@@ -185,10 +185,9 @@ static void                ScaleSetVariable _ANSI_ARGS_((TkScale *scalePtr));
  * that can be invoked from generic window code.
  */
 
-static TkClassProcs scaleClass = {
-    NULL,                      /* createProc. */
-    ScaleWorldChanged,         /* geometryProc. */
-    NULL                       /* modalProc. */
+static Tk_ClassProcs scaleClass = {
+    sizeof(Tk_ClassProcs),     /* size */
+    ScaleWorldChanged,         /* worldChangedProc */
 };
 
 \f
@@ -212,7 +211,7 @@ static TkClassProcs scaleClass = {
 
 int
 Tk_ScaleObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;     /* Either NULL or pointer to option table. */
+    ClientData clientData;     /* NULL. */
     Tcl_Interp *interp;                /* Current interpreter. */
     int objc;                  /* Number of arguments. */
     Tcl_Obj *CONST objv[];     /* Argument values. */
@@ -221,25 +220,6 @@ Tk_ScaleObjCmd(clientData, interp, objc, objv)
     Tk_OptionTable optionTable;
     Tk_Window tkwin;
 
-    optionTable = (Tk_OptionTable) clientData;
-    if (optionTable == NULL) {
-       Tcl_CmdInfo info;
-       char *name;
-
-       /*
-        * We haven't created the option table for this widget class
-        * yet.  Do it now and save the table as the clientData for
-        * the command, so we'll have access to it in future
-        * invocations of the command.
-        */
-
-       optionTable = Tk_CreateOptionTable(interp, optionSpecs);
-       name = Tcl_GetString(objv[0]);
-       Tcl_GetCommandInfo(interp, name, &info);
-       info.objClientData = (ClientData) optionTable;
-       Tcl_SetCommandInfo(interp, name, &info);
-    }
-
     if (objc < 2) {
        Tcl_WrongNumArgs(interp, 1, objv, "pathName ?options?");
        return TCL_ERROR;
@@ -251,6 +231,13 @@ Tk_ScaleObjCmd(clientData, interp, objc, objv)
        return TCL_ERROR;
     }
 
+    /*
+     * Create the option table for this widget class.  If it has already
+     * been created, the cached pointer will be returned.
+     */
+
+    optionTable = Tk_CreateOptionTable(interp, optionSpecs);
+
     Tk_SetClass(tkwin, "Scale");
     scalePtr = TkpCreateScale(tkwin);
 
@@ -314,7 +301,7 @@ Tk_ScaleObjCmd(clientData, interp, objc, objv)
     scalePtr->takeFocusPtr     = NULL;
     scalePtr->flags            = NEVER_SET;
 
-    TkSetClassProcs(scalePtr->tkwin, &scaleClass, (ClientData) scalePtr);
+    Tk_SetClassProcs(scalePtr->tkwin, &scaleClass, (ClientData) scalePtr);
     Tk_CreateEventHandler(scalePtr->tkwin,
            ExposureMask|StructureNotifyMask|FocusChangeMask,
            ScaleEventProc, (ClientData) scalePtr);
@@ -1198,8 +1185,8 @@ static char *
 ScaleVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;     /* Information about button. */
     Tcl_Interp *interp;                /* Interpreter containing variable. */
-    char *name1;               /* Name of variable. */
-    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;