Mercurial > emacs

comparison src/xmenu.c @ 13489:ddf90bfd3744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Richard M. Stallman <rms@gnu.org>
date Fri, 10 Nov 1995 18:55:48 +0000
parents 2e514396cbc8
children 645e14e39a2b
comparison
equal deleted inserted replaced
13488:71c747dc59ca 13489:ddf90bfd3744
66 #include <X11/Xlib.h> 66 #include <X11/Xlib.h>
67 #include <X11/IntrinsicP.h> 67 #include <X11/IntrinsicP.h>
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"
75 #endif /* not USE_X_TOOLKIT */ 77 #endif /* not USE_X_TOOLKIT */
76 #endif /* HAVE_X_WINDOWS */ 78 #endif /* HAVE_X_WINDOWS */
1736 = (f->output_data.x->menubar_widget 1738 = (f->output_data.x->menubar_widget
1737 ? (f->output_data.x->menubar_widget->core.height 1739 ? (f->output_data.x->menubar_widget->core.height
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;
1744 XtVaGetValues (f->output_data.x->column_widget, 1747 XtVaGetValues (f->output_data.x->column_widget,
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 }
1751 1755
1752 free_menubar_widget_value_tree (first_wv); 1756 free_menubar_widget_value_tree (first_wv);