From c7cae341a1503aff77921d01f489cf8f577aabaa Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 17 Apr 2011 20:21:33 +0200
Subject: [PATCH] label: Don't care about aux info

aux info is something that GtkWidget should do, not any of its
subclasses.
---
 gtk/gtklabel.c | 58 +++++++-------------------------------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 718e4bf66..c49a6f2ac 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3488,31 +3488,18 @@ gtk_label_update_layout_width (GtkLabel *label)
     }
   else if (priv->wrap)
     {
-      GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (widget, FALSE);
       gdouble angle = gtk_label_get_angle (label);
       gint width;
-      gint aux_width = 0;
-
-      if ((angle == 90 || angle == 270) && aux_info && aux_info->height > 0)
-        aux_width = aux_info->height;
-      else if (aux_info && aux_info->width > 0)
-        aux_width = aux_info->width;
+      gint xpad, ypad;
+      gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
 
-      if (aux_width > 0)
-        pango_layout_set_width (priv->layout, aux_width * PANGO_SCALE);
+      if (angle == 90 || angle == 270)
+        width = allocation.height - ypad * 2;
       else
-        {
-          gint xpad, ypad;
-          gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
-
-          if (angle == 90 || angle == 270)
-            width = allocation.height - ypad * 2;
-          else
-            width = allocation.width  - xpad * 2;
+        width = allocation.width  - xpad * 2;
 
-          pango_layout_set_wrap (priv->layout, priv->wrap_mode);
-          pango_layout_set_width (priv->layout, MAX (width, 1) * PANGO_SCALE);
-        }
+      pango_layout_set_wrap (priv->layout, priv->wrap_mode);
+      pango_layout_set_width (priv->layout, MAX (width, 1) * PANGO_SCALE);
     }
   else /* !priv->wrap */
     pango_layout_set_width (priv->layout, -1);
@@ -3629,25 +3616,9 @@ get_size_for_allocation (GtkLabel        *label,
                          gint            *natural_size)
 {
   PangoLayout *layout;
-  GtkWidgetAuxInfo *aux_info =
-    _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
-  gint aux_size;
   gint text_height;
 
-  if (aux_info)
-    {
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-        aux_size = aux_info->width;
-      else
-        aux_size = aux_info->height;
-    }
-  else
-    aux_size = 0;
-
-  if (aux_size > 0)
-    layout = gtk_label_get_measuring_layout (label, NULL, aux_size * PANGO_SCALE);
-  else
-    layout = gtk_label_get_measuring_layout (label, NULL, allocation * PANGO_SCALE);
+  layout = gtk_label_get_measuring_layout (label, NULL, allocation * PANGO_SCALE);
 
   pango_layout_get_pixel_size (layout, NULL, &text_height);
 
@@ -3782,19 +3753,6 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
       natural->width = required->width;
     }
 
-  /* if a width-request is set, use that as the requested label width */
-  if (priv->wrap || priv->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
-    {
-      GtkWidgetAuxInfo *aux_info;
-
-      aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
-      if (aux_info && aux_info->width > 0)
-        {
-          required->width = aux_info->width * PANGO_SCALE;
-          natural->width = MAX (natural->width, required->width);
-        }
-    }
-
   g_object_unref (layout);
 }
 
-- 
2.43.2