summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-16 14:59:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-16 14:59:38 (GMT)
commit9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e (patch)
tree227deca30202b2b1b633fdf16dd9fb75554f7132 /macosx
parentb41e7be57014d7d8f36d1f7acd6ad7a125320463 (diff)
downloadtk-9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e.zip
tk-9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e.tar.gz
tk-9957b90c387d7fbfff18ce9c4a4ebce9f8de3c5e.tar.bz2
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.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXWm.c5
1 files changed, 4 insertions, 1 deletions
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);