diff options
author | fvogel <fvogelnew1@free.fr> | 2016-03-01 17:36:13 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-03-01 17:36:13 (GMT) |
commit | bc0f830a410e3cda93f230708229cb35dbb788f2 (patch) | |
tree | 4bcc2aec4b290a2d192a84c65a7032d77f9c51cb /win | |
parent | 2d1dee7c0fdf51a57ac71ed493aa92e278a7720e (diff) | |
parent | bcb71c3efaadfc55dcd742522aaf331a40b9a7ec (diff) | |
download | tk-bc0f830a410e3cda93f230708229cb35dbb788f2.zip tk-bc0f830a410e3cda93f230708229cb35dbb788f2.tar.gz tk-bc0f830a410e3cda93f230708229cb35dbb788f2.tar.bz2 |
trunk merged to branch tip-443
Diffstat (limited to 'win')
-rwxr-xr-x | win/configure | 2 | ||||
-rw-r--r-- | win/configure.in | 2 | ||||
-rw-r--r-- | win/tkWinWm.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 18efa23..cbac248 100755 --- a/win/configure +++ b/win/configure @@ -1312,7 +1312,7 @@ SHELL=/bin/sh TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL=".4" +TK_PATCH_LEVEL=".5" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index 709b97f..0ff9304 100644 --- a/win/configure.in +++ b/win/configure.in @@ -14,7 +14,7 @@ SHELL=/bin/sh TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL=".4" +TK_PATCH_LEVEL=".5" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ 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) */ |