diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 19:16:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 19:16:36 (GMT) |
| commit | f2ecf42d53b17282da36e109e89fe2acd1b55c2c (patch) | |
| tree | 0826a66e1f63db518901f5f3a25d9d20457b364c /generic/tkScale.c | |
| parent | d5d5545c57a09377d515cc3a613f42d8c9f07baf (diff) | |
| parent | e7f49c28281e68c1fc9330c7a132f90d3742652a (diff) | |
| download | tk-f2ecf42d53b17282da36e109e89fe2acd1b55c2c.zip tk-f2ecf42d53b17282da36e109e89fe2acd1b55c2c.tar.gz tk-f2ecf42d53b17282da36e109e89fe2acd1b55c2c.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic/tkScale.c')
| -rw-r--r-- | generic/tkScale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkScale.c b/generic/tkScale.c index 10adf2d..ab8c125 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -300,7 +300,7 @@ Tk_ScaleObjCmd( ExposureMask|StructureNotifyMask|FocusChangeMask, ScaleEventProc, scalePtr); - if ((Tk_InitOptions(interp, (char *) scalePtr, optionTable, tkwin) + if ((Tk_InitOptions(interp, scalePtr, optionTable, tkwin) != TCL_OK) || (ConfigureScale(interp, scalePtr, objc - 2, objv + 2) != TCL_OK)) { Tk_DestroyWindow(scalePtr->tkwin); @@ -363,7 +363,7 @@ ScaleWidgetObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "cget option"); goto error; } - objPtr = Tk_GetOptionValue(interp, (char *) scalePtr, + objPtr = Tk_GetOptionValue(interp, scalePtr, scalePtr->optionTable, objv[2], scalePtr->tkwin); if (objPtr == NULL) { goto error; @@ -372,7 +372,7 @@ ScaleWidgetObjCmd( break; case COMMAND_CONFIGURE: if (objc <= 3) { - objPtr = Tk_GetOptionInfo(interp, (char *) scalePtr, + objPtr = Tk_GetOptionInfo(interp, scalePtr, scalePtr->optionTable, (objc == 3) ? objv[2] : NULL, scalePtr->tkwin); if (objPtr == NULL) { @@ -582,7 +582,7 @@ ConfigureScale( * First pass: set options to new values. */ - if (Tk_SetOptions(interp, (char *) scalePtr, + if (Tk_SetOptions(interp, scalePtr, scalePtr->optionTable, objc, objv, scalePtr->tkwin, &savedOptions, NULL) != TCL_OK) { continue; |