libegg r854 - in trunk: . libegg/toolpalette

[jhs svn gnome org]

Author: jhs
Date: Mon Feb 25 11:18:03 2008
New Revision: 854
URL: http://svn.gnome.org/viewvc/libegg?rev=854&view=rev

Log:
2008-02-25  Johannes Schmid <johannes schmid openismus com>

        * libegg/toolpalette/Makefile.am:
        Use relativ include dir to allow easier integration
        into other projects
        * libegg/toolpalette/eggtoolitemgroup.c:
        (egg_tool_item_group_real_size_allocate),
        (egg_tool_item_group_get_drop_item):
        Fixed build with GTK+ < 2.15



Modified:
   trunk/ChangeLog
   trunk/libegg/toolpalette/Makefile.am
   trunk/libegg/toolpalette/eggtoolitemgroup.c

Modified: trunk/libegg/toolpalette/Makefile.am
==============================================================================
--- trunk/libegg/toolpalette/Makefile.am	(original)
+++ trunk/libegg/toolpalette/Makefile.am	Mon Feb 25 11:18:03 2008
@@ -1,6 +1,6 @@
 INCLUDES = \
   $(EGG_CFLAGS) \
-  -I$(top_srcdir)/libegg/util \
+  -I../util \
   -DEGG_COMPILATION \
   -DGTK_DISABLE_DEPRECATED \
   -DGDK_DISABLE_DEPRECATED \

Modified: trunk/libegg/toolpalette/eggtoolitemgroup.c
==============================================================================
--- trunk/libegg/toolpalette/eggtoolitemgroup.c	(original)
+++ trunk/libegg/toolpalette/eggtoolitemgroup.c	Mon Feb 25 11:18:03 2008
@@ -369,12 +369,15 @@
   guint i;
 
   GtkOrientation orientation;
-  GtkToolbarStyle style;
+  GtkToolbarStyle style = GTK_TOOLBAR_ICONS;
 
   GTK_WIDGET_CLASS (egg_tool_item_group_parent_class)->size_allocate (widget, allocation);
 
-  orientation = egg_tool_item_group_get_orientation (GTK_TOOL_SHELL (group));
-  style = egg_tool_item_group_get_style (GTK_TOOL_SHELL (group));
+#ifdef GTK_TOOL_SHELL
+  style = egg_tool_item_group_get_style (group);
+#else /* GTK_TOOL_SHELL */
+	orientation = egg_tool_item_group_get_orientation (group);
+#endif
 
   egg_tool_item_group_get_item_size (group, &item_size);
 
@@ -964,7 +967,7 @@
   g_return_val_if_fail (EGG_IS_TOOL_ITEM_GROUP (group), NULL);
 
   allocation = &GTK_WIDGET (group)->allocation;
-  orientation = egg_tool_item_group_get_orientation (GTK_TOOL_SHELL (group));
+  orientation = egg_tool_item_group_get_orientation (group);
 
   g_return_val_if_fail (x >= 0 && x < allocation->width, NULL);
   g_return_val_if_fail (y >= 0 && y < allocation->height, NULL);