[Emacs-diffs] Changes to emacs/src/gtkutil.c

[Jan Djärv]

Index: emacs/src/gtkutil.c
diff -c emacs/src/gtkutil.c:1.27 emacs/src/gtkutil.c:1.28
*** emacs/src/gtkutil.c:1.27    Wed Apr  9 12:44:45 2003
--- emacs/src/gtkutil.c Fri May  2 08:20:16 2003
***************
*** 866,872 ****
        else
          {
            /* This is one button to add to the dialog.  */
!           w = gtk_button_new_with_mnemonic (utf8_label);
            if (! item->enabled)
              gtk_widget_set_sensitive (w, FALSE);
            if (select_cb)
--- 866,872 ----
        else
          {
            /* This is one button to add to the dialog.  */
!           w = gtk_button_new_with_label (utf8_label);
            if (! item->enabled)
              gtk_widget_set_sensitive (w, FALSE);
            if (select_cb)
***************
*** 1211,1217 ****
    GtkWidget *wbox;
  
    wbox = gtk_hbox_new (FALSE, 0);
!   wlbl = gtk_label_new_with_mnemonic (utf8_label);
    wkey = gtk_label_new (utf8_key);
  
    gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5);
--- 1211,1217 ----
    GtkWidget *wbox;
  
    wbox = gtk_hbox_new (FALSE, 0);
!   wlbl = gtk_label_new (utf8_label);
    wkey = gtk_label_new (utf8_key);
  
    gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5);
***************
*** 1257,1269 ****
      {
        *group = NULL;
        if (utf8_key) w = gtk_check_menu_item_new ();
!       else w = gtk_check_menu_item_new_with_mnemonic (utf8_label);
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), 
item->selected);
      }
    else if (item->button_type == BUTTON_TYPE_RADIO)
      {
        if (utf8_key) w = gtk_radio_menu_item_new (*group);
!       else w = gtk_radio_menu_item_new_with_mnemonic (*group, utf8_label);
        *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w));
        if (item->selected)
          gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE);
--- 1257,1269 ----
      {
        *group = NULL;
        if (utf8_key) w = gtk_check_menu_item_new ();
!       else w = gtk_check_menu_item_new_with_label (utf8_label);
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), 
item->selected);
      }
    else if (item->button_type == BUTTON_TYPE_RADIO)
      {
        if (utf8_key) w = gtk_radio_menu_item_new (*group);
!       else w = gtk_radio_menu_item_new_with_label (*group, utf8_label);
        *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w));
        if (item->selected)
          gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE);
***************
*** 1272,1278 ****
      {
        *group = NULL;
        if (utf8_key) w = gtk_menu_item_new ();
!       else w = gtk_menu_item_new_with_mnemonic (utf8_label);
      }
  
    if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd);
--- 1272,1278 ----
      {
        *group = NULL;
        if (utf8_key) w = gtk_menu_item_new ();
!       else w = gtk_menu_item_new_with_label (utf8_label);
      }
  
    if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd);
***************
*** 1552,1558 ****
            utf8_label = get_utf8_string (item->name);
  
            gtk_menu_set_title (GTK_MENU (wmenu), utf8_label);
!           w = gtk_menu_item_new_with_mnemonic (utf8_label);
            gtk_widget_set_sensitive (w, FALSE);
            if (utf8_label && utf8_label != item->name) g_free (utf8_label);
          }
--- 1552,1558 ----
            utf8_label = get_utf8_string (item->name);
  
            gtk_menu_set_title (GTK_MENU (wmenu), utf8_label);
!           w = gtk_menu_item_new_with_label (utf8_label);
            gtk_widget_set_sensitive (w, FALSE);
            if (utf8_label && utf8_label != item->name) g_free (utf8_label);
          }
***************
*** 1830,1836 ****
            GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
            char *utf8_label = get_utf8_string (val->name);
  
!           gtk_label_set_text_with_mnemonic (wlabel, utf8_label);
  
            iter = g_list_next (iter);
            val = val->next;
--- 1830,1836 ----
            GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
            char *utf8_label = get_utf8_string (val->name);
  
!           gtk_label_set_text (wlabel, utf8_label);
  
            iter = g_list_next (iter);
            val = val->next;
***************
*** 1960,1966 ****
      gtk_label_set_text (wkey, utf8_key);
  
    if (! old_label || strcmp (utf8_label, old_label) != 0)
!     gtk_label_set_text_with_mnemonic (wlbl, utf8_label);
  
    if (utf8_key && utf8_key != val->key) g_free (utf8_key);
    if (utf8_label && utf8_label != val->name) g_free (utf8_label);
--- 1960,1966 ----
      gtk_label_set_text (wkey, utf8_key);
  
    if (! old_label || strcmp (utf8_label, old_label) != 0)
!     gtk_label_set_text (wlbl, utf8_label);
  
    if (utf8_key && utf8_key != val->key) g_free (utf8_key);
    if (utf8_label && utf8_label != val->name) g_free (utf8_label);