comparison src/gtkutil.c @ 103916:9653887b5cd0

* xterm.c (Qx_gtk_map_stock): New var. * gtkutil.c (update_frame_tool_bar): Use Qx_gtk_map_stock instead of calling intern each time.

103915:b22ca6941b7b

  return image;
}

/* Update the tool bar for frame F.  Add new buttons and remove old.  */

void
update_frame_tool_bar (f)
     FRAME_PTR f;
{
  int i;

  gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req);
  dir = gtk_widget_get_direction (x->toolbar_widget);

  for (i = 0; i < f->n_tool_bar_items; ++i)
    {

      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int idx;
      int img_id;
      int icon_size = 0;

      char *stock_name = NULL;
      char *icon_name = NULL;
      Lisp_Object rtl;
      GtkWidget *wbutton = NULL;
      GtkWidget *weventbox;
      Lisp_Object func = intern ("x-gtk-map-stock");
      Lisp_Object specified_file;

      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);

      if (ti)

          if (wbutton) gtk_widget_hide (wbutton);
          continue;
        }

      specified_file = file_for_image (image);
      if (!NILP (specified_file) && EQ (Qt, Ffboundp (func)))
        stock = call1 (func, specified_file);

      if (! NILP (stock) && STRINGP (stock))
        {
          stock_name = SSDATA (stock);
          if (stock_name[0] == 'n' && stock_name[1] == ':')
            {
              GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wtoolbar));

103916:9653887b5cd0

  return image;
}

/* Update the tool bar for frame F.  Add new buttons and remove old.  */

extern Lisp_Object Qx_gtk_map_stock;

void
update_frame_tool_bar (f)
     FRAME_PTR f;
{
  int i;

  gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req);
  dir = gtk_widget_get_direction (x->toolbar_widget);

  for (i = 0; i < f->n_tool_bar_items; ++i)
    {
      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int idx;
      int img_id;
      int icon_size = 0;

      char *stock_name = NULL;
      char *icon_name = NULL;
      Lisp_Object rtl;
      GtkWidget *wbutton = NULL;
      GtkWidget *weventbox;
      Lisp_Object specified_file;

      ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);

      if (ti)

          if (wbutton) gtk_widget_hide (wbutton);
          continue;
        }

      specified_file = file_for_image (image);
      if (!NILP (specified_file) && !NILP (Ffboundp (Qx_gtk_map_stock)))
        stock = call1 (Qx_gtk_map_stock, specified_file);

      if (STRINGP (stock))
        {
          stock_name = SSDATA (stock);
          if (stock_name[0] == 'n' && stock_name[1] == ':')
            {
              GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wtoolbar));