summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2005-01-11 16:05:16 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2005-01-11 16:05:16 (GMT)
commit4bd0947922542ea8c415eb4e3e6fef44466b10f3 (patch)
treeae5fdff216e2de06fe0d143f4f42af0ca71f0b36
parent7f904663bfc071c81f1aaed74a580775ea3235db (diff)
downloadtk-4bd0947922542ea8c415eb4e3e6fef44466b10f3.zip
tk-4bd0947922542ea8c415eb4e3e6fef44466b10f3.tar.gz
tk-4bd0947922542ea8c415eb4e3e6fef44466b10f3.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 92d9443..83faa27 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.8.2.1 2005/01/11 10:46:39 dkf Exp $
+ * RCS: @(#) $Id: tkObj.c,v 1.8.2.2 2005/01/11 16:05:16 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;