From 1d3710228bb29e020ab4f179b0b14362bb5691b4 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 22 Jul 2014 14:34:05 +0400 Subject: * 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. --- src/xmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xmenu.c') diff --git a/src/xmenu.c b/src/xmenu.c index eb98125f6bb..f4d0921762c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1023,7 +1023,7 @@ set_frame_menubar (struct frame *f, bool first_time, bool deep_p) #endif /* USE_LUCID */ #endif /* 1 */ - f->output_data.x->menubar_height = menubar_size; + FRAME_MENUBAR_HEIGHT (f) = menubar_size; } #endif /* not USE_GTK */ @@ -1066,7 +1066,7 @@ free_frame_menubar (struct frame *f) menubar_widget = f->output_data.x->menubar_widget; - f->output_data.x->menubar_height = 0; + FRAME_MENUBAR_HEIGHT (f) = 0; if (menubar_widget) { -- cgit v1.2.1