From 99dd7f2e320e83cd50acfe8209e4bfe04e073190 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 14 Sep 2012 21:25:28 +0000
Subject: 3567779 Fumbling attempt to make winWm.test stop segfaulting and
 start passing when tested on Snow Leopard with --enable-aqua.

---
 macosx/tkMacOSXWm.c | 4 +++-
 tests/winWm.test    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index b651b3c..ae577d5 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -726,6 +726,8 @@ TkWmDeadWindow(
     if (wmPtr == NULL) {
 	return;
     }
+    Tk_DeleteEventHandler((Tk_Window) winPtr, StructureNotifyMask,
+	    TopLevelEventProc, winPtr);
     if (wmPtr->hints.flags & IconPixmapHint) {
 	Tk_FreeBitmap(winPtr->display, wmPtr->hints.icon_pixmap);
     }
@@ -1650,7 +1652,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);
diff --git a/tests/winWm.test b/tests/winWm.test
index a4d2669..1a8c8eb 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -541,7 +541,7 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
 } -body {
     pack .t.f.x
     pack .t.f
-    set aid [after 1000 {set ::winwm92 timeout}]
+    set aid [after 2000 {set ::winwm92 timeout}]
     after 100 {
         wm manage .t.f
         wm iconify .t
-- 
cgit v0.12