[Emacs-diffs] trunk r117996: * gtkutil.c (xg_set_toolkit_horizontal_scroll_bar_thumb):

[Dmitry Antipov]

------------------------------------------------------------
revno: 117996
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-01 17:21:08 +0400
message:
  * gtkutil.c (xg_set_toolkit_horizontal_scroll_bar_thumb):
  Resurrect old code and fix compilation with GTK < 2.13.6.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-01 03:28:16 +0000
+++ b/src/ChangeLog     2014-10-01 13:21:08 +0000
@@ -1,3 +1,8 @@
+2014-10-01  Dmitry Antipov  <address@hidden>
+
+       * gtkutil.c (xg_set_toolkit_horizontal_scroll_bar_thumb):
+       Resurrect old code and fix compilation with GTK < 2.13.6.
+
 2014-10-01  Paul Eggert  <address@hidden>
 
        Use AUTO_CONS instead of SCOPED_CONS, etc.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2014-09-24 04:12:37 +0000
+++ b/src/gtkutil.c     2014-10-01 13:21:08 +0000
@@ -3993,17 +3993,18 @@
 
       block_input ();
       adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
-
-      /*      gtk_adjustment_set_lower (adj, (gdouble) lower);
+#if GTK_CHECK_VERSION (2, 3, 16)
+      gtk_adjustment_configure (adj, (gdouble) value, (gdouble) lower,
+                               (gdouble) upper, (gdouble) step_increment,
+                               (gdouble) page_increment, (gdouble) pagesize);
+#else
+      gtk_adjustment_set_lower (adj, (gdouble) lower);
       gtk_adjustment_set_upper (adj, (gdouble) upper);
       gtk_adjustment_set_page_size (adj, (gdouble) pagesize);
       gtk_adjustment_set_value (adj, (gdouble) value);
       gtk_adjustment_set_page_increment (adj, (gdouble) page_increment);
-      gtk_adjustment_set_step_increment (adj, (gdouble)
-      step_increment); */
-      gtk_adjustment_configure (adj, (gdouble) value, (gdouble) lower,
-                               (gdouble) upper, (gdouble) step_increment,
-                               (gdouble) page_increment, (gdouble) pagesize);
+      gtk_adjustment_set_step_increment (adj, (gdouble) step_increment);
+#endif
       gtk_adjustment_changed (adj);
       unblock_input ();
     }