From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 10 Nov 1995 18:55:48 +0000 (+0000)
Subject: Don't include Xaw/Paned.h unless USE_LUCID is defined.
X-Git-Tag: emacs-19.34~2371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ee80bd3d05518dbde3978278217c5db5af344bc;p=emacs.git

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.
---

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;
   }