X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0bb2392728c10748f3376f8cef6d9ca53e29f464..da35c2b26f55a329329792f21a297aa8ad08fb95:/src/menu.h diff --git a/src/menu.h b/src/menu.h index 451401b42d..f60873eadb 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,5 +1,5 @@ /* Functions to manipulate menus. - Copyright (C) 2008-2011 Free Software Foundation, Inc. + Copyright (C) 2008-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -26,10 +26,10 @@ extern void x_set_menu_bar_lines (struct frame *f, Lisp_Object oldval); extern void init_menu_items (void); -extern void finish_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) @@ -38,7 +38,7 @@ 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); +extern widget_value *digest_single_submenu (int, int, bool); #endif #ifdef HAVE_X_WINDOWS @@ -47,8 +47,8 @@ extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y); 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, +extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, bool, bool, Lisp_Object, const char **); -extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int, +extern Lisp_Object xmenu_show (FRAME_PTR, int, int, bool, bool, Lisp_Object, const char **, Time); #endif /* MENU_H */