summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-16 22:11:48 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-16 22:11:48 (GMT)
commit6d8383d0d6757ecd4ed865447bfa551690ed7323 (patch)
tree75d4f9ba5a23902e84dc6740286a7542da04d483
parent9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e (diff)
downloadtk-6d8383d0d6757ecd4ed865447bfa551690ed7323.zip
tk-6d8383d0d6757ecd4ed865447bfa551690ed7323.tar.gz
tk-6d8383d0d6757ecd4ed865447bfa551690ed7323.tar.bz2
More work in progress. wm-manage tests all work now. still some issues
with wm-forget.
-rw-r--r--macosx/tkMacOSXWm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 267af7d..f5aefef 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1649,12 +1649,16 @@ WmForgetCmd(
register Tk_Window frameWin = (Tk_Window) winPtr;
if (Tk_IsTopLevel(frameWin)) {
- MacDrawable *macWin = (MacDrawable *) winPtr->parentPtr->window;
+ MacDrawable *macWin = (MacDrawable *) winPtr->window;
TkFocusJoin(winPtr);
Tk_UnmapWindow(frameWin);
+
+ macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel;
+ macWin->flags &= ~TK_HOST_EXISTS;
+
TkWmDeadWindow(winPtr);
- RemapWindows(winPtr, macWin);
+ RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window);
winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);