diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2020-08-31 01:46:03 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2020-08-31 01:46:03 (GMT) |
| commit | c9bf8ea3480b3664e9d03018544897d8a7c51544 (patch) | |
| tree | fad013aded1ee5d19cb7087ebce61e9c6a9179f5 /win/tkWinWm.c | |
| parent | 4aeddd3aeac172abbcb9fffa6ebe4b183347a64c (diff) | |
| parent | 6ad2a7195f97636ac7d46c162d3c899322d1166f (diff) | |
| download | tk-c9bf8ea3480b3664e9d03018544897d8a7c51544.zip tk-c9bf8ea3480b3664e9d03018544897d8a7c51544.tar.gz tk-c9bf8ea3480b3664e9d03018544897d8a7c51544.tar.bz2 | |
Merge trunk; refinement of TIP additions
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 98994ec..2f9634d 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -5502,7 +5502,7 @@ WmTransientCmd( WmInfo *wmPtr2; if ((objc != 3) && (objc != 4)) { - Tcl_WrongNumArgs(interp, 2, objv, "window ?master?"); + Tcl_WrongNumArgs(interp, 2, objv, "window ?window?"); return TCL_ERROR; } if (objc == 3) { @@ -5551,7 +5551,7 @@ WmTransientCmd( if (wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a master: it is an icon for %s", + "can't make \"%s\" a container: it is an icon for %s", Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -5560,7 +5560,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->masterPtr) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "setting \"%s\" as master creates a transient/master cycle", + "setting \"%s\" as container creates a transient/container cycle", Tk_PathName(masterPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; |