summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2005-08-13 20:47:46 (GMT)
committerchengyemao <chengyemao>2005-08-13 20:47:46 (GMT)
commit7edf7399c55b3292a9a28fcf2c1ac0230cec8dea (patch)
treef787d9d661aa42bf95cd582b2d289e676444acf3 /generic
parent12831af36060c981a4e18f9c4c3a0db8ea9b98ae (diff)
downloadtk-7edf7399c55b3292a9a28fcf2c1ac0230cec8dea.zip
tk-7edf7399c55b3292a9a28fcf2c1ac0230cec8dea.tar.gz
tk-7edf7399c55b3292a9a28fcf2c1ac0230cec8dea.tar.bz2
Fixed bug # 1258604
Diffstat (limited to 'generic')
-rw-r--r--generic/tkOldConfig.c7
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)