X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2dab419dc9103dd30267b315b6bd016837ec56f9..42ca463309fdb17f04a72dad92696312bf242328:/src/menu.h

diff --git a/src/menu.h b/src/menu.h
index 2bf912f9f7..5e62327da9 100644
--- 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,20 +19,38 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef MENU_H
 #define MENU_H
 
-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,
-					      Lisp_Object, void *));
+extern Lisp_Object Vmenu_updating_frame;
+
+extern void x_set_menu_bar_lines (struct frame *f,
+                                  Lisp_Object value,
+                                  Lisp_Object oldval);
+
+extern void init_menu_items (void);
+extern void finish_menu_items (void);
+extern void discard_menu_items (void);
+extern void save_menu_items (void);
+extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object);
+extern void list_of_panes (Lisp_Object);
+#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) \
+  || defined (HAVE_NS)
+extern void free_menubar_widget_value_tree (widget_value *);
+extern void update_submenu_strings (widget_value *);
+extern void find_and_call_menu_selection (FRAME_PTR, int,
+                                          Lisp_Object, void *);
+extern widget_value *xmalloc_widget_value (void);
+extern widget_value *digest_single_submenu (int, int, int);
 #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, const char **);
+extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int,
+				 Lisp_Object, const char **);
+extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
+			       Lisp_Object, const char **, EMACS_UINT);
 #endif /* MENU_H */
 
 /* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988