comparison src/xmenu.c @ 15710:85d87cd0f655

(x_activate_menubar): Allow any event, not just ButtonPress.

15709:32550876ed0f

/* Activate the menu bar of frame F.
   This is called from keyboard.c when it gets the
   menu_bar_activate_event out of the Emacs event queue.

   To activate the menu bar, we use the X button-press event
   that was saved in saved_button_event.
   That makes the toolkit do its thing.

   But first we recompute the menu bar contents (the whole tree).

   The reason for saving the button event until here, instead of

   execute Lisp code.  */
   
x_activate_menubar (f)
     FRAME_PTR f;
{
  if (f->output_data.x->saved_button_event->type != ButtonPress)
    return;

  set_frame_menubar (f, 0, 1);

  BLOCK_INPUT;
  XtDispatchEvent ((XEvent *) f->output_data.x->saved_button_event);
  UNBLOCK_INPUT;

  /* Ignore this if we get it a second time.  */
  f->output_data.x->saved_button_event->type = 0;
}

/* Detect if a dialog or menu has been posted.  */

int

15710:85d87cd0f655

/* Activate the menu bar of frame F.
   This is called from keyboard.c when it gets the
   menu_bar_activate_event out of the Emacs event queue.

   To activate the menu bar, we use the X button-press event
   that was saved in saved_menu_event.
   That makes the toolkit do its thing.

   But first we recompute the menu bar contents (the whole tree).

   The reason for saving the button event until here, instead of

   execute Lisp code.  */
   
x_activate_menubar (f)
     FRAME_PTR f;
{
  if (!f->output_data.x->saved_menu_event->type)
    return;

  set_frame_menubar (f, 0, 1);

  BLOCK_INPUT;
  XtDispatchEvent ((XEvent *) f->output_data.x->saved_menu_event);
  UNBLOCK_INPUT;

  /* Ignore this if we get it a second time.  */
  f->output_data.x->saved_menu_event->type = 0;
}

/* Detect if a dialog or menu has been posted.  */

int