comparison src/xmenu.c @ 11918:da016ba65a6c

(xmenu_show, xdialog_show): Increment widget_id_tick in the same was as in xfns.c. Use LWLIB_ID type where appropriate. (set_frame_menubar, free_frame_menubar): Add casts to LWLIB_ID.

11917:2314b62ca4ab

      /* Disable resizing (done for Motif!) */
      lw_allow_resizing (f->display.x->widget, False);

      /* The third arg is DEEP_P, which says to consider the entire
	 menu trees we supply, rather than just the menu bar item names.  */
      lw_modify_all_widgets (id, first_wv, 1);

      /* Re-enable the edit widget to resize.  */
      lw_allow_resizing (f->display.x->widget, True);
    }
  else
    {
      menubar_widget = lw_create_widget ("menubar", "menubar", 
					 id, first_wv, 
					 f->display.x->column_widget,
					 0,
					 popup_activate_callback,
					 menubar_selection_callback,
					 popup_deactivate_callback);

  
  if (menubar_widget)
    {
      id = frame_vector_add_frame (f);
      BLOCK_INPUT;
      lw_destroy_all_widgets (id);
      XVECTOR (frame_vector)->contents[id] = Qnil;
      UNBLOCK_INPUT;
    }
}

   (We return nil on failure, but the value doesn't actually matter.)  */

#ifdef USE_X_TOOLKIT

/* We need a unique id for each widget handled by the Lucid Widget
   library.  This includes the frame main windows, popup menu and
   dialog box.  */
LWLIB_ID widget_id_tick;

#ifdef __STDC__
static Lisp_Object *volatile menu_item_selection;
#else

     int keymaps;
     Lisp_Object title;
     char **error;
{
  int i;
  int menu_id;
  Widget menu;
  Arg av [2];
  int ac = 0;
  widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
  widget_value **submenu_stack

      wv_title->next = wv_sep1;
      first_wv->contents = wv_title;
    }

  /* Actually create the menu.  */
  menu_id = ++widget_id_tick;
  menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv,
			   f->display.x->widget, 1, 0,
			   popup_selection_callback,
			   popup_deactivate_callback);

     int keymaps;
     Lisp_Object title;
     char **error;
{
  int i, nb_buttons=0;
  int dialog_id;
  Widget menu;
  char dialog_name[6];

  widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;

    wv->contents = first_wv;
    first_wv = wv;
  }

  /* Actually create the dialog.  */
  dialog_id = ++widget_id_tick;
  menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,
			   f->display.x->widget, 1, 0,
			   dialog_selection_callback, 0);
  lw_modify_all_widgets (dialog_id, first_wv->contents, True);
  /* Free the widget_value objects we used to specify the contents.  */

11918:da016ba65a6c

      /* Disable resizing (done for Motif!) */
      lw_allow_resizing (f->display.x->widget, False);

      /* The third arg is DEEP_P, which says to consider the entire
	 menu trees we supply, rather than just the menu bar item names.  */
      lw_modify_all_widgets ((LWLIB_ID) id, first_wv, 1);

      /* Re-enable the edit widget to resize.  */
      lw_allow_resizing (f->display.x->widget, True);
    }
  else
    {
      menubar_widget = lw_create_widget ("menubar", "menubar", 
					 (LWLIB_ID) id, first_wv, 
					 f->display.x->column_widget,
					 0,
					 popup_activate_callback,
					 menubar_selection_callback,
					 popup_deactivate_callback);

  
  if (menubar_widget)
    {
      id = frame_vector_add_frame (f);
      BLOCK_INPUT;
      lw_destroy_all_widgets ((LWLIB_ID) id);
      XVECTOR (frame_vector)->contents[id] = Qnil;
      UNBLOCK_INPUT;
    }
}

   (We return nil on failure, but the value doesn't actually matter.)  */

#ifdef USE_X_TOOLKIT

/* We need a unique id for each widget handled by the Lucid Widget
   library.

   For the main windows, and popup menus, we use this counter,
   which we increment each time after use.

   For menu bars, we use the index of the frame in frame_vector
   as the id.  */
LWLIB_ID widget_id_tick;

#ifdef __STDC__
static Lisp_Object *volatile menu_item_selection;
#else

     int keymaps;
     Lisp_Object title;
     char **error;
{
  int i;
  LWLIB_ID menu_id;
  Widget menu;
  Arg av [2];
  int ac = 0;
  widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
  widget_value **submenu_stack

      wv_title->next = wv_sep1;
      first_wv->contents = wv_title;
    }

  /* Actually create the menu.  */
  menu_id = widget_id_tick++;
  menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv,
			   f->display.x->widget, 1, 0,
			   popup_selection_callback,
			   popup_deactivate_callback);

     int keymaps;
     Lisp_Object title;
     char **error;
{
  int i, nb_buttons=0;
  LWLIB_ID dialog_id;
  Widget menu;
  char dialog_name[6];

  widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;

    wv->contents = first_wv;
    first_wv = wv;
  }

  /* Actually create the dialog.  */
  dialog_id = widget_id_tick++;
  menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,
			   f->display.x->widget, 1, 0,
			   dialog_selection_callback, 0);
  lw_modify_all_widgets (dialog_id, first_wv->contents, True);
  /* Free the widget_value objects we used to specify the contents.  */