diff options
| author | das <das> | 2006-09-11 14:41:03 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-11 14:41:03 (GMT) |
| commit | dccf71591f7870741f8a5ee8b7befe7b402b17ad (patch) | |
| tree | 700c7d9af3cce6f0a022e29d853e43c8b0b799ab /macosx/tkMacOSXMenu.c | |
| parent | 02d0ba269aecc70b7d71d72ae21417c147bd8db4 (diff) | |
| download | tk-dccf71591f7870741f8a5ee8b7befe7b402b17ad.zip tk-dccf71591f7870741f8a5ee8b7befe7b402b17ad.tar.gz tk-dccf71591f7870741f8a5ee8b7befe7b402b17ad.tar.bz2 | |
* macosx/tkMacOSXWm.c (TkMacOSXMakeRealWindowExist): revert part of
2006-05-16 change that had set overrideredirect windows to not become
activated by the window manager, as this prevented interaction with
native widgets in such windows [Bug 1472624]; apply changes to carbon
window attributes even if native window has already been created.
* macosx/tkMacOSXKeyEvent.c (TkMacOSXProcessKeyboardEvent): fix app
* macosx/tkMacOSXMenu.c (DrawMenuBarWhenIdle): menu item key shortcuts
* macosx/tkMacOSXInt.h: when custom ".apple" menu is installed.
* library/demos/widget: on TkAqua, don't install file menu with single
quit menu item, as the application menu already has a quit item.
* macosx/tkMacOSXColor.c: fix building on Mac OS X 10.2.
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index d16d23c..9f24e9b 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.32 2006/09/10 17:06:32 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.33 2006/09/11 14:41:04 das Exp $ */ #include "tkMacOSXInt.h" @@ -221,7 +221,9 @@ static TopLevelMenubarList *windowListPtr; static MenuItemDrawingUPP tkThemeMenuItemDrawingUPP; /* Points to the UPP for theme Item drawing. */ static Tcl_Obj *useMDEFVar; - + +MenuRef tkCurrentAppleMenu = NULL; + /* * Forward declarations for procedures defined later in this file: */ @@ -1733,6 +1735,7 @@ DrawMenuBarWhenIdle( if (appleIndex == -1) { InsertMenu(tkAppleMenu, 0); currentAppleMenuID = 0; + tkCurrentAppleMenu = tkAppleMenu; } else { short appleID; appleMenuPtr = menuBarPtr->entries[appleIndex] @@ -1757,6 +1760,7 @@ DrawMenuBarWhenIdle( InsertMenu(macMenuHdl, 0); RecursivelyInsertMenu(appleMenuPtr); currentAppleMenuID = appleID; + tkCurrentAppleMenu = macMenuHdl; } if (helpIndex == -1) { currentHelpMenuID = 0; |