diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-05-24 04:42:52 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-05-24 04:42:52 +0000 |
| commit | 036c29a1dfd86584a717fe427d874da92744c181 (patch) | |
| tree | 6ca05650cb42c8daf0c27d794fc7e09a27bd4ca4 /src/xmenu.c | |
| parent | ccb03e15d7895b6bbf173a3b4d8cdb9b7c0ab2e5 (diff) | |
| download | emacs-036c29a1dfd86584a717fe427d874da92744c181.tar.gz | |
(set_frame_menubar): Set menubar_height field.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index aaa098d55ad..da760d4214b 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -67,6 +67,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #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 @@ set_frame_menubar (f, first_time) 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); |