From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 1 Aug 1994 21:29:46 +0000 (+0000)
Subject: (xmenu_show): Ignore any geometry resource from the user.
X-Git-Tag: emacs-19.34~7439
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60f312e2fcacc78ab283eae01b69be827e8a7dad;p=emacs.git

(xmenu_show): Ignore any geometry resource from the user.
---

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.  */
 #include <X11/IntrinsicP.h>
 #include <X11/CoreP.h>
 #include <X11/StringDefs.h>
+#include <X11/Shell.h>
 #include <X11/Xaw/Paned.h>
 #include "../lwlib/lwlib.h"
 #include "../lwlib/xlwmenuP.h"
@@ -1391,6 +1392,8 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
   int menu_id;
   Widget menu;
   XlwMenuWidget menubar = (XlwMenuWidget) f->display.x->menubar_widget;
+  Arg av [2];
+  int ac = 0;
 
   /* This is the menu bar item (if any) that led to this menu.  */
   widget_value *menubar_item = 0;
@@ -1574,6 +1577,11 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
   menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv,
 			   f->display.x->widget, 1, 0,
 			   popup_selection_callback, popup_down_callback);
+
+  /* Don't allow any geometry request from the user.  */
+  XtSetArg (av[ac], XtNgeometry, 0); ac++;
+  XtSetValues (menu, av, ac);
+
   /* Free the widget_value objects we used to specify the contents.  */
   free_menubar_widget_value_tree (first_wv);