Mercurial > emacs
changeset 11898:a23359be806b
(set_frame_menubar): Set menubar_height field.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Wed, 24 May 1995 04:42:52 +0000 |
parents | cbd3724a9696 |
children | e1834fb53c35 |
files | src/xmenu.c |
diffstat | 1 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Wed May 24 04:42:09 1995 +0000 +++ b/src/xmenu.c Wed May 24 04:42:52 1995 +0000 @@ -67,6 +67,7 @@ #include <X11/CoreP.h> #include <X11/StringDefs.h> #include <X11/Shell.h> +#include <X11/Xaw/Paned.h> #include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ #include "../oldXMenu/XMenu.h" @@ -1555,6 +1556,24 @@ popup_deactivate_callback); f->display.x->menubar_widget = menubar_widget; } + + { + int menubar_size + = (f->display.x->menubar_widget + ? (f->display.x->menubar_widget->core.height + + f->display.x->menubar_widget->core.border_width) + : 0); + + if (FRAME_EXTERNAL_MENU_BAR (f)) + { + Dimension ibw = 0; + XtVaGetValues (f->display.x->column_widget, + XtNinternalBorderWidth, &ibw, NULL); + menubar_size += ibw; + } + + f->display.x->menubar_height = menubar_size; + } free_menubar_widget_value_tree (first_wv);