From e053bd03f34f27fd2871e8275d281fb1277f98e8 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Thu, 18 Oct 2012 02:46:11 +0000
Subject: Backport of dgp wm-forget and wm-manage fixes; test suite no longer
 crashes

---
 macosx/tkMacOSXWm.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index e56c0e7..9967581 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -728,6 +728,9 @@ TkWmDeadWindow(
     if (wmPtr == NULL) {
 	return;
     }
+     Tk_ManageGeometry((Tk_Window) winPtr, NULL, NULL);
+    Tk_DeleteEventHandler((Tk_Window) winPtr, StructureNotifyMask,
+	    TopLevelEventProc, winPtr);
     if (wmPtr->hints.flags & IconPixmapHint) {
 	Tk_FreeBitmap(winPtr->display, wmPtr->hints.icon_pixmap);
     }
@@ -1641,14 +1644,22 @@ WmForgetCmd(
 
     if (Tk_IsTopLevel(frameWin)) {
 
-	MacDrawable *macWin;                                                                                              
-	Tk_MakeWindowExist(winPtr);                                                                                      
-	Tk_MakeWindowExist(winPtr->parentPtr);                                                                                      macWin = (MacDrawable *) winPtr->window;                              
+	MacDrawable *macWin;
+
+	Tk_MakeWindowExist(winPtr);
+	Tk_MakeWindowExist(winPtr->parentPtr);
+
+	macWin = (MacDrawable *) winPtr->window;
+
     	TkFocusJoin(winPtr);
     	Tk_UnmapWindow(frameWin); 
-	TkWmDeadWindow(macWin);
-	RemapWindows(winPtr, macWin);
-       
+
+	macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel;
+	macWin->flags &= ~TK_HOST_EXISTS;
+
+	TkWmDeadWindow(winPtr);
+	RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window);
+  
 	winPtr->flags &=~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
 
 	/*
-- 
cgit v0.12