diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-11-10 18:55:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-11-10 18:55:48 +0000 |
| commit | c57576ce72ace3d6dfd0f7db120fffe14868b1b8 (patch) | |
| tree | 23073f66d93ca4aa09d77d30e9f73960faa764c6 /src | |
| parent | ec62b9991913bdb11e36d37daa9440c4abc9bf7b (diff) | |
| download | emacs-c57576ce72ace3d6dfd0f7db120fffe14868b1b8.tar.gz | |
Don't include Xaw/Paned.h unless USE_LUCID is defined.
(set_frame_menubar): Conditionalized some code on USE_LUCID that
depends on the fact that the parent widget of the menu bar is an Xaw
"Paned" widget.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index e5fc62e6dee..8fd87175a14 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -68,7 +68,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <X11/CoreP.h> #include <X11/StringDefs.h> #include <X11/Shell.h> +#ifdef USE_LUCID #include <X11/Xaw/Paned.h> +#endif /* USE_LUCID */ #include "../lwlib/lwlib.h" #else /* not USE_X_TOOLKIT */ #include "../oldXMenu/XMenu.h" @@ -1738,6 +1740,7 @@ set_frame_menubar (f, first_time, deep_p) + f->output_data.x->menubar_widget->core.border_width) : 0); +#ifdef USE_LUCID if (FRAME_EXTERNAL_MENU_BAR (f)) { Dimension ibw = 0; @@ -1745,6 +1748,7 @@ set_frame_menubar (f, first_time, deep_p) XtNinternalBorderWidth, &ibw, NULL); menubar_size += ibw; } +#endif /* USE_LUCID */ f->output_data.x->menubar_height = menubar_size; } |