Mercurial > emacs
changeset 105226:e7ce441fd3b3
(ns_update_menubar): Use ns_app_name. Sync with xmenu.c. (EmacsMenu-clear:, ns_popup_dialog): Use ns_app_name.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Sun, 27 Sep 2009 15:49:08 +0000 |
| parents | 9f0244ca1777 |
| children | 4d1103e3ad15 |
| files | src/nsmenu.m |
| diffstat | 1 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsmenu.m Sun Sep 27 15:48:51 2009 +0000 +++ b/src/nsmenu.m Sun Sep 27 15:49:08 2009 +0000 @@ -156,7 +156,7 @@ if (menu == nil) { - menu = [[EmacsMenu alloc] initWithTitle: @"Emacs"]; + menu = [[EmacsMenu alloc] initWithTitle: ns_app_name]; needsSet = YES; } else @@ -171,16 +171,6 @@ t = -(1000*tb.time+tb.millitm); #endif - /* widget_value is a straightforward object translation of emacs's - Byzantine lisp menu structures */ - wv = xmalloc_widget_value (); - wv->name = "Emacs"; - wv->value = 0; - wv->enabled = 1; - wv->button_type = BUTTON_TYPE_NONE; - wv->help = Qnil; - first_wv = wv; - #ifdef NS_IMPL_GNUSTEP deep_p = 1; /* until GNUstep NSMenu implements the Panther delegation model */ #endif @@ -399,6 +389,14 @@ int n; Lisp_Object string; + wv = xmalloc_widget_value (); + wv->name = "menubar"; + wv->value = 0; + wv->enabled = 1; + wv->button_type = BUTTON_TYPE_NONE; + wv->help = Qnil; + first_wv = wv; + /* Make widget-value tree w/ just the top level menu bar strings */ items = FRAME_MENU_BAR_ITEMS (f); if (NILP (items)) @@ -677,7 +675,7 @@ NSMenuItem *item = [self itemAtIndex: n]; NSString *title = [item title]; if (([title length] == 0 /* OSX 10.5 */ - || [@"Emacs" isEqualToString: title] /* from 10.6 on */ + || [ns_app_name isEqualToString: title] /* from 10.6 on */ || [@"Apple" isEqualToString: title]) /* older */ && ![item isSeparatorItem]) continue; @@ -1663,7 +1661,7 @@ area.size.height= TEXTHEIGHT; command = [[[NSTextField alloc] initWithFrame: area] autorelease]; [[self contentView] addSubview: command]; - [command setStringValue: @"Emacs"]; + [command setStringValue: ns_app_name]; [command setDrawsBackground: NO]; [command setBezeled: NO]; [command setSelectable: NO];