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, 4 insertions, 4 deletions

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 0e48e85d3a..dcfb62803c 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1453,10 +1453,10 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
   else
     gtk_widget_hide (completion->priv->action_view);
 
-  gtk_size_request_get_size (GTK_SIZE_REQUEST (completion->priv->popup_window),
-                             &popup_req, NULL);
-  gtk_size_request_get_size (GTK_SIZE_REQUEST (completion->priv->entry),
-                             &entry_req, NULL);
+  gtk_widget_get_preferred_size (completion->priv->popup_window,
+                                 &popup_req, NULL);
+  gtk_widget_get_preferred_size (completion->priv->entry,
+                                 &entry_req, NULL);
 
   if (x < monitor.x)
     x = monitor.x;