diff options
author | dgp <dgp@noemail.net> | 2012-09-16 14:59:38 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2012-09-16 14:59:38 (GMT) |
commit | 4f7d9448750136270a25bd9416cab55a5b77931f (patch) | |
tree | 227deca30202b2b1b633fdf16dd9fb75554f7132 /macosx | |
parent | 3213650b1d8d209528238913710ad299eaaecd48 (diff) | |
download | tk-4f7d9448750136270a25bd9416cab55a5b77931f.zip tk-4f7d9448750136270a25bd9416cab55a5b77931f.tar.gz tk-4f7d9448750136270a25bd9416cab55a5b77931f.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.
FossilOrigin-Name: 205fb37ec1b9c5f4f855007133e38ba0e6f761c4
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/tkMacOSXWm.c | 5 |
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); |