Move GtkSizeRequest into GtkWidget

It doesn't make sense to keep them separate as GtkSizeRequest requires a
GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have
one without the other.
It also makes the code a lot easier because no casts are required when
calling functions.

Also, the names would translate to gtk_widget_get_width() and people
agreed that this would be a too generic name, so a "preferred" was added
to the names.

So this patch moves the functions:
gtk_size_request_get_request_mode() => gtk_widget_get_request_mode()
gtk_size_request_get_width() => gtk_widget_get_preferred_width()
gtk_size_request_get_height() => gtk_widget_get_preferred_height()
gtk_size_request_get_size() => gtk_widget_get_preferred_size()
gtk_size_request_get_width_for_height() =>
  gtk_widget_get_preferred_width_for_height()
gtk_size_request_get_height_for_width() =>
  gtk_widget_get_preferred_height_for_width()
... and moves the corresponding vfuncs to the GtkWidgetClass.

The patch also renames the implementations of the vfuncs in widgets to
include the word "preferrred".

1 files changed, 5 insertions, 6 deletions

diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 86a92c2d0f..23fb03c484 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -28,8 +28,6 @@
 
 #include "gtkfixed.h"
 
-#include "gtksizerequest.h"
-
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
@@ -351,8 +349,9 @@ gtk_fixed_size_request (GtkWidget      *widget,
 
       if (gtk_widget_get_visible (child->widget))
 	{
-          gtk_size_request_get_size (GTK_SIZE_REQUEST (child->widget),
-                                     &child_requisition, NULL);
+          gtk_widget_get_preferred_size (child->widget,
+                                         &child_requisition,
+                                         NULL);
 
           requisition->height = MAX (requisition->height,
                                      child->y +
@@ -402,8 +401,8 @@ gtk_fixed_size_allocate (GtkWidget     *widget,
       
       if (gtk_widget_get_visible (child->widget))
 	{
-          gtk_size_request_get_size (GTK_SIZE_REQUEST (child->widget),
-                                     &child_requisition, NULL);
+          gtk_widget_get_preferred_size (child->widget,
+                                         &child_requisition, NULL);
 	  child_allocation.x = child->x + border_width;
 	  child_allocation.y = child->y + border_width;