(xmenu_show, xdialog_show): Delete menubarp arg.

(Fx_popup_menu): Don't compute menubarp.

diff --git a/src/xmenu.c b/src/xmenu.c
index 224fc7fea661e57732d58ef92de0795ce958348b..799d47dff5aee3325c2c48e0f3aafb81044272f5 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -755,7 +755,6 @@ cached information about equivalent key sequences.")
   FRAME_PTR f;
   Lisp_Object x, y, window;
   int keymaps = 0;
-  int menubarp = 0;
   int for_click = 0;
   struct gcpro gcpro1;
 
@@ -801,11 +800,6 @@ cached information about equivalent key sequences.")
              tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */
              x = Fcar (tem);
              y = Fcdr (tem);
-
-             /* Determine whether this menu is handling a menu bar click.  */
-             tem = Fcar (Fcdr (Fcar (Fcdr (position))));
-             if (CONSP (tem) && EQ (Fcar (tem), Qmenu_bar))
-               menubarp = 1;
            }
        }
 
@@ -918,7 +912,7 @@ cached information about equivalent key sequences.")
   /* Display them in a menu.  */
   BLOCK_INPUT;
 
-  selection = xmenu_show (f, xpos, ypos, menubarp, for_click,
+  selection = xmenu_show (f, xpos, ypos, for_click,
                          keymaps, title, &error_name);
   UNBLOCK_INPUT;
 
@@ -1617,7 +1611,6 @@ free_frame_menubar (f)
 /* F is the frame the menu is for.
    X and Y are the frame-relative specified position,
    relative to the inside upper left corner of the frame F.
-   MENUBARP is 1 if this menu came from the menu bar.
    FOR_CLICK if this menu was invoked for a mouse click.
    KEYMAPS is 1 if this menu was specified with keymaps;
     in that case, we return a list containing the chosen item's value
@@ -1649,11 +1642,10 @@ popup_selection_callback (widget, id, client_data)
 }
 
 static Lisp_Object
-xmenu_show (f, x, y, menubarp, for_click, keymaps, title, error)
+xmenu_show (f, x, y, for_click, keymaps, title, error)
      FRAME_PTR f;
      int x;
      int y;
-     int menubarp;             /* This arg is unused in Xt version.  */
      int for_click;
      int keymaps;
      Lisp_Object title;
@@ -1917,9 +1909,8 @@ static char * button_names [] = {
   "button6", "button7", "button8", "button9", "button10" };
 
 static Lisp_Object
-xdialog_show (f, menubarp, keymaps, title, error)
+xdialog_show (f, keymaps, title, error)
      FRAME_PTR f;
-     int menubarp;
      int keymaps;
      Lisp_Object title;
      char **error;
@@ -2095,10 +2086,9 @@ xdialog_show (f, menubarp, keymaps, title, error)
 #else /* not USE_X_TOOLKIT */
 
 static Lisp_Object
-xmenu_show (f, x, y, menubarp, for_click, keymaps, title, error)
+xmenu_show (f, x, y, for_click, keymaps, title, error)
      FRAME_PTR f;
      int x, y;
-     int menubarp;
      int for_click;
      int keymaps;
      Lisp_Object title;