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/tkFrame.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/tkFrame.c')
| -rw-r--r-- | generic/tkFrame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 1ed3268..53c019c 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -683,7 +683,7 @@ CreateFrame( mask |= ActivateMask; } Tk_CreateEventHandler(newWin, mask, FrameEventProc, framePtr); - if ((Tk_InitOptions(interp, (char *) framePtr, optionTable, newWin) + if ((Tk_InitOptions(interp, framePtr, optionTable, newWin) != TCL_OK) || (ConfigureFrame(interp, framePtr, objc-2, objv+2) != TCL_OK)) { goto error; @@ -764,7 +764,7 @@ FrameWidgetObjCmd( result = TCL_ERROR; goto done; } - objPtr = Tk_GetOptionValue(interp, (char *) framePtr, + objPtr = Tk_GetOptionValue(interp, framePtr, framePtr->optionTable, objv[2], framePtr->tkwin); if (objPtr == NULL) { result = TCL_ERROR; @@ -774,7 +774,7 @@ FrameWidgetObjCmd( break; case FRAME_CONFIGURE: if (objc <= 3) { - objPtr = Tk_GetOptionInfo(interp, (char *) framePtr, + objPtr = Tk_GetOptionInfo(interp, framePtr, framePtr->optionTable, (objc == 3) ? objv[2] : NULL, framePtr->tkwin); if (objPtr == NULL) { @@ -962,7 +962,7 @@ ConfigureFrame( if (framePtr->type == TYPE_LABELFRAME) { oldWindow = labelframePtr->labelWin; } - if (Tk_SetOptions(interp, (char *) framePtr, + if (Tk_SetOptions(interp, framePtr, framePtr->optionTable, objc, objv, framePtr->tkwin, &savedOptions, NULL) != TCL_OK) { if (oldMenuName != NULL) { |