diff options
| author | das <das> | 2006-09-11 14:41:16 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-11 14:41:16 (GMT) |
| commit | 1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb (patch) | |
| tree | 191fbdfd83d2610a765417eb034ddb441109d985 /macosx/tkMacOSXInt.h | |
| parent | d454b5134819c8607ad53ecd86e15bb3424b4836 (diff) | |
| download | tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.zip tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.tar.gz tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.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/tkMacOSXInt.h')
| -rw-r--r-- | macosx/tkMacOSXInt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h index a892404..337efbe 100644 --- a/macosx/tkMacOSXInt.h +++ b/macosx/tkMacOSXInt.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.13 2006/07/24 04:45:26 das Exp $ + * RCS: @(#) $Id: tkMacOSXInt.h,v 1.3.2.14 2006/09/11 14:41:16 das Exp $ */ #ifndef _TKMACINT @@ -125,7 +125,8 @@ MODULE_SCOPE TkMacOSXEmbedHandler *gMacEmbedHandler; * Globals shared among Macintosh Tk */ -MODULE_SCOPE MenuHandle tkAppleMenu; /* Handle to the Apple Menu */ +MODULE_SCOPE MenuHandle tkCurrentAppleMenu; /* Handle to current Apple Menu */ +MODULE_SCOPE MenuHandle tkAppleMenu; /* Handle to default Apple Menu */ MODULE_SCOPE MenuHandle tkFileMenu; /* Handles to menus */ MODULE_SCOPE MenuHandle tkEditMenu; /* Handles to menus */ MODULE_SCOPE RgnHandle tkMenuCascadeRgn;/* A region to clip with. */ |