2007-11-04 [paul] 3.0.2cvs114

[claws.git] / src / gtk / gtkutils.c

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 3ffa0d766acc1628145ab866dba56ebdc413da72..8f9b7d258b8437ac6bbbe9448a96ef837a139bc4 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -191,16 +191,19 @@ void gtkut_stock_with_text_button_set_create(GtkWidget **bbox,
 
        if (button2) {
                *button2 = gtk_button_new_with_mnemonic(text2);
-       gtk_button_set_image(GTK_BUTTON(*button2),
-               gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(*button2),
+                       gtk_image_new_from_stock(label2, GTK_ICON_SIZE_BUTTON));
+                       GTK_WIDGET_SET_FLAGS(*button1, GTK_CAN_DEFAULT);
+               GTK_WIDGET_SET_FLAGS(*button2, GTK_CAN_DEFAULT);
                gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
                gtk_widget_show(*button2);
        }
 
        if (button3) {
                *button3 = gtk_button_new_with_mnemonic(text3);
-       gtk_button_set_image(GTK_BUTTON(*button3),
-               gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+               gtk_button_set_image(GTK_BUTTON(*button3),
+                       gtk_image_new_from_stock(label3, GTK_ICON_SIZE_BUTTON));
+               GTK_WIDGET_SET_FLAGS(*button3, GTK_CAN_DEFAULT);
                gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
                gtk_widget_show(*button3);
        }
@@ -369,28 +372,6 @@ void gtkut_clist_set_focus_row(GtkCList *clist, gint row)
        GTKUT_CTREE_REFRESH(clist);
 }
 
-void gtkut_combo_set_items(GtkCombo *combo, const gchar *str1, ...)
-{
-       va_list args;
-       gchar *s;
-       GList *combo_items = NULL;
-
-       g_return_if_fail(str1 != NULL);
-
-       combo_items = g_list_append(combo_items, (gpointer)str1);
-       va_start(args, str1);
-       s = va_arg(args, gchar*);
-       while (s) {
-               combo_items = g_list_append(combo_items, (gpointer)s);
-               s = va_arg(args, gchar*);
-       }
-       va_end(args);
-
-       gtk_combo_set_popdown_strings(combo, combo_items);
-
-       g_list_free(combo_items);
-}
-
 void gtkut_container_remove(GtkContainer *container, GtkWidget *widget)
 {
        gtk_container_remove(container, widget);