X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5fb63197843dcae66f2fe0ddd6f4a9d560e9db2f..b27d230fc41cb345855438f18c72dcb74ad488fe:/src/menu.h diff --git a/src/menu.h b/src/menu.h index 3406928a8d..0f94ad8000 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,5 +1,5 @@ /* Functions to manipulate menus. - Copyright (C) 2008-2012 Free Software Foundation, Inc. + Copyright (C) 2008-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -29,26 +29,26 @@ extern void init_menu_items (void); extern void finish_menu_items (void) ATTRIBUTE_CONST; extern void discard_menu_items (void); extern void save_menu_items (void); -extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); +extern bool 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, +extern void find_and_call_menu_selection (struct frame *, int, Lisp_Object, void *); extern widget_value *xmalloc_widget_value (void); -extern widget_value *digest_single_submenu (int, int, int); +extern widget_value *digest_single_submenu (int, int, bool); #endif #ifdef HAVE_X_WINDOWS -extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y); +extern void mouse_position_for_popup (struct frame *f, int *x, int *y); #endif -extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object w32_menu_show (struct frame *, int, int, int, int, Lisp_Object, const char **); -extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object ns_menu_show (struct frame *, int, int, bool, bool, Lisp_Object, const char **); -extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object xmenu_show (struct frame *, int, int, bool, bool, Lisp_Object, const char **, Time); #endif /* MENU_H */