gnumeric r17148 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Feb 19 16:26:59 2009
New Revision: 17148
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17148&view=rev

Log:
2009-02-19  Morten Welinder  <terra gnome org>

	* src/wbc-gtk.c (set_toolbar_style_for_position): The GTK+
	busy-bodies have deprecated gtk_toolbar_set_orientation in favour
	of gtk_orientable_set_orientation.  Attempt (blindly!) to switch
	if we have gtk_orientable_set_orientation.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/wbc-gtk.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 19 16:26:59 2009
@@ -657,7 +657,7 @@
 SAVE_LIBS=$LIBS
 CFLAGS="$CFLAGS $GNUMERIC_CFLAGS"
 LIBS="$GNUMERIC_LIBS $LIBS"
-AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc pango_font_map_create_context gtk_recent_manager_get_default gsf_open_pkg_foreach_rel gsf_infile_msvba_steal_modules)
+AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc pango_font_map_create_context gtk_recent_manager_get_default gtk_orientable_set_orientation gsf_open_pkg_foreach_rel gsf_infile_msvba_steal_modules)
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
 

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Thu Feb 19 16:26:59 2009
@@ -3312,7 +3312,12 @@
 		GTK_ORIENTATION_HORIZONTAL, GTK_ORIENTATION_HORIZONTAL
 	};
 
+#ifdef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
+	gtk_orientable_set_orientation (GTK_ORIENTABLE (tb),
+					orientations[pos]);
+#else
 	gtk_toolbar_set_orientation (tb, orientations[pos]);
+#endif
 
 	if (GTK_IS_HANDLE_BOX (box)) {
 		static const GtkPositionType hdlpos[] = {