diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 6 | ||||
| -rw-r--r-- | tests/wm.test | 6 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 6 |
4 files changed, 12 insertions, 11 deletions
@@ -1,7 +1,8 @@ 2008-10-08 Don Porter <dgp@users.sourceforge.net> - * tests/wm.test: Update expected error messages from - [wm iconphoto] to match the new message. [Bug 2021443] + * unix/tkUnixWm.c: Restored consistency of error messages from + * macosx/tkMacOSXWm.c: [wm iconphoto] with the test suite and across + all platforms. [Bug 2021443] 2008-10-07 Pat Thoyts <patthoyts@users.sourceforge.net> diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 8bbb701..0e3544d 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXWm.c,v 1.68 2008/10/05 21:26:12 dkf Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.69 2008/10/08 15:39:13 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -1964,14 +1964,14 @@ WmIconphotoCmd( if (objc < 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image ?image ...?"); + "window ?-default? image1 ?image2 ...?"); return TCL_ERROR; } if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) { isDefault = 1; if (objc == 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image ?image ...?"); + "window ?-default? image1 ?image2 ...?"); return TCL_ERROR; } } diff --git a/tests/wm.test b/tests/wm.test index 4e72a0a..7a8a538 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: wm.test,v 1.44 2008/10/08 15:20:17 dgp Exp $ +# RCS: @(#) $Id: wm.test,v 1.45 2008/10/08 15:39:13 dgp Exp $ # This file tests window manager interactions that work across platforms. # Window manager tests that only work on a specific platform should be placed @@ -867,14 +867,14 @@ test wm-iconphoto-1.1 {usage} -returnCodes error -body { } -result {wrong # args: should be "wm option window ?arg ...?"} test wm-iconphoto-1.2 {usage} -returnCodes error -body { wm iconphoto . -} -result {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"} +} -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"} test wm-iconphoto-1.3 {usage} -returnCodes error -body { wm iconphoto . notanimage } -result {can't use "notanimage" as iconphoto: not a photo image} test wm-iconphoto-1.4 {usage} -returnCodes error -body { # we currently have no return info wm iconphoto . -default -} -result {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"} +} -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"} # All other iconphoto tests are platform specific diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index ab75626..7c02a8a 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.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: tkUnixWm.c,v 1.61 2008/10/05 18:22:21 dkf Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.62 2008/10/08 15:39:13 dgp Exp $ */ #include "tkUnixInt.h" @@ -2344,14 +2344,14 @@ WmIconphotoCmd( if (objc < 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image ?image ...?"); + "window ?-default? image1 ?image2 ...?"); return TCL_ERROR; } if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) { isDefault = 1; if (objc == 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image ?image ...?"); + "window ?-default? image1 ?image2 ...?"); return TCL_ERROR; } } |