Commit 4ad0a308 authored by Jan D's avatar Jan D
Browse files

Fixes: debbugs:19149

* gtkutil.c (gtk_adjustment_configure): Define for Gtk+ < 2.14.
(xg_set_toolkit_horizontal_scroll_bar_thumb): Remove wrong version
check for gtk_adjustment_configure (Bug#19149).
parent b1d07e31
2014-11-23 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (gtk_adjustment_configure): Define for Gtk+ < 2.14.
(xg_set_toolkit_horizontal_scroll_bar_thumb): Remove wrong version
check for gtk_adjustment_configure (Bug#19149).
2014-11-22 Glenn Morris <rgm@gnu.org>
 
* Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<.
......
......@@ -79,6 +79,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
#endif
#if ! GTK_CHECK_VERSION (2, 14, 0)
#define gtk_adjustment_configure(adj, value, lower, \
upper, step_increment, \
page_increment, pagesize) \
do { \
gtk_adjustment_set_lower (adj, lower); \
gtk_adjustment_set_upper (adj, upper); \
gtk_adjustment_set_page_size (adj, pagesize); \
gtk_adjustment_set_value (adj, value); \
gtk_adjustment_set_page_increment (adj, page_increment); \
gtk_adjustment_set_step_increment (adj, step_increment); \
} while (0)
#endif /* < Gtk+ 2.14 */
#ifdef HAVE_FREETYPE
#if GTK_CHECK_VERSION (3, 2, 0)
#define USE_NEW_GTK_FONT_CHOOSER 1
......@@ -3938,18 +3952,9 @@ xg_set_toolkit_horizontal_scroll_bar_thumb (struct scroll_bar *bar,
block_input ();
adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
#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);
#endif
gtk_adjustment_changed (adj);
unblock_input ();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment