GtkTool*: Removed the HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090 ifdefs. This gives...

[~andy/gtk] / gtk / gtktoolpalette.c

diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 825d1557b20d15deaf0bb2dad2a16a1843c85c91..d20fde4c287a584833698c3ccdf057aee9d361f9 100644 (file)
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -144,9 +144,7 @@ struct _GtkToolPalettePrivate
 
   GtkWidget            *expanding_child;
 
-#ifdef HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090
   GtkSizeGroup         *text_size_group;
-#endif
 
   guint                 sparse_groups : 1;
   guint                 drag_source : 2;
@@ -186,9 +184,7 @@ gtk_tool_palette_init (GtkToolPalette *palette)
   palette->priv->orientation = DEFAULT_ORIENTATION;
   palette->priv->style = DEFAULT_TOOLBAR_STYLE;
 
-#ifdef HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090
   palette->priv->text_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
-#endif
 }
 
 static void
@@ -302,13 +298,11 @@ gtk_tool_palette_dispose (GObject *object)
         }
     }
 
-#ifdef HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090
   if (palette->priv->text_size_group)
     {
       g_object_unref (palette->priv->text_size_group);
       palette->priv->text_size_group = NULL;
     }
-#endif
 
   G_OBJECT_CLASS (gtk_tool_palette_parent_class)->dispose (object);
 }
@@ -1672,8 +1666,6 @@ gtk_tool_palette_get_vadjustment (GtkToolPalette *palette)
   return palette->priv->vadjustment;
 }
 
-#ifdef HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090
-
 GtkSizeGroup *
 _gtk_tool_palette_get_size_group (GtkToolPalette *palette)
 {
@@ -1681,5 +1673,3 @@ _gtk_tool_palette_get_size_group (GtkToolPalette *palette)
 
   return palette->priv->text_size_group;
 }
-
-#endif