Author: cazfi
Date: Thu Dec 31 19:13:06 2015
New Revision: 31274
URL: http://svn.gna.org/viewcvs/freeciv?rev=31274&view=rev
Log:
Replaced deprecated gtk_widget_set_margin_...() usages with modern solutions
in gtk3x-client
See patch #6732
Modified:
trunk/client/gui-gtk-3.x/citydlg.c
trunk/client/gui-gtk-3.x/dialogs.c
trunk/client/gui-gtk-3.x/happiness.c
trunk/client/gui-gtk-3.x/voteinfo_bar.c
trunk/m4/gtk3x-client.m4
Modified: trunk/client/gui-gtk-3.x/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/citydlg.c?rev=31274&r1=31273&r2=31274&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/citydlg.c (original)
+++ trunk/client/gui-gtk-3.x/citydlg.c Thu Dec 31 19:13:06 2015
@@ -753,7 +753,7 @@
default:
break;
}
- gtk_widget_set_margin_right(label, 5);
+ gtk_widget_set_margin_end(label, 5);
gtk_widget_set_name(label, "city_label"); /* for font style? */
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_grid_attach(GTK_GRID(table), label, 0, i, 1, 1);
Modified: trunk/client/gui-gtk-3.x/dialogs.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/dialogs.c?rev=31274&r1=31273&r2=31274&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/dialogs.c (original)
+++ trunk/client/gui-gtk-3.x/dialogs.c Thu Dec 31 19:13:06 2015
@@ -1064,7 +1064,7 @@
"yalign", 0.5,
NULL);
gtk_widget_set_margin_bottom(label, 6);
- gtk_widget_set_margin_right(label, 12);
+ gtk_widget_set_margin_end(label, 12);
gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 2);
gtk_grid_attach(GTK_GRID(table), combo, 1, 0, 2, 1);
@@ -1109,7 +1109,7 @@
"yalign", 0.5,
NULL);
gtk_widget_set_margin_top(label, 6);
- gtk_widget_set_margin_right(label, 12);
+ gtk_widget_set_margin_end(label, 12);
gtk_grid_attach(GTK_GRID(table), label, 0, 2, 1, 1);
render = gtk_cell_renderer_pixbuf_new();
Modified: trunk/client/gui-gtk-3.x/happiness.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/happiness.c?rev=31274&r1=31273&r2=31274&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/happiness.c (original)
+++ trunk/client/gui-gtk-3.x/happiness.c Thu Dec 31 19:13:06 2015
@@ -234,7 +234,7 @@
/* list of citizens */
ebox = gtk_event_box_new();
- gtk_widget_set_margin_left(ebox, 5);
+ gtk_widget_set_margin_start(ebox, 5);
gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
g_object_set_data(G_OBJECT(ebox), "pdialog", pdialog);
g_signal_connect(ebox, "button_press_event",
Modified: trunk/client/gui-gtk-3.x/voteinfo_bar.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/voteinfo_bar.c?rev=31274&r1=31273&r2=31274&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/voteinfo_bar.c (original)
+++ trunk/client/gui-gtk-3.x/voteinfo_bar.c Thu Dec 31 19:13:06 2015
@@ -138,7 +138,7 @@
}
button = gtk_button_new();
- gtk_widget_set_margin_right(button, 16);
+ gtk_widget_set_margin_end(button, 16);
g_signal_connect(button, "clicked",
G_CALLBACK(voteinfo_bar_next_callback), NULL);
gtk_button_set_image(GTK_BUTTON(button), arrow);
Modified: trunk/m4/gtk3x-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3x-client.m4?rev=31274&r1=31273&r2=31274&view=diff
==============================================================================
--- trunk/m4/gtk3x-client.m4 (original)
+++ trunk/m4/gtk3x-client.m4 Thu Dec 31 19:13:06 2015
@@ -8,9 +8,9 @@
# Add check "x$client" = "xauto" when this becomes supported client
if test "x$gui_gtk3x" = "xyes" ||
test "x$client" = "xall" ; then
- PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.10.0],
+ PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.12.0],
[
- GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10"
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_12"
GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44"
gui_gtk3x=yes
if test "x$client" = "xauto" ; then
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
