Fixed GtkExtendedLayout interaction with sizegroups plus cleanups

Fixed GtkExtendedLayout to interact with sizegroups, "size-requsts"
and caching the values all in the same code segment.

Migrated the cache code to be internal to gtkextendedlayout.c

1 files changed, 0 insertions, 17 deletions

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 92c2b8023e..1d71f72c6c 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -459,16 +459,12 @@ typedef enum
 
 #define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
 
-/* Size of the width-for-height/height-for-width caches */
-#define GTK_N_CACHED_SIZES 3
-
 /* forward declaration to avoid excessive includes (and concurrent includes)
  */
 typedef struct _GtkRequisition	   GtkRequisition;
 typedef struct _GtkSelectionData   GtkSelectionData;
 typedef struct _GtkWidgetClass	   GtkWidgetClass;
 typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;
-typedef struct _GtkDesiredSize     GtkDesiredSize;
 typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
 typedef struct _GtkClipboard	   GtkClipboard;
 typedef struct _GtkTooltip         GtkTooltip;
@@ -804,14 +800,6 @@ struct _GtkWidgetClass
   void (*_gtk_reserved7) (void);
 };
 
-struct _GtkDesiredSize
-{
-  guint  age;
-  gint   for_size;
-  gint   minimum_size;
-  gint   natural_size;
-};
-
 struct _GtkWidgetAuxInfo
 {
   gint x;
@@ -821,11 +809,6 @@ struct _GtkWidgetAuxInfo
 
   guint x_set : 1;
   guint y_set : 1;
-
-  GtkDesiredSize desired_widths[GTK_N_CACHED_SIZES];
-  GtkDesiredSize desired_heights[GTK_N_CACHED_SIZES];
-  guint cached_width_age;
-  guint cached_height_age;
 };
 
 struct _GtkWidgetShapeInfo