From 9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sun, 16 Sep 2012 14:59:38 +0000
Subject: Work in progress - make TkWmNewWindow and TkWmDeadWindow more
 complementary and pass in to TkWmDeadWindow from WmForgetCmd a pointer that
 at least has the right type.

---
 macosx/tkMacOSXWm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index b651b3c..267af7d 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -726,6 +726,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);
     }
@@ -1650,7 +1653,7 @@ WmForgetCmd(
 
     	TkFocusJoin(winPtr);
     	Tk_UnmapWindow(frameWin); 
-	TkWmDeadWindow((TkWindow *) macWin);
+	TkWmDeadWindow(winPtr);
 	RemapWindows(winPtr, macWin);
        
 	winPtr->flags &= ~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
-- 
cgit v0.12