diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-11-20 18:50:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-11-20 18:50:02 (GMT) |
| commit | 72ae3baa490baaf69b7359b378361921e532ccde (patch) | |
| tree | 0ceafbb929cc0ebd5eb08a80288844c8dbad7404 /win | |
| parent | 83adf45f708233fe1bed74cc67d714c40905dbbd (diff) | |
| parent | e15390471f6368e52215eb6ff7bd88d3185d66e1 (diff) | |
| download | tk-72ae3baa490baaf69b7359b378361921e532ccde.zip tk-72ae3baa490baaf69b7359b378361921e532ccde.tar.gz tk-72ae3baa490baaf69b7359b378361921e532ccde.tar.bz2 | |
Merge 8.6 except for the broken demo.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinWm.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 117b539..bddbe05 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -4384,9 +4384,9 @@ WmIconphotoCmd( if (!iconInfo.hbmColor) { ckfree(lpIR); Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "failed to create color bitmap for \"%s\"", + "failed to create an iconphoto with image \"%s\"", Tcl_GetString(objv[i]))); - Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "BITMAP", NULL); + Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "IMAGE", NULL); return TCL_ERROR; } @@ -5195,18 +5195,18 @@ WmStackorderCmd( if (objc == 3) { windows = TkWmStackorderToplevel(winPtr); - if (windows == NULL) { - Tcl_Panic("TkWmStackorderToplevel failed"); - } - - resultObj = Tcl_NewObj(); - for (windowPtr = windows; *windowPtr ; windowPtr++) { - Tcl_ListObjAppendElement(NULL, resultObj, - TkNewWindowObj((Tk_Window) *windowPtr)); + if (windows != NULL) { + resultObj = Tcl_NewObj(); + for (windowPtr = windows; *windowPtr ; windowPtr++) { + Tcl_ListObjAppendElement(NULL, resultObj, + TkNewWindowObj((Tk_Window) *windowPtr)); + } + Tcl_SetObjResult(interp, resultObj); + ckfree(windows); + return TCL_OK; + } else { + return TCL_ERROR; } - Tcl_SetObjResult(interp, resultObj); - ckfree(windows); - return TCL_OK; } else { TkWindow *winPtr2, **winPtr2Ptr = &winPtr2; int index1 = -1, index2 = -1, result; @@ -6812,8 +6812,6 @@ TkWmStackorderToplevel( (LPARAM) &pair) == 0) { ckfree(windows); windows = NULL; - } else if (pair.windowPtr != (windows-1)) { - Tcl_Panic("num matched toplevel windows does not equal num children"); } done: |