DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid warnings while building with Gtk+ 3

Browse Source
This commit is contained in:
Pierre Pronchery 2014-12-24 18:59:48 +01:00
parent 614436ff71
commit 011bb98144
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/download.c
View File

@ -209,12 +209,20 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
g_signal_connect_swapped(download->window, "embedded", g_signal_connect_swapped(download->window, "embedded",
G_CALLBACK(_download_on_embedded), download); G_CALLBACK(_download_on_embedded), download);
} }
#if GTK_CHECK_VERSION(3, 0, 0)
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
#else
vbox = gtk_vbox_new(FALSE, 2); vbox = gtk_vbox_new(FALSE, 2);
#endif
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);
left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* address */ /* address */
#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(_("Address: ")); widget = gtk_label_new(_("Address: "));
gtk_widget_modify_font(widget, bold); gtk_widget_modify_font(widget, bold);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
@ -242,7 +250,11 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
_("Close window when the download is complete")); _("Close window when the download is complete"));
gtk_box_pack_start(GTK_BOX(vbox), download->check, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), download->check, FALSE, FALSE, 0);
/* button */ /* button */
#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
download->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); download->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
g_signal_connect_swapped(download->cancel, "clicked", G_CALLBACK( g_signal_connect_swapped(download->cancel, "clicked", G_CALLBACK(
_download_on_cancel), download); _download_on_cancel), download);
@ -278,7 +290,11 @@ static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
{ {
GtkWidget * hbox; GtkWidget * hbox;
#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(label); *widget = gtk_label_new(label);
gtk_widget_modify_font(*widget, bold); gtk_widget_modify_font(*widget, bold);
gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(*widget), 0.0, 0.5);