X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmenubar.h;h=fef111f2e7ddd388cd6675cc24a13e8cef4cc3d6;hb=36601ff8bc27eb083a08147c8a00dc3212438a6e;hp=2507d8b7822ccd71b99905ad5f847b9d7ce96db4;hpb=44e716ef11bd794a51f8c5b56c4f3f10a7dbf217;p=chise%2Fxemacs-chise.git.1

diff --git a/src/menubar.h b/src/menubar.h
index 2507d8b..fef111f 100644
--- a/src/menubar.h
+++ b/src/menubar.h
@@ -20,10 +20,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-/* #### Not properly abstracted for device-independence. */
+/* #### Still needs some device-abstraction work. */
 
-#ifndef _XEMACS_MENUBAR_H_
-#define _XEMACS_MENUBAR_H_
+#ifndef INCLUDED_menubar_h_
+#define INCLUDED_menubar_h_
 
 #ifdef HAVE_MENUBARS
 #include "gui.h"
@@ -31,10 +31,41 @@ void update_frame_menubars (struct frame *f);
 void free_frame_menubars (struct frame *f);
 Lisp_Object menu_parse_submenu_keywords (Lisp_Object desc,
 					 Lisp_Object gui_item);
-Lisp_Object current_frame_menubar (CONST struct frame* f);
+Lisp_Object current_frame_menubar (const struct frame* f);
 
 EXFUN (Fmenu_find_real_submenu, 2);
 
+extern Lisp_Object Vmenu_accelerator_prefix;
+extern Lisp_Object Vmenu_accelerator_modifiers;
+extern Lisp_Object Vmenu_accelerator_enabled;
+extern Lisp_Object Vmenu_accelerator_map;
+
+extern Lisp_Object Qmenu_force;
+extern Lisp_Object Qmenu_fallback;
+
+extern Lisp_Object Qmenu_quit;
+extern Lisp_Object Qmenu_up;
+extern Lisp_Object Qmenu_down;
+extern Lisp_Object Qmenu_left;
+extern Lisp_Object Qmenu_right;
+extern Lisp_Object Qmenu_select;
+extern Lisp_Object Qmenu_escape;
+
+
+/* #### kluuuuuuuuuuuuuuuuuuuuuuuuuuuudge!
+   The author of the accelerator code didn't know what the hell he was doing.
+   Someone needs to abstract this properly. */
+#if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
+extern int x_kludge_lw_menu_active (void);
+struct command_builder;
+Lisp_Object command_builder_find_menu_accelerator (struct command_builder
+						   *builder);
+Lisp_Object command_builder_operate_menu_accelerator (struct command_builder
+						      *builder);
+
+extern int in_menu_callback;
+#endif
+
 #endif /* HAVE_MENUBARS */
 
-#endif /* _XEMACS_MENUBAR_H_ */
+#endif /* INCLUDED_menubar_h_ */