summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2012-10-18 02:46:11 (GMT)
committerKevin Walzer <kw@codebykevin.com>2012-10-18 02:46:11 (GMT)
commite053bd03f34f27fd2871e8275d281fb1277f98e8 (patch)
tree7481523b49f5e6d80031f8c21720a28537545c34
parent6feba54b7a658126ae685bda5aaad59e7610147b (diff)
downloadtk-e053bd03f34f27fd2871e8275d281fb1277f98e8.zip
tk-e053bd03f34f27fd2871e8275d281fb1277f98e8.tar.gz
tk-e053bd03f34f27fd2871e8275d281fb1277f98e8.tar.bz2
Backport of dgp wm-forget and wm-manage fixes; test suite no longer crashes
-rw-r--r--macosx/tkMacOSXWm.c23
1 files 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);
/*