diff options
Diffstat (limited to 'generic/tkCanvWind.c')
| -rw-r--r-- | generic/tkCanvWind.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c index b82efa1..a820163 100644 --- a/generic/tkCanvWind.c +++ b/generic/tkCanvWind.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: tkCanvWind.c,v 1.8 2002/10/10 07:25:24 hobbs Exp $ + * RCS: @(#) $Id: tkCanvWind.c,v 1.9 2003/02/09 07:48:22 hobbs Exp $ */ #include <stdio.h> @@ -184,23 +184,10 @@ CreateWinItem(interp, canvas, itemPtr, objc, objv) Tcl_Obj *CONST objv[]; /* Arguments describing window. */ { WindowItem *winItemPtr = (WindowItem *) itemPtr; - int i = 2; + int i; - if (objc == 1) { - i = 1; - } else if (objc > 1) { - char *arg = Tcl_GetString(objv[1]); - if ((arg[0] == '-') && (arg[1] >= 'a') && (arg[1] <= 'z')) { - i = 1; - } - } - - if (objc < i) { - Tcl_AppendResult(interp, "wrong # args: should be \"", - Tk_PathName(Tk_CanvasTkwin(canvas)), " create ", - itemPtr->typePtr->name, " x y ?options?\"", - (char *) NULL); - return TCL_ERROR; + if (objc == 0) { + panic("canvas did not pass any coords\n"); } /* @@ -215,12 +202,23 @@ CreateWinItem(interp, canvas, itemPtr, objc, objv) /* * Process the arguments to fill in the item record. + * Only 1 (list) or 2 (x y) coords are allowed. */ - if ((WinItemCoords(interp, canvas, itemPtr, i, objv) != TCL_OK)) { + if (objc == 1) { + i = 1; + } else { + char *arg = Tcl_GetString(objv[1]); + i = 2; + if ((arg[0] == '-') && (arg[1] >= 'a') && (arg[1] <= 'z')) { + i = 1; + } + } + if (WinItemCoords(interp, canvas, itemPtr, i, objv) != TCL_OK) { goto error; } - if (ConfigureWinItem(interp, canvas, itemPtr, objc-i, objv+i, 0) == TCL_OK) { + if (ConfigureWinItem(interp, canvas, itemPtr, objc-i, objv+i, 0) + == TCL_OK) { return TCL_OK; } |