diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2011-03-19 00:45:48 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2011-03-19 00:45:48 (GMT) |
| commit | 78668b4e6e9567e7f50f41fa6886eb77f9d9c01f (patch) | |
| tree | e72af6bc0ac9d3232caff3de008f7ce0820a5959 | |
| parent | 65b8b25e4c125d6f0a80e0892656da24437d8a41 (diff) | |
| parent | 8e03b7eca925f942180c55714f1d9ca8436452f6 (diff) | |
| download | tk-78668b4e6e9567e7f50f41fa6886eb77f9d9c01f.zip tk-78668b4e6e9567e7f50f41fa6886eb77f9d9c01f.tar.gz tk-78668b4e6e9567e7f50f41fa6886eb77f9d9c01f.tar.bz2 | |
[Bug 3205464] - handle [wm forget] when the parent is unmapped on windows
The fix for [Bug 2009788] prevented a crash but causes windows to be lost
if their parent is unmapped when [wm forget] is called. Added a test for
this case and ensure that the parent window exists when we remap the
child to its parent.
Reported-by: Koen Danckaert <danckaert@users.sourceforge.net>
Reported-by: Eric Boudaillier <beric@users.sourceforge.net>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rw-r--r-- | tests/winWm.test | 31 | ||||
| -rw-r--r-- | win/tkWinWm.c | 5 |
2 files changed, 33 insertions, 3 deletions
diff --git a/tests/winWm.test b/tests/winWm.test index 7260a06..6b8fc81 100644 --- a/tests/winWm.test +++ b/tests/winWm.test @@ -533,6 +533,37 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win } destroy .tx .t .sd } -result {ok} + +test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup { + destroy .t + toplevel .t + set winwm92 {} + frame .t.f -background blue -height 200 -width 200 + frame .t.f.x -background red -height 100 -width 100 +} -body { + pack .t.f.x + pack .t.f + set aid [after 1000 {set ::winwm92 timeout}] + after 100 { + wm manage .t.f + wm iconify .t + after 100 { + wm forget .t.f + wm deiconify .t + after 100 { + pack .t.f + after 100 {set ::winwm92 [expr {[winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]} + } + } + } + vwait ::winwm92 + after cancel $aid + set winwm92 +} -cleanup { + destroy .t.f.x .t.f .t + unset -nocomplain winwm92 aid +} -result ok + destroy .t # cleanup diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 86f9dad..05073ac 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3642,9 +3642,8 @@ WmForgetCmd( if (Tk_IsTopLevel(frameWin)) { Tk_UnmapWindow(frameWin); winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); - if (Tk_IsMapped(Tk_Parent(frameWin))) { - RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); - } + Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr); + RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); TkWmDeadWindow(winPtr); /* flags (above) must be cleared before calling */ /* TkMapTopFrame (below) */ |