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/tkMenubutton.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/tkMenubutton.c')
| -rw-r--r-- | generic/tkMenubutton.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index 32b38b0..d3372cc 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -308,7 +308,7 @@ Tk_MenubuttonObjCmd( ExposureMask|StructureNotifyMask|FocusChangeMask, MenuButtonEventProc, mbPtr); - if (Tk_InitOptions(interp, (char *) mbPtr, optionTable, tkwin) != TCL_OK) { + if (Tk_InitOptions(interp, mbPtr, optionTable, tkwin) != TCL_OK) { Tk_DestroyWindow(mbPtr->tkwin); return TCL_ERROR; } @@ -369,7 +369,7 @@ MenuButtonWidgetObjCmd( goto error; } - objPtr = Tk_GetOptionValue(interp, (char *) mbPtr, + objPtr = Tk_GetOptionValue(interp, mbPtr, mbPtr->optionTable, objv[2], mbPtr->tkwin); if (objPtr == NULL) { goto error; @@ -379,7 +379,7 @@ MenuButtonWidgetObjCmd( case COMMAND_CONFIGURE: if (objc <= 3) { - objPtr = Tk_GetOptionInfo(interp, (char *) mbPtr, + objPtr = Tk_GetOptionInfo(interp, mbPtr, mbPtr->optionTable, (objc == 3) ? objv[2] : NULL, mbPtr->tkwin); if (objPtr == NULL) { @@ -524,7 +524,7 @@ ConfigureMenuButton( * First pass: set options to new values. */ - if (Tk_SetOptions(interp, (char *) mbPtr, + if (Tk_SetOptions(interp, mbPtr, mbPtr->optionTable, objc, objv, mbPtr->tkwin, &savedOptions, NULL) != TCL_OK) { continue; |