diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-22 14:34:05 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-22 14:34:05 +0400 |
| commit | 1d3710228bb29e020ab4f179b0b14362bb5691b4 (patch) | |
| tree | 0e4a2e3a3b06a60f7a1a8a5b691edbb49c9a3b51 /src/gtkutil.c | |
| parent | c448c6241fd6cef424447dbfeaee18240aece27a (diff) | |
| download | emacs-1d3710228bb29e020ab4f179b0b14362bb5691b4.tar.gz | |
* xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define
menubar_height as such. Tweak comment.
(FRAME_MENUBAR_HEIGHT) [!USE_X_TOOLKIT && !USE_GTK]: No-op.
* xterm.c (handle_one_xevent):
* gtkutil.c (xg_event_is_for_menubar):
* xfns.c (x_window) [USE_X_TOOLKIT]:
* xmenu.c (set_frame_menubar, free_frame_menubar): Prefer
to use FRAME_MENUBAR_HEIGHT.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 752cc8ec60e..afa41f3269a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3374,7 +3374,7 @@ xg_event_is_for_menubar (struct frame *f, const XEvent *event) if (! (event->xbutton.x >= 0 && event->xbutton.x < FRAME_PIXEL_WIDTH (f) && event->xbutton.y >= 0 - && event->xbutton.y < f->output_data.x->menubar_height + && event->xbutton.y < FRAME_MENUBAR_HEIGHT (f) && event->xbutton.same_screen)) return 0; |