diff options
| author | nijtmans <nijtmans> | 2008-07-23 23:24:21 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-07-23 23:24:21 (GMT) |
| commit | 535ee80de6d5c048f9a3ae7a5956b114e9a5e3f6 (patch) | |
| tree | 44da117febb11bc69d260540340f018933aa8b45 /macosx | |
| parent | 8daba6660a12dce054485bf87cef227741ac76a0 (diff) | |
| download | tk-535ee80de6d5c048f9a3ae7a5956b114e9a5e3f6.zip tk-535ee80de6d5c048f9a3ae7a5956b114e9a5e3f6.tar.gz tk-535ee80de6d5c048f9a3ae7a5956b114e9a5e3f6.tar.bz2 | |
fix [2021443] inconsistant "wrong # args" messages (for Tk)
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXSend.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c index 50526d3..39c6543 100644 --- a/macosx/tkMacOSXSend.c +++ b/macosx/tkMacOSXSend.c @@ -30,7 +30,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXSend.c,v 1.9 2008/04/27 22:39:12 dkf Exp $ + * RCS: @(#) $Id: tkMacOSXSend.c,v 1.10 2008/07/23 23:24:44 nijtmans Exp $ */ #include "tkMacOSXInt.h" @@ -357,7 +357,7 @@ Tk_SendObjCmd( if (objc < (i + 2)) { Tcl_WrongNumArgs(interp, 1, objv, - "?options? interpName arg ?arg ...?"); + "?-option value ...? interpName arg ?arg ...?"); return TCL_ERROR; } diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index d2c4a61..98b4a9a 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.65 2008/05/03 21:12:55 das Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.66 2008/07/23 23:24:44 nijtmans Exp $ */ #include "tkMacOSXPrivate.h" @@ -1924,14 +1924,14 @@ WmIconphotoCmd( if (objc < 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image1 ?image2 ...?"); + "window ?-default? image ?image ...?"); return TCL_ERROR; } if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) { isDefault = 1; if (objc == 4) { Tcl_WrongNumArgs(interp, 2, objv, - "window ?-default? image1 ?image2 ...?"); + "window ?-default? image ?image ...?"); return TCL_ERROR; } } @@ -5298,7 +5298,7 @@ TkMacOSXMakeRealWindowExist( /* * Workaround GetWindowStructureWidths() Carbon bug: */ - + strWidths.top = 16; } wmPtr->xInParent = strWidths.left; @@ -6080,7 +6080,7 @@ WmGetWindowGroup( TkDisplay *dispPtr = TkGetDisplayList(); TkWindow *masterWinPtr = (TkWindow *) Tk_IdToWindow(dispPtr->display, wmPtr->master); - + if (masterWinPtr && masterWinPtr->window != None && TkMacOSXHostToplevelExists(masterWinPtr)) { WindowRef masterMacWin = |