diff options
| author | dkf <dkf@noemail.net> | 2008-10-11 06:55:02 (GMT) |
|---|---|---|
| committer | dkf <dkf@noemail.net> | 2008-10-11 06:55:02 (GMT) |
| commit | a780176a44f75dadbe062fdc0e8bb01b6da2a58e (patch) | |
| tree | d401a72b3c9af3a033d4db7b739c5ca4cdb4aa00 | |
| parent | 04fa4b211811742dac16e7933d344af2d0271a91 (diff) | |
| download | tk-a780176a44f75dadbe062fdc0e8bb01b6da2a58e.zip tk-a780176a44f75dadbe062fdc0e8bb01b6da2a58e.tar.gz tk-a780176a44f75dadbe062fdc0e8bb01b6da2a58e.tar.bz2 | |
Correct error result generation of [$canvas select clear $bogus].
FossilOrigin-Name: f673c22f60e6cb8e590e0e5b473ddccc13b3919d
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tkCanvas.c | 4 | ||||
| -rw-r--r-- | tests/canvText.test | 5 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2008-10-11 Donal K. Fellows <donal.k.fellows@man.ac.uk> + + * generic/tkCanvas.c (CanvasWidgetCmd): Corrected result generation. + 2008-10-10 Don Porter <dgp@users.sourceforge.net> *** 8.5.5 TAGGED FOR RELEASE *** diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 5872d55..ca48d87 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.46.2.1 2008/04/17 14:52:24 dgp Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.46.2.2 2008/10/11 06:55:03 dkf Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -1630,7 +1630,7 @@ CanvasWidgetCmd( break; case CANV_CLEAR: if (objc != 3) { - Tcl_AppendResult(interp, 3, objv, NULL); + Tcl_WrongNumArgs(interp, 3, objv, NULL); result = TCL_ERROR; goto done; } diff --git a/tests/canvText.test b/tests/canvText.test index 615bf15..5db53c8 100644 --- a/tests/canvText.test +++ b/tests/canvText.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvText.test,v 1.16.4.1 2008/10/09 15:17:44 dgp Exp $ +# RCS: @(#) $Id: canvText.test,v 1.16.4.2 2008/10/11 06:55:03 dkf Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -458,6 +458,9 @@ test canvText-14.4 {GetTextIndex procedure: select error} { test canvText-14.5 {GetTextIndex procedure: bad int or unknown index} { list [catch {.c index test xyz} msg] $msg } {1 {bad index "xyz"}} +test canvText-14.6 {select clear errors} -body { + .c select clear test +} -returnCodes error -result "wrong \# args: should be \".c select clear\"" test canvText-15.1 {SetTextCursor procedure} { .c itemconfig -text "abcdefg" |