Mercurial > emacs
comparison src/menu.h @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 9cfca8c9fb07 |
| children | e2f8226efb99 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 19 #ifndef MENU_H | 19 #ifndef MENU_H |
| 20 #define MENU_H | 20 #define MENU_H |
| 21 | 21 |
| 22 extern Lisp_Object Vmenu_updating_frame; | 22 extern Lisp_Object Vmenu_updating_frame; |
| 23 | 23 |
| 24 extern void x_set_menu_bar_lines (struct frame *f, | |
| 25 Lisp_Object value, | |
| 26 Lisp_Object oldval); | |
| 27 | |
| 24 extern void init_menu_items (void); | 28 extern void init_menu_items (void); |
| 25 extern void finish_menu_items (void); | 29 extern void finish_menu_items (void); |
| 26 extern void discard_menu_items (void); | 30 extern void discard_menu_items (void); |
| 27 extern void save_menu_items (void); | 31 extern void save_menu_items (void); |
| 28 extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); | 32 extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); |
| 29 extern void list_of_panes (Lisp_Object); | 33 extern void list_of_panes (Lisp_Object); |
| 30 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) | 34 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) \ |
| 35 || defined (HAVE_NS) | |
| 31 extern void free_menubar_widget_value_tree (widget_value *); | 36 extern void free_menubar_widget_value_tree (widget_value *); |
| 32 extern void update_submenu_strings (widget_value *); | 37 extern void update_submenu_strings (widget_value *); |
| 33 extern void find_and_call_menu_selection (FRAME_PTR, int, | 38 extern void find_and_call_menu_selection (FRAME_PTR, int, |
| 34 Lisp_Object, void *); | 39 Lisp_Object, void *); |
| 35 extern widget_value *xmalloc_widget_value (void); | 40 extern widget_value *xmalloc_widget_value (void); |
