Merge from origin/emacs-24

[gnu-emacs] / src / menu.h

diff --git a/src/menu.h b/src/menu.h
index e2d7601378e9774be86ddada7e63f53585fa1650..4dd7f17dca6feabdb1bcab73b437783a218ce690 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -29,15 +29,11 @@ extern Lisp_Object Qunsupported__w32_dialog;
 /* Bit fields used by terminal-specific menu_show_hook.  */
 
 enum {
-  MENU_KEYMAPS = 0x1, 
+  MENU_KEYMAPS = 0x1,
   MENU_FOR_CLICK = 0x2,
   MENU_KBD_NAVIGATION = 0x4
 };
 
-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) ATTRIBUTE_CONST;
 extern void discard_menu_items (void);
@@ -54,9 +50,6 @@ extern widget_value *make_widget_value (const char *, char *, bool, Lisp_Object)
 extern widget_value *digest_single_submenu (int, int, bool);
 #endif
 
-#ifdef HAVE_X_WINDOWS
-extern void mouse_position_for_popup (struct frame *f, int *x, int *y);
-#endif
 #if defined (HAVE_X_WINDOWS) || defined (MSDOS)
 extern Lisp_Object x_menu_show (struct frame *, int, int, int,
                                Lisp_Object, const char **);