-extern Lisp_Object Q_key_sequence, Q_label;
-
-void gui_item_init (struct gui_item *pgui_item);
-void gui_item_add_keyval_pair (struct gui_item *pgui_item,
- Lisp_Object key, Lisp_Object val);
-void gui_parse_item_keywords (Lisp_Object item, struct gui_item *pgui_item);
-int gui_item_active_p (CONST struct gui_item *pgui_item);
-int gui_item_selected_p (CONST struct gui_item *pgui_item);
-int gui_item_included_p (CONST struct gui_item *pgui_item, Lisp_Object into);
-int gui_item_hash (Lisp_Object, struct gui_item*, int);
-Lisp_Object mark_gui_item (struct gui_item* p, void (*markobj) (Lisp_Object));
-unsigned int gui_item_display_flush_left (CONST struct gui_item *pgui_item,
+extern Lisp_Object Q_key_sequence, Q_label, Q_callback, Q_callback_ex, Q_value;
+
+void gui_item_add_keyval_pair (Lisp_Object,
+ Lisp_Object key, Lisp_Object val,
+ Error_behavior errb);
+Lisp_Object gui_parse_item_keywords (Lisp_Object item);
+Lisp_Object gui_parse_item_keywords_no_errors (Lisp_Object item);
+void gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item);
+int gui_item_active_p (Lisp_Object);
+int gui_item_selected_p (Lisp_Object);
+int gui_item_included_p (Lisp_Object, Lisp_Object into);
+Lisp_Object gui_item_accelerator (Lisp_Object gui_item);
+Lisp_Object gui_name_accelerator (Lisp_Object name);
+int gui_item_id_hash (Lisp_Object, Lisp_Object gui_item, int);
+unsigned int gui_item_display_flush_left (Lisp_Object pgui_item,