Author: cazfi
Date: Thu Apr 21 21:45:08 2016
New Revision: 32457
URL: http://svn.gna.org/viewcvs/freeciv?rev=32457&view=rev
Log:
Removed deprecated gtk_adjustment_value_changed() calls from gtk3x-client.
Bumped minimum gtk3 requirement to 3.18.
See patch #6799
Modified:
trunk/client/gui-gtk-3.x/citydlg.c
trunk/client/gui-gtk-3.x/repodlgs.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=32457&r1=32456&r2=32457&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/citydlg.c (original)
+++ trunk/client/gui-gtk-3.x/citydlg.c Thu Apr 21 21:45:08 2016
@@ -436,7 +436,8 @@
/****************************************************************
Center city dialog map.
*****************************************************************/
-static void city_dialog_map_recenter(GtkWidget *map_canvas_sw) {
+static void city_dialog_map_recenter(GtkWidget *map_canvas_sw)
+{
GtkAdjustment *adjust = NULL;
gdouble value;
@@ -448,7 +449,6 @@
+ gtk_adjustment_get_upper(adjust)
- gtk_adjustment_get_page_size(adjust)) / 2;
gtk_adjustment_set_value(adjust, value);
- gtk_adjustment_value_changed(adjust);
adjust = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(map_canvas_sw));
@@ -456,7 +456,6 @@
+ gtk_adjustment_get_upper(adjust)
- gtk_adjustment_get_page_size(adjust)) / 2;
gtk_adjustment_set_value(adjust, value);
- gtk_adjustment_value_changed(adjust);
}
/****************************************************************
Modified: trunk/client/gui-gtk-3.x/repodlgs.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/repodlgs.c?rev=32457&r1=32456&r2=32457&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/repodlgs.c (original)
+++ trunk/client/gui-gtk-3.x/repodlgs.c Thu Apr 21 21:45:08 2016
@@ -330,14 +330,12 @@
+ gtk_adjustment_get_upper(adjust)
- gtk_adjustment_get_page_size(adjust)) / width * x;
gtk_adjustment_set_value(adjust, value);
- gtk_adjustment_value_changed(adjust);
adjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw));
value = (gtk_adjustment_get_lower(adjust)
+ gtk_adjustment_get_upper(adjust)
- gtk_adjustment_get_page_size(adjust)) / height * y;
gtk_adjustment_set_value(adjust, value);
- gtk_adjustment_value_changed(adjust);
}
}
Modified: trunk/m4/gtk3x-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3x-client.m4?rev=32457&r1=32456&r2=32457&view=diff
==============================================================================
--- trunk/m4/gtk3x-client.m4 (original)
+++ trunk/m4/gtk3x-client.m4 Thu Apr 21 21:45:08 2016
@@ -8,10 +8,10 @@
# 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.16.0],
+ PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.18.0],
[
- GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_16"
- GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44"
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18"
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46"
gui_gtk3x=yes
if test "x$client" = "xauto" ; then
client=yes
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
