diff options
| author | ericm <ericm> | 2000-09-29 17:55:30 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-09-29 17:55:30 (GMT) |
| commit | 95fc05c4b143e413f10ddc9cb14e4d322cca5e94 (patch) | |
| tree | 9bdecb1bdde3ea9cc046f83fc3993dbdf3c089b8 /generic/tkConfig.c | |
| parent | 8d93216489667aad5317c07fc1dcc992b86b5b56 (diff) | |
| download | tk-95fc05c4b143e413f10ddc9cb14e4d322cca5e94.zip tk-95fc05c4b143e413f10ddc9cb14e4d322cca5e94.tar.gz tk-95fc05c4b143e413f10ddc9cb14e4d322cca5e94.tar.bz2 | |
* generic/tkTest.c: Fixed tests to use updated API.
* doc/SetOptions.3:
* generic/tk.h:
* generic/tkConfig.c: Changed interface for Tk_CustomOptionSetProc
and Tk_CustomOptionGetProc; these now take a pointer to the start
of the widget record, and an integer offset to the slot for the
option value, instead of just a pointer to the slot. This allows
more sophisticated options to do interesting things based on other
data in the widget record.
Diffstat (limited to 'generic/tkConfig.c')
| -rw-r--r-- | generic/tkConfig.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 116a271..ad64aaf 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkConfig.c,v 1.11 2000/09/17 21:02:39 ericm Exp $ + * RCS: @(#) $Id: tkConfig.c,v 1.12 2000/09/29 17:55:31 ericm Exp $ */ /* @@ -918,7 +918,8 @@ DoObjConfig(interp, recordPtr, optionPtr, valuePtr, tkwin, savedOptionPtr) case TK_OPTION_CUSTOM: { Tk_ObjCustomOption *custom = optionPtr->extra.custom; if (custom->setProc(custom->clientData, interp, tkwin, - &valuePtr, (char *)internalPtr, (char *)oldInternalPtr, + &valuePtr, recordPtr, optionPtr->specPtr->internalOffset, + (char *)oldInternalPtr, optionPtr->specPtr->flags) != TCL_OK) { return TCL_ERROR; } @@ -1939,7 +1940,8 @@ GetObjectForOption(recordPtr, optionPtr, tkwin) } case TK_OPTION_CUSTOM: { Tk_ObjCustomOption *custom = optionPtr->extra.custom; - objPtr = custom->getProc(custom->clientData, tkwin, internalPtr); + objPtr = custom->getProc(custom->clientData, tkwin, recordPtr, + optionPtr->specPtr->internalOffset); break; } default: { |