Move LIBXTR6 from cpp to autoconf.

[bpt/emacs.git] / src / menu.h

diff --git a/src/menu.h b/src/menu.h
index ed552e8..5f3c3d2 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,5 +1,5 @@
 /* Functions to manipulate menus.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,18 +19,32 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef MENU_H
 #define MENU_H
 
+extern Lisp_Object Vmenu_updating_frame;
+
 extern void init_menu_items P_ ((void));
 extern void finish_menu_items P_ ((void));
 extern void discard_menu_items P_ ((void));
 extern void save_menu_items P_ ((void));
 extern int parse_single_submenu P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
-extern void keymap_panes P_ ((Lisp_Object *, int, int));
 extern void list_of_panes P_ ((Lisp_Object));
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
 extern void free_menubar_widget_value_tree P_ ((widget_value *));
 extern void update_submenu_strings P_ ((widget_value *));
-extern void find_and_call_menu_selection P_ ((FRAME_PTR, EMACS_INT,
+extern void find_and_call_menu_selection P_ ((FRAME_PTR, int,
                                              Lisp_Object, void *));
 #endif
 
+#ifdef HAVE_X_WINDOWS
+extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y);
+#endif
+
+extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int,
+                                 Lisp_Object, char **);
+extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int,
+                                Lisp_Object, char **);
+extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
+                              Lisp_Object, char **, EMACS_UINT);
 #endif /* MENU_H */
+
+/* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
+   (do not change this comment) */