diff options
| author | Richard M. Stallman | 1995-11-10 18:55:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-11-10 18:55:48 +0000 |
| commit | 5ee80bd3d05518dbde3978278217c5db5af344bc (patch) | |
| tree | 75f481a704557408a9d17b9a7aeb3b34b6585afc /src | |
| parent | 09291989dd9b40eef28921ad64ef287ac5e60ec6 (diff) | |
| download | emacs-5ee80bd3d05518dbde3978278217c5db5af344bc.tar.gz emacs-5ee80bd3d05518dbde3978278217c5db5af344bc.zip | |
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. */ | |||
| 68 | #include <X11/CoreP.h> | 68 | #include <X11/CoreP.h> |
| 69 | #include <X11/StringDefs.h> | 69 | #include <X11/StringDefs.h> |
| 70 | #include <X11/Shell.h> | 70 | #include <X11/Shell.h> |
| 71 | #ifdef USE_LUCID | ||
| 71 | #include <X11/Xaw/Paned.h> | 72 | #include <X11/Xaw/Paned.h> |
| 73 | #endif /* USE_LUCID */ | ||
| 72 | #include "../lwlib/lwlib.h" | 74 | #include "../lwlib/lwlib.h" |
| 73 | #else /* not USE_X_TOOLKIT */ | 75 | #else /* not USE_X_TOOLKIT */ |
| 74 | #include "../oldXMenu/XMenu.h" | 76 | #include "../oldXMenu/XMenu.h" |
| @@ -1738,6 +1740,7 @@ set_frame_menubar (f, first_time, deep_p) | |||
| 1738 | + f->output_data.x->menubar_widget->core.border_width) | 1740 | + f->output_data.x->menubar_widget->core.border_width) |
| 1739 | : 0); | 1741 | : 0); |
| 1740 | 1742 | ||
| 1743 | #ifdef USE_LUCID | ||
| 1741 | if (FRAME_EXTERNAL_MENU_BAR (f)) | 1744 | if (FRAME_EXTERNAL_MENU_BAR (f)) |
| 1742 | { | 1745 | { |
| 1743 | Dimension ibw = 0; | 1746 | Dimension ibw = 0; |
| @@ -1745,6 +1748,7 @@ set_frame_menubar (f, first_time, deep_p) | |||
| 1745 | XtNinternalBorderWidth, &ibw, NULL); | 1748 | XtNinternalBorderWidth, &ibw, NULL); |
| 1746 | menubar_size += ibw; | 1749 | menubar_size += ibw; |
| 1747 | } | 1750 | } |
| 1751 | #endif /* USE_LUCID */ | ||
| 1748 | 1752 | ||
| 1749 | f->output_data.x->menubar_height = menubar_size; | 1753 | f->output_data.x->menubar_height = menubar_size; |
| 1750 | } | 1754 | } |