diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2008-07-26 13:03:05 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2008-07-26 13:03:05 (GMT) |
| commit | 4a1f0034dfc4fb19946e55eb85c55978943d93b7 (patch) | |
| tree | 277deba3be364d1d97a550a4d38ed1ea7618df90 /win | |
| parent | c3574e6a659de1cae335c79d81865b60f67aea49 (diff) | |
| download | tk-4a1f0034dfc4fb19946e55eb85c55978943d93b7.zip tk-4a1f0034dfc4fb19946e55eb85c55978943d93b7.tar.gz tk-4a1f0034dfc4fb19946e55eb85c55978943d93b7.tar.bz2 | |
Check that the parent has been mapped before calling RemapWindows. [Bug 2009788]
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinWm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index e2cda93..070bb3f 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.126 2008/05/02 10:28:18 dkf Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.127 2008/07/26 13:03:07 patthoyts Exp $ */ #include "tkWinInt.h" @@ -3705,7 +3705,9 @@ WmForgetCmd( if (Tk_IsTopLevel(frameWin)) { Tk_UnmapWindow(frameWin); winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); - RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); + if (Tk_IsMapped(Tk_Parent(frameWin))) { + RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); + } TkWmDeadWindow(winPtr); /* flags (above) must be cleared before calling */ /* TkMapTopFrame (below) */ |