summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2005-01-11 16:04:41 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2005-01-11 16:04:41 (GMT)
commitd85af204a9d1f218bd5e67862a9b14031760dfb3 (patch)
treed66b4266d49c64e1910c1a2f64cd655f3f0a75f2
parent5d7eebf8c86c839ebc2f03e4ab8c6ad32a81218d (diff)
downloadtk-d85af204a9d1f218bd5e67862a9b14031760dfb3.zip
tk-d85af204a9d1f218bd5e67862a9b14031760dfb3.tar.gz
tk-d85af204a9d1f218bd5e67862a9b14031760dfb3.tar.bz2
D'oh!
-rw-r--r--generic/tkObj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 8a5acf1..fc5def6 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.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: tkObj.c,v 1.11 2005/01/11 10:35:27 dkf Exp $
+ * RCS: @(#) $Id: tkObj.c,v 1.12 2005/01/11 16:04:41 dkf Exp $
*/
#include "tkInt.h"
@@ -887,7 +887,7 @@ TkParsePadAmount(interp, tkwin, specObj, halfPtr, allPtr)
if (Tcl_ListObjGetElements(interp, specObj, &objc, &objv) != TCL_OK) {
return TCL_ERROR;
}
- if (objc != 1 || objc != 2) {
+ if (objc != 1 && objc != 2) {
Tcl_AppendResult(interp,
"wrong number of parts to pad specification", NULL);
return TCL_ERROR;