(ns_update_menubar): Use ns_app_name. Sync with xmenu.c. (EmacsMenu-clear:, ns_popu...

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 749a1d0fe76be319314868a63472e070ac5f5676..f6603ce8c37c0c40583cdfe3393f5b649a231ae2 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -156,7 +156,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
 
   if (menu == nil)
     {
-      menu = [[EmacsMenu alloc] initWithTitle: @"Emacs"];
+      menu = [[EmacsMenu alloc] initWithTitle: ns_app_name];
       needsSet = YES;
     }
   else
@@ -171,16 +171,6 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
   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 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
       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 @@ name_is_separator (name)
       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 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   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];