diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-16 19:40:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-16 19:40:17 (GMT) |
| commit | 9dd1ecf775ca98d0b14666163def8d3571c4e71c (patch) | |
| tree | 8866e3133f28abc632a3bf6833bceef8dd1bda25 /generic/tkButton.c | |
| parent | ff5fec869e2ab1a3ff81745d9ae24f66e90e96fb (diff) | |
| download | tk-9dd1ecf775ca98d0b14666163def8d3571c4e71c.zip tk-9dd1ecf775ca98d0b14666163def8d3571c4e71c.tar.gz tk-9dd1ecf775ca98d0b14666163def8d3571c4e71c.tar.bz2 | |
Change char *recordPtr to void *recordPtr in Tk_SetOptions() and friends. This is 100% upwards compatible, and equivalent to TIP #494 done in Tcl. With this, a ton of (char *) type casts can be eliminated
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index fc2c7ec..ddc267d 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -749,7 +749,7 @@ ButtonCreate( ExposureMask|StructureNotifyMask|FocusChangeMask, ButtonEventProc, butPtr); - if (Tk_InitOptions(interp, (char *) butPtr, optionTable, tkwin) + if (Tk_InitOptions(interp, butPtr, optionTable, tkwin) != TCL_OK) { Tk_DestroyWindow(butPtr->tkwin); return TCL_ERROR; @@ -810,7 +810,7 @@ ButtonWidgetObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "cget option"); goto error; } - objPtr = Tk_GetOptionValue(interp, (char *) butPtr, + objPtr = Tk_GetOptionValue(interp, butPtr, butPtr->optionTable, objv[2], butPtr->tkwin); if (objPtr == NULL) { goto error; @@ -820,7 +820,7 @@ ButtonWidgetObjCmd( case COMMAND_CONFIGURE: if (objc <= 3) { - objPtr = Tk_GetOptionInfo(interp, (char *) butPtr, + objPtr = Tk_GetOptionInfo(interp, butPtr, butPtr->optionTable, (objc == 3) ? objv[2] : NULL, butPtr->tkwin); if (objPtr == NULL) { @@ -1068,7 +1068,7 @@ ConfigureButton( * First pass: set options to new values. */ - if (Tk_SetOptions(interp, (char *) butPtr, + if (Tk_SetOptions(interp, butPtr, butPtr->optionTable, objc, objv, butPtr->tkwin, &savedOptions, NULL) != TCL_OK) { continue; |