comparison src/xmenu.c @ 6325:d6817c9c0413

Undo previous change. Instead: (Fx_popup_dialog) [! USE_X_TOOLKIT]: Call Fx_popup_menu.

6324:fa8040a2bba9

  if (error_name) error (error_name);
  return selection;
}

#ifdef USE_X_TOOLKIT

DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 1, 2, 0,
  "Pop up a dialog box and return user's selection.\n\
POSITION is a position specification.  This is either a mouse button event\n\
or a list ((XOFFSET YOFFSET) WINDOW)\n\
where XOFFSET and YOFFSET are positions in characters from the top left\n\

If POSITION is nil, don't display the menu at all, just precalculate the\n\
cached information about equivalent key sequences.")
  (position, menu)
     Lisp_Object position, menu;
{
  int number_of_panes, panes;
  Lisp_Object keymap, tem;
  int xpos, ypos;
  Lisp_Object title;
  char *error_name;

  UNGCPRO;

  if (error_name) error (error_name);
  return selection;
}
#endif

#ifdef USE_X_TOOLKIT

static void
dispatch_dummy_expose (w, x, y)

  staticpro (&menu_items);
  menu_items = Qnil;

  popup_id_tick = (1<<16);	
  defsubr (&Sx_popup_menu);
#ifdef USE_X_TOOLKIT
  defsubr (&Sx_popup_dialog);
#endif
}

6325:d6817c9c0413

  if (error_name) error (error_name);
  return selection;
}

DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 1, 2, 0,
  "Pop up a dialog box and return user's selection.\n\
POSITION is a position specification.  This is either a mouse button event\n\
or a list ((XOFFSET YOFFSET) WINDOW)\n\
where XOFFSET and YOFFSET are positions in characters from the top left\n\

If POSITION is nil, don't display the menu at all, just precalculate the\n\
cached information about equivalent key sequences.")
  (position, menu)
     Lisp_Object position, menu;
{
#ifndef USE_X_TOOLKIT
  return Fx_popup_menu (position, menu);
#else
  int number_of_panes, panes;
  Lisp_Object keymap, tem;
  int xpos, ypos;
  Lisp_Object title;
  char *error_name;

  UNGCPRO;

  if (error_name) error (error_name);
  return selection;
#endif
}

#ifdef USE_X_TOOLKIT

static void
dispatch_dummy_expose (w, x, y)

  staticpro (&menu_items);
  menu_items = Qnil;

  popup_id_tick = (1<<16);	
  defsubr (&Sx_popup_menu);
  defsubr (&Sx_popup_dialog);
}