Contents in release-21-2 at 1999-06-30-19.

[chise/xemacs-chise.git.1] / src / menubar-x.c

diff --git a/src/menubar-x.c b/src/menubar-x.c
index 61258db..6212281 100644 (file)
--- a/src/menubar-x.c
+++ b/src/menubar-x.c
@@ -131,7 +131,8 @@ menu_item_descriptor_to_widget_value_1 (Lisp_Object desc,
     }
   else if (VECTORP (desc))
     {
     }
   else if (VECTORP (desc))
     {

-      if (!button_item_to_widget_value (desc, wv, 1,
+      Lisp_Object gui_item = gui_parse_item_keywords (desc);
+      if (!button_item_to_widget_value (gui_item, wv, 1,

                                        (menu_type == MENUBAR_TYPE
                                         && depth <= 1)))
        {
                                        (menu_type == MENUBAR_TYPE
                                         && depth <= 1)))
        {

@@ -157,7 +158,7 @@ menu_item_descriptor_to_widget_value_1 (Lisp_Object desc,
          wv->enabled = 1;
          wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc)));
 
          wv->enabled = 1;
          wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc)));
 

-         accel = menu_name_to_accelerator (wv->name);
+         accel = gui_name_accelerator (LISP_GETTEXT (XCAR (desc)));

          wv->accel = LISP_TO_VOID (accel);
 
          desc = Fcdr (desc);
          wv->accel = LISP_TO_VOID (accel);
 
          desc = Fcdr (desc);