diff options
author | Murray Cumming <murrayc@murrayc.com> | 2009-07-13 19:37:25 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2009-07-13 19:37:25 +0200 |
commit | 2976f4d98cb2a45a7d1b67bb3ef4a2fed4194fc8 (patch) | |
tree | ffbb0f2423735befd629b5be38697d49fd4494e8 /gtk/gtktoolpalette.c | |
parent | dad6e7343c1fbdbbe2a6ca765aabcf8b887933c9 (diff) | |
download | gtk+-2976f4d98cb2a45a7d1b67bb3ef4a2fed4194fc8.tar.gz |
GtkTool*: Removed the HAVE_EXTENDED_TOOL_SHELL_SUPPORT_BUG_535090 ifdefs. This gives us nicer text alignment among other things.
Diffstat (limited to 'gtk/gtktoolpalette.c')
-rw-r--r-- | gtk/gtktoolpalette.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index 825d1557b2..d20fde4c28 100644 --- 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 |