aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-08-01 21:29:46 +0000
committerRichard M. Stallman1994-08-01 21:29:46 +0000
commit60f312e2fcacc78ab283eae01b69be827e8a7dad (patch)
treea22a9d666bf46247498e142cb0ea806da3fbc178 /src
parent43d5aa681863b30a1cb0984ee1c4483d38b49009 (diff)
downloademacs-60f312e2fcacc78ab283eae01b69be827e8a7dad.tar.gz
emacs-60f312e2fcacc78ab283eae01b69be827e8a7dad.zip
(xmenu_show): Ignore any geometry resource from the user.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 758b43995ab..0c03019f07e 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -64,6 +64,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
64#include <X11/IntrinsicP.h> 64#include <X11/IntrinsicP.h>
65#include <X11/CoreP.h> 65#include <X11/CoreP.h>
66#include <X11/StringDefs.h> 66#include <X11/StringDefs.h>
67#include <X11/Shell.h>
67#include <X11/Xaw/Paned.h> 68#include <X11/Xaw/Paned.h>
68#include "../lwlib/lwlib.h" 69#include "../lwlib/lwlib.h"
69#include "../lwlib/xlwmenuP.h" 70#include "../lwlib/xlwmenuP.h"
@@ -1391,6 +1392,8 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
1391 int menu_id; 1392 int menu_id;
1392 Widget menu; 1393 Widget menu;
1393 XlwMenuWidget menubar = (XlwMenuWidget) f->display.x->menubar_widget; 1394 XlwMenuWidget menubar = (XlwMenuWidget) f->display.x->menubar_widget;
1395 Arg av [2];
1396 int ac = 0;
1394 1397
1395 /* This is the menu bar item (if any) that led to this menu. */ 1398 /* This is the menu bar item (if any) that led to this menu. */
1396 widget_value *menubar_item = 0; 1399 widget_value *menubar_item = 0;
@@ -1574,6 +1577,11 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
1574 menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv, 1577 menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv,
1575 f->display.x->widget, 1, 0, 1578 f->display.x->widget, 1, 0,
1576 popup_selection_callback, popup_down_callback); 1579 popup_selection_callback, popup_down_callback);
1580
1581 /* Don't allow any geometry request from the user. */
1582 XtSetArg (av[ac], XtNgeometry, 0); ac++;
1583 XtSetValues (menu, av, ac);
1584
1577 /* Free the widget_value objects we used to specify the contents. */ 1585 /* Free the widget_value objects we used to specify the contents. */
1578 free_menubar_widget_value_tree (first_wv); 1586 free_menubar_widget_value_tree (first_wv);
1579 1587