Mercurial > hg > xemacs-beta

comparison src/menubar-x.c @ 420:41dbb7a9d5f2 r21-2-18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-18
author cvs
date Mon, 13 Aug 2007 11:24:09 +0200
parents 697ef44129c6
children 11054d720c21
comparison
equal deleted inserted replaced
419:66615b78f1a5 420:41dbb7a9d5f2
129 wv->accel = LISP_TO_VOID (Qnil); 129 wv->accel = LISP_TO_VOID (Qnil);
130 } 130 }
131 } 131 }
132 else if (VECTORP (desc)) 132 else if (VECTORP (desc))
133 { 133 {
134 if (!button_item_to_widget_value (desc, wv, 1, 134 Lisp_Object gui_item = gui_parse_item_keywords (desc);
135 if (!button_item_to_widget_value (gui_item, wv, 1,
135 (menu_type == MENUBAR_TYPE 136 (menu_type == MENUBAR_TYPE
136 && depth <= 1))) 137 && depth <= 1)))
137 { 138 {
138 /* :included form was nil */ 139 /* :included form was nil */
139 wv = NULL; 140 wv = NULL;
155 int active_spec = 0; 156 int active_spec = 0;
156 wv->type = CASCADE_TYPE; 157 wv->type = CASCADE_TYPE;
157 wv->enabled = 1; 158 wv->enabled = 1;
158 wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc))); 159 wv->name = (char *) XSTRING_DATA (LISP_GETTEXT (XCAR (desc)));
159 160
160 accel = menu_name_to_accelerator (wv->name); 161 accel = gui_name_accelerator (LISP_GETTEXT (XCAR (desc)));
161 wv->accel = LISP_TO_VOID (accel); 162 wv->accel = LISP_TO_VOID (accel);
162 163
163 desc = Fcdr (desc); 164 desc = Fcdr (desc);
164 165
165 while (key = Fcar (desc), KEYWORDP (key)) 166 while (key = Fcar (desc), KEYWORDP (key))