andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5

Browse source 
about not changing Help menu title.
This commit is contained in:
YAMAMOTO Mitsuharu 2007-12-23 06:01:51 +00:00
parent 8f13498885
commit 585a8772d5
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macmenu.c (fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5
about not changing Help menu title.
2007-12-22 Eli Zaretskii <eliz@gnu.org>
* callint.c (syms_of_callint) <command-history>: Add reference to

20
src/macmenu.c
View file

@ -3174,7 +3174,22 @@ fill_menubar (wv, deep_p)
GetMenuTitle (menu, old_title);
if (!EqualString (title, old_title, false, false))
SetMenuTitle (menu, title);
{
#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 SetMenuTitle fails to change the title of
the last (Help) menu in the menu bar. */
DeleteMenu (id);
DisposeMenu (menu);
menu = NULL;
}
else
#endif /* MAC_OSX */
SetMenuTitle (menu, title);
}
#else /* !TARGET_API_MAC_CARBON */
if (!EqualString (title, (*menu)->menuData, false, false))
{
@ -3186,7 +3201,8 @@ fill_menubar (wv, deep_p)
}
#endif /* !TARGET_API_MAC_CARBON */
}
else
if (!menu)
{
menu = NewMenu (id, title);
InsertMenu (menu, 0);