From 8fc0426a8dfee0fe1d2cb3d3b7d6e392f63ea1c1 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 9 Sep 2014 02:04:40 +0200 Subject: [PATCH] Avoid warnings when building with Gtk+ >= 3 (untested) --- src/plugins/ussd.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/plugins/ussd.c b/src/plugins/ussd.c index 7d8cc3e..f485452 100644 --- a/src/plugins/ussd.c +++ b/src/plugins/ussd.c @@ -196,9 +196,17 @@ static void _settings_window(USSD * ussd) gtk_window_set_title(GTK_WINDOW(ussd->window), "USSD"); g_signal_connect(ussd->window, "delete-event", G_CALLBACK( gtk_widget_hide), NULL); +#if GTK_CHECK_VERSION(3, 0, 0) + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); +#else vbox = gtk_vbox_new(FALSE, 4); +#endif /* operators */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new("Operator:"); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_size_group_add_widget(group, widget); @@ -219,7 +227,11 @@ static void _settings_window(USSD * ussd) gtk_box_pack_start(GTK_BOX(hbox), ussd->operators, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); /* codes */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new("Code:"); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_size_group_add_widget(group, widget); @@ -232,7 +244,11 @@ static void _settings_window(USSD * ussd) gtk_box_pack_start(GTK_BOX(hbox), ussd->codes, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); /* send */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); +#else hbox = gtk_hbox_new(FALSE, 4); +#endif widget = gtk_label_new(NULL); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_size_group_add_widget(group, widget); @@ -245,7 +261,11 @@ static void _settings_window(USSD * ussd) gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); /* button box */ +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); +#else hbox = gtk_hbutton_box_new(); +#endif gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), 4); widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);