diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-03 20:45:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-03 20:45:19 (GMT) |
| commit | 1a1f6bb851a8f05fd555d9e28bc01edea61adef5 (patch) | |
| tree | d2ec5c7ee367cb99fde43021fb976b73dc6ab55f /unix | |
| parent | 769c871f62cd237acec5479e978538048a44ffa7 (diff) | |
| download | tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.zip tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.tar.gz tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.tar.bz2 | |
Consolidate Tk 8.7 error-messages regarding TIP #581. More Master -> Container related (internal) changes
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixWm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 795a1c5..5e1ed6c 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -312,12 +312,12 @@ static void MenubarReqProc(ClientData clientData, static const Tk_GeomMgr wmMgrType = { "wm", /* name */ TopLevelReqProc, /* requestProc */ - NULL, /* lostSlaveProc */ + NULL, /* lostContentProc */ }; static const Tk_GeomMgr menubarMgrType = { "menubar", /* name */ MenubarReqProc, /* requestProc */ - NULL, /* lostSlaveProc */ + NULL, /* lostContentProc */ }; /* @@ -2240,14 +2240,14 @@ WmIconifyCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify %s: it is an icon for %s", + "can't iconify \"%s\": it is an icon for \"%s\"", winPtr->pathName, Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL); return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify %s: it is an embedded window", + "can't iconify \"%s\": it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -3606,7 +3606,7 @@ WmTransientCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a transient: it is an icon for %s", + "can't make \"%s\" a transient, it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -3619,7 +3619,7 @@ WmTransientCmd( if (wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a container: 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; @@ -3629,7 +3629,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->masterPtr) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "setting \"%s\" as container creates a transient/container cycle", + "can't set \"%s\" as container, would cause management loop", Tk_PathName(masterPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; |