diff options
| author | fvogel <fvogelnew1@free.fr> | 2020-10-01 19:49:17 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2020-10-01 19:49:17 (GMT) |
| commit | c398d6bf2cc0c663cf503457d334bb99bee735f7 (patch) | |
| tree | 72eb328ecc988df53a56f63bc3b1bea3e0d7eb77 | |
| parent | 381d1e050c4e92292956bbcd87b46a7631a4b568 (diff) | |
| download | tk-c398d6bf2cc0c663cf503457d334bb99bee735f7.zip tk-c398d6bf2cc0c663cf503457d334bb99bee735f7.tar.gz tk-c398d6bf2cc0c663cf503457d334bb99bee735f7.tar.bz2 | |
Another possible fix (but this does not match the documentation for <Destroy> in bind.n).
| -rw-r--r-- | generic/tkCmds.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index f782144..b8b1d3e 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -1623,12 +1623,7 @@ Tk_WinfoObjCmd( } tkwin = Tk_CoordsToWindow(x, y, tkwin); if (tkwin != NULL) { - string = Tk_PathName(tkwin); - winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin); - Tcl_ResetResult(interp); - if (winPtr && !(winPtr->flags & TK_ALREADY_DEAD)) { - Tcl_SetObjResult(interp, Tcl_NewStringObj(string, -1)); - } + Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tkwin),-1)); } break; case WIN_INTERPS: @@ -1694,10 +1689,7 @@ Tk_WinfoObjCmd( winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin); Tcl_ResetResult(interp); - alive = 1; - if ((winPtr == NULL) || (winPtr->flags & TK_ALREADY_DEAD)) { - alive = 0; - } + alive = (winPtr != NULL); Tcl_SetObjResult(interp, Tcl_NewBooleanObj(alive)); break; } |