Mercurial > emacs
comparison src/gtkutil.h @ 109327:60266cf487b0
Fix menus as per bug 6499 and 6608.
* gtkutil.c (xg_event_is_for_menubar): New function (Bug#6499).
* gtkutil.h (xg_event_is_for_menubar): Declare.
* xfns.c (x_menubar_window_to_frame): Take XEvent as second parameter
instead of Window. Call xg_event_is_for_menubar when
USE_GTK (Bug#6499).
* xmenu.c (x_activate_menubar): Revert previous fix for Bug#6499,
i.e. don't put back ButtonRelease (Bug#6608).
* xterm.c (handle_one_xevent): Pass event to x_menubar_window_to_frame.
* xterm.h (x_menubar_window_to_frame): Second parameter is XEvent*.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Wed, 14 Jul 2010 12:05:53 +0200 |
parents | 1d1d5d9bd884 |
children | 051595eb9b58 376148b31b5e |
comparison
equal
deleted
inserted
replaced
109326:269057771f8c | 109327:60266cf487b0 |
---|---|
152 GCallback deactivate_cb, | 152 GCallback deactivate_cb, |
153 GCallback hightlight_cb)); | 153 GCallback hightlight_cb)); |
154 | 154 |
155 extern int xg_update_frame_menubar P_ ((FRAME_PTR f)); | 155 extern int xg_update_frame_menubar P_ ((FRAME_PTR f)); |
156 | 156 |
157 extern int xg_event_is_for_menubar P_ ((FRAME_PTR f, XEvent *event)); | |
158 | |
157 extern int xg_have_tear_offs P_ ((void)); | 159 extern int xg_have_tear_offs P_ ((void)); |
158 | 160 |
159 extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid)); | 161 extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid)); |
160 | 162 |
161 extern void xg_create_scroll_bar P_ ((FRAME_PTR f, | 163 extern void xg_create_scroll_bar P_ ((FRAME_PTR f, |