diff options
| author | hobbs <hobbs> | 1999-11-23 23:52:13 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-11-23 23:52:13 (GMT) |
| commit | b6cf1cf2288ef3a39ed7ff39ec16deb96f206f9a (patch) | |
| tree | adac85e2547fa56320d1aaeabbc15111a4e44bc5 /generic/tkConfig.c | |
| parent | 44dd355669ae99d29a496731968b72e76305ee2c (diff) | |
| download | tk-b6cf1cf2288ef3a39ed7ff39ec16deb96f206f9a.zip tk-b6cf1cf2288ef3a39ed7ff39ec16deb96f206f9a.tar.gz tk-b6cf1cf2288ef3a39ed7ff39ec16deb96f206f9a.tar.bz2 | |
* generic/tk.h:
* generic/tkConfig.c: added support for TK_OPTION_DONT_SET_DEFAULT
as equiv for TK_CONFIG_DONT_SET_DEFAULT
* generic/tkListbox.c: added TK_OPTION_DONT_SET_DEFAULT to the
item specs
Diffstat (limited to 'generic/tkConfig.c')
| -rw-r--r-- | generic/tkConfig.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 2e02ad0..5ec9203 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.5 1999/04/21 21:53:25 rjohnson Exp $ + * RCS: @(#) $Id: tkConfig.c,v 1.6 1999/11/23 23:52:13 hobbs Exp $ */ /* @@ -480,7 +480,12 @@ Tk_InitOptions(interp, recordPtr, optionTable, tkwin) for (optionPtr = tablePtr->options, count = tablePtr->numOptions; count > 0; optionPtr++, count--) { - if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { + /* + * If we specify TK_OPTION_DONT_SET_DEFAULT, then the user has + * processed and set a default for this already. + */ + if ((optionPtr->specPtr->type == TK_OPTION_SYNONYM) || + (optionPtr->specPtr->flags & TK_OPTION_DONT_SET_DEFAULT)) { continue; } source = TABLE_DEFAULT; @@ -503,7 +508,6 @@ Tk_InitOptions(interp, recordPtr, optionTable, tkwin) /* * Second, check for a system-specific default value. */ - if ((valuePtr == NULL) && (optionPtr->dbNameUID != NULL)) { valuePtr = TkpGetSystemDefault(tkwin, optionPtr->dbNameUID, |