From a5bc0a276b54ac9b6636371a2f8692bb6f0c1e7a Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 1 Oct 2014 17:21:08 +0400 Subject: [PATCH] * gtkutil.c (xg_set_toolkit_horizontal_scroll_bar_thumb): Resurrect old code and fix compilation with GTK < 2.13.6. --- src/ChangeLog | 5 +++++ src/gtkutil.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index afaca432250..667ac3ce45f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-10-01 Dmitry Antipov + + * 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 Use AUTO_CONS instead of SCOPED_CONS, etc. diff --git a/src/gtkutil.c b/src/gtkutil.c index 1f3e1958ede..595e6e0bb6a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3993,17 +3993,18 @@ xg_set_toolkit_horizontal_scroll_bar_thumb (struct scroll_bar *bar, 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 (); } -- 2.39.5