summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2017-11-26 12:42:48 (GMT)
committerKevin Walzer <kw@codebykevin.com>2017-11-26 12:42:48 (GMT)
commit1a9ed03cff3ca2e3ce2fba690a478d0651c55d12 (patch)
tree9ca10a20d876f3cd2076712a192924409fbe779c /macosx
parent81efb6d53e7bf033eb85ba3be24d3dc14e0cc28c (diff)
parenta208cd9efc2b7d18a225078728fa50249f49fb29 (diff)
downloadtk-1a9ed03cff3ca2e3ce2fba690a478d0651c55d12.zip
tk-1a9ed03cff3ca2e3ce2fba690a478d0651c55d12.tar.gz
tk-1a9ed03cff3ca2e3ce2fba690a478d0651c55d12.tar.bz2
Merge mac_wm_withdraw branch to 8.6
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXWm.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 965edd5..23d3e1f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -189,7 +189,7 @@ static const Tk_GeomMgr wmMgrType = {
* The following keeps state for Aqua dock icon bounce notification.
*/
-static int tkMacOSXWmAttrNotifyVal = 0;
+static int tkMacOSXWmAttrNotifyVal = 0;
/*
* Hash table for Mac Window -> TkWindow mapping.
@@ -412,6 +412,8 @@ static void RemapWindows(TkWindow *winPtr,
kWindowNoActivatesAttribute)) ? NO : YES;
}
+
+
#if DEBUG_ZOMBIES
- (id) retain
{
@@ -782,6 +784,10 @@ TkWmMapWindow(
XMapWindow(winPtr->display, winPtr->window);
+ /*Add window to Window menu.*/
+ NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+ [win setExcludedFromWindowsMenu:NO];
+
}
/*
@@ -3516,6 +3522,10 @@ WmWithdrawCmd(
return TCL_ERROR;
}
TkpWmSetState(winPtr, WithdrawnState);
+ /*Remove window from Window menu.*/
+ NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+ [win setExcludedFromWindowsMenu:YES];
+
return TCL_OK;
}