Avoid more warnings when building with Gtk+ 3.0

This commit is contained in:
Pierre Pronchery 2014-07-11 21:25:22 +02:00
parent 706c48d3df
commit eaa41e3626

View File

@ -111,9 +111,17 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
gtk_window_set_title(GTK_WINDOW(delete.window), _("Delete file(s)")); gtk_window_set_title(GTK_WINDOW(delete.window), _("Delete file(s)"));
g_signal_connect(G_OBJECT(delete.window), "delete-event", G_CALLBACK( g_signal_connect(G_OBJECT(delete.window), "delete-event", G_CALLBACK(
_delete_on_closex), &delete); _delete_on_closex), &delete);
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
#else
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
#endif
/* current argument */ /* current argument */
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_label_new(_("Deleting: ")); widget = gtk_label_new(_("Deleting: "));
bold = pango_font_description_new(); bold = pango_font_description_new();
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
@ -132,7 +140,11 @@ static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
delete.progress = gtk_progress_bar_new(); delete.progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(delete.progress), " "); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(delete.progress), " ");
gtk_box_pack_start(GTK_BOX(vbox), delete.progress, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), delete.progress, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(3, 0, 0)
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
#else
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK( g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
_delete_on_cancel), &delete); _delete_on_cancel), &delete);