diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-09-21 16:35:17 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-09-26 15:11:45 +0200 |
| commit | d9c92598612714683eab96fecf6e90a9531607e5 (patch) | |
| tree | 4091fc22f94eeed203385670e1eb05d43b6f264c /gtk/gtkaspectframe.c | |
| parent | f52a1fcfbde5c1b1108d4a03a9bf5c409b59a73e (diff) | |
| download | gtk+-d9c92598612714683eab96fecf6e90a9531607e5.tar.gz | |
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".
Diffstat (limited to 'gtk/gtkaspectframe.c')
| -rw-r--r-- | gtk/gtkaspectframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 8eac437807..dbeedcdbaf 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -352,8 +352,7 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame, { GtkRequisition child_requisition; - gtk_size_request_get_size (GTK_SIZE_REQUEST (child), - &child_requisition, NULL); + gtk_widget_get_preferred_size (child, &child_requisition, NULL); if (child_requisition.height != 0) { ratio = ((gdouble) child_requisition.width / |