HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add multi-monitor support on W32.
[bpt/emacs.git]
/
src
/
menu.h
diff --git
a/src/menu.h
b/src/menu.h
index
5e62327
..
f60873e
100644
(file)
--- a/
src/menu.h
+++ b/
src/menu.h
@@
-1,5
+1,5
@@
/* Functions to manipulate menus.
/* Functions to manipulate menus.
- Copyright (C) 2008
, 2009, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2008
-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-19,17
+19,17
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef MENU_H
#define MENU_H
#ifndef MENU_H
#define MENU_H
-extern Lisp_Object Vmenu_updating_frame;
+#include "systime.h" /* for Time */
extern void x_set_menu_bar_lines (struct frame *f,
Lisp_Object value,
Lisp_Object oldval);
extern void init_menu_items (void);
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);
+extern void finish_menu_items (void)
ATTRIBUTE_CONST
;
extern void discard_menu_items (void);
extern void save_menu_items (void);
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 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 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
#endif
#ifdef HAVE_X_WINDOWS
@@
-47,11
+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 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 **);
Lisp_Object, const char **);
-extern Lisp_Object xmenu_show (FRAME_PTR, int, int,
int, int
,
- Lisp_Object, const char **,
EMACS_UINT
);
+extern Lisp_Object xmenu_show (FRAME_PTR, int, int,
bool, bool
,
+ Lisp_Object, const char **,
Time
);
#endif /* MENU_H */
#endif /* MENU_H */
-
-/* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
- (do not change this comment) */