[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macmenu.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/macmenu.c,v |
Date: |
Sat, 05 Apr 2008 23:01:29 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/04/05 23:01:26
Index: src/macmenu.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macmenu.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/macmenu.c 8 Jan 2008 20:44:21 -0000 1.67
+++ src/macmenu.c 5 Apr 2008 23:01:20 -0000 1.68
@@ -39,7 +39,7 @@
#if !TARGET_API_MAC_CARBON
#include <MacTypes.h>
#include <Menus.h>
-#include <QuickDraw.h>
+#include <Quickdraw.h>
#include <ToolUtils.h>
#include <Fonts.h>
#include <Controls.h>
@@ -2752,7 +2752,7 @@
SendEventToEventTarget (event, toolbox_dispatcher);
ReleaseEvent (event);
}
-#ifdef MAC_OSX
+#if 0 /* defined (MAC_OSX) */
else if (err != eventLoopTimedOutErr)
{
if (err == eventLoopQuitErr)
@@ -3194,7 +3194,11 @@
MenuRef submenu = NewMenu (submenu_id, "\pX");
InsertMenu (submenu, -1);
+#if TARGET_API_MAC_CARBON
+ SetMenuItemHierarchicalMenu (menu, pos, submenu);
+#else
SetMenuItemHierarchicalID (menu, pos, submenu_id);
+#endif
submenu_id = fill_menu (submenu, wv->contents, kind, submenu_id + 1);
}
}
@@ -3256,7 +3260,23 @@
if (err == noErr)
{
if (CFStringCompare (title, old_title, 0) != kCFCompareEqualTo)
+ {
+#ifdef MAC_OSX
+ if (id + 1 == min_menu_id[MAC_MENU_MENU_BAR + 1]
+ || GetMenuRef (id + 1) == NULL)
+ {
+ /* This is a workaround for Mac OS X 10.5 where
+ just calling SetMenuTitleWithCFString fails
+ to change the title of the last (Help) menu
+ in the menu bar. */
+ DeleteMenu (id);
+ DisposeMenu (menu);
+ menu = NULL;
+ }
+ else
+#endif /* MAC_OSX */
err = SetMenuTitleWithCFString (menu, title);
+ }
CFRelease (old_title);
}
else
- [Emacs-diffs] Changes to emacs/src/macmenu.c,v,
Miles Bader <=