diff options
| author | chengyemao <chengyemao@noemail.net> | 2005-08-13 20:47:45 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao@noemail.net> | 2005-08-13 20:47:45 (GMT) |
| commit | b74fe032715a6206e4986aa0d1a769e040b5e25c (patch) | |
| tree | f787d9d661aa42bf95cd582b2d289e676444acf3 /generic | |
| parent | 30ca31551758bab5a8f179310118b8d80150c74a (diff) | |
| download | tk-b74fe032715a6206e4986aa0d1a769e040b5e25c.zip tk-b74fe032715a6206e4986aa0d1a769e040b5e25c.tar.gz tk-b74fe032715a6206e4986aa0d1a769e040b5e25c.tar.bz2 | |
Fixed bug # 1258604
FossilOrigin-Name: b1ede6e3d81614ad7f1a88e239a5c06096dd1e1b
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkOldConfig.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index 87b9d95..5db0faa 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkOldConfig.c,v 1.14 2005/08/12 15:24:07 dkf Exp $ + * RCS: @(#) $Id: tkOldConfig.c,v 1.15 2005/08/13 20:47:46 chengyemao Exp $ */ #include "tkPort.h" @@ -209,7 +209,9 @@ Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) Tcl_AddErrorInfo(interp, msg); return TCL_ERROR; } - specPtr->specFlags |= TK_CONFIG_OPTION_SPECIFIED; + if (!(flags & TK_CONFIG_ARGV_ONLY)) { + specPtr->specFlags |= TK_CONFIG_OPTION_SPECIFIED; + } } /* @@ -223,6 +225,7 @@ Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) if ((specPtr->specFlags & TK_CONFIG_OPTION_SPECIFIED) || (specPtr->argvName == NULL) || (specPtr->type == TK_CONFIG_SYNONYM)) { + specPtr->specFlags &= ~TK_CONFIG_OPTION_SPECIFIED; continue; } if (((specPtr->specFlags & needFlags) != needFlags) |