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 /win | |
| 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 'win')
| -rw-r--r-- | win/tkWinWm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index fa04c3b..6241f37 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -364,7 +364,7 @@ static void RemapWindows(TkWindow *winPtr, HWND parentHWND); static const Tk_GeomMgr wmMgrType = { "wm", /* name */ TopLevelReqProc, /* requestProc */ - NULL, /* lostSlaveProc */ + NULL, /* lostContentProc */ }; typedef struct { @@ -4140,7 +4140,7 @@ WmIconifyCmd( if (winPtr->flags & TK_EMBEDDED) { if (!SendMessageW(wmPtr->wrapper, TK_ICONIFY, 0, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify %s: the container does not support the request", + "can't iconify \"%s\": the container does not support the request", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -4163,7 +4163,7 @@ 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; @@ -5592,7 +5592,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; @@ -5602,7 +5602,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; @@ -5611,7 +5611,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; |