diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-02-25 15:18:21 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-02-25 15:18:21 (GMT) |
| commit | 8019506921eab871f899a0fa2aa8386e9e5b8178 (patch) | |
| tree | 668fe58251cf32d8684e2977a1659c8ce6e609e9 | |
| parent | 4b9a72a445fc72b0ca531990c521ddd01c47600b (diff) | |
| parent | 505168f33072ae432a1f15d9fad413cb68095477 (diff) | |
| download | tk-8019506921eab871f899a0fa2aa8386e9e5b8178.zip tk-8019506921eab871f899a0fa2aa8386e9e5b8178.tar.gz tk-8019506921eab871f899a0fa2aa8386e9e5b8178.tar.bz2 | |
Put [wm forget] fix in the 8.6.5 release.core_8_6_5core_8_6_5_rc
| -rw-r--r-- | macosx/tkMacOSXWm.c | 5 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 5 | ||||
| -rw-r--r-- | win/tkWinWm.c | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 3ea2f51..39990e6 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1788,6 +1788,11 @@ WmForgetCmd( TkWmDeadWindow(winPtr); RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window); + /* + * Make sure wm no longer manages this window + */ + Tk_ManageGeometry(frameWin, NULL, NULL); + winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); /* diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 612270c..19ac86c 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -1826,6 +1826,11 @@ WmForgetCmd( ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); RemapWindows(winPtr, winPtr->parentPtr); + /* + * Make sure wm no longer manages this window + */ + Tk_ManageGeometry(frameWin, NULL, NULL); + /* * Flags (above) must be cleared before calling TkMapTopFrame (below). */ diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 768ee69..4e7618d 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3673,6 +3673,12 @@ WmForgetCmd( winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED); Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr); RemapWindows(winPtr, Tk_GetHWND(winPtr->parentPtr->window)); + + /* + * Make sure wm no longer manages this window + */ + Tk_ManageGeometry(frameWin, NULL, NULL); + TkWmDeadWindow(winPtr); /* flags (above) must be cleared before calling */ /* TkMapTopFrame (below) */ |