diff --git a/gnome/src/gtk2_wrappers.c b/gnome/src/gtk2_wrappers.c index 732ea151e0542e0432950f24d91f9c8bee5e9a34..ab7f8b66dcddbd2702dfbe1665b3dc6f2ac186a6 100644 --- a/gnome/src/gtk2_wrappers.c +++ b/gnome/src/gtk2_wrappers.c @@ -49,12 +49,9 @@ GtkWidget* gtk_button_box_new(GtkOrientation orientation) } void -gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition *min_size, GtkRequisition *max_size) +gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition *min_size UNUSED, GtkRequisition *natural_size) { - if (max_size) - gtk_widget_size_request(widget, max_size); - else if (min_size) - gtk_widget_size_request(widget, min_size); + gtk_widget_size_request(widget, natural_size); } GdkPixbuf * @@ -74,9 +71,8 @@ gtk_scale_new_with_range(GtkOrientation orientation, gdouble min, gdouble max, } void -gtk_combo_box_text_append(GtkComboBoxText *combo_box, const gchar *id, const gchar *text) +gtk_combo_box_text_append(GtkComboBoxText *combo_box, const gchar *id UNUSED, const gchar *text) { - g_assert(!id); gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), text); } diff --git a/gnome/src/gtk2_wrappers.h b/gnome/src/gtk2_wrappers.h index aa28a117a34101dcc4dcb89a7c22d42c69512ae9..41103d7635925ae9f719f958d47a8b9e21d802f8 100644 --- a/gnome/src/gtk2_wrappers.h +++ b/gnome/src/gtk2_wrappers.h @@ -42,7 +42,7 @@ GtkWidget* gtk_button_box_new(GtkOrientation orientation); void -gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition *min_size, GtkRequisition *max_size); +gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition *min_size, GtkRequisition *natural_size); GdkPixbuf * gtk_widget_render_icon_pixbuf(GtkWidget *widget, const gchar *stock_id, GtkIconSize size);