diff options
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/menu.h b/src/menu.h index 429dcfa6221..42038f54b67 100644 --- a/src/menu.h +++ b/src/menu.h @@ -20,11 +20,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define MENU_H #include "systime.h" /* for Time */ +#include "../lwlib/lwlib-widget.h" #ifdef HAVE_NTGUI extern Lisp_Object Qunsupported__w32_dialog; #endif +/* Bit fields used by terminal-specific menu_show_hook. */ + +enum { + 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); @@ -41,21 +50,28 @@ extern void free_menubar_widget_value_tree (widget_value *); extern void update_submenu_strings (widget_value *); extern void find_and_call_menu_selection (struct frame *, int, Lisp_Object, void *); -extern widget_value *xmalloc_widget_value (void); +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 - -extern Lisp_Object w32_menu_show (struct frame *, int, int, int, int, +#if defined (HAVE_X_WINDOWS) || defined (MSDOS) +extern Lisp_Object x_menu_show (struct frame *, int, int, int, + Lisp_Object, const char **); +#endif +#ifdef HAVE_NTGUI +extern Lisp_Object w32_menu_show (struct frame *, int, int, int, Lisp_Object, const char **); -extern Lisp_Object ns_menu_show (struct frame *, int, int, bool, bool, +#ifdef WINDOWSNT +extern Lisp_Object tty_menu_show (struct frame *, int, int, int, + Lisp_Object, const char **); +#endif +#endif +#ifdef HAVE_NS +extern Lisp_Object ns_menu_show (struct frame *, int, int, int, Lisp_Object, const char **); -extern Lisp_Object xmenu_show (struct frame *, int, int, bool, bool, - Lisp_Object, const char **); -extern Lisp_Object tty_menu_show (struct frame *, int, int, bool, bool, - Lisp_Object, bool, const char **); +#endif extern ptrdiff_t menu_item_width (const unsigned char *); #endif /* MENU_H */ |