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/gtksizegroup.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/gtksizegroup.c')
| -rw-r--r-- | gtk/gtksizegroup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 9116a18d10..f22f146e1a 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -25,7 +25,6 @@ #include "gtkprivate.h" #include "gtksizegroup.h" #include "gtkbuildable.h" -#include "gtksizerequest.h" @@ -717,9 +716,9 @@ compute_dimension (GtkWidget *widget, else { if (mode == GTK_SIZE_GROUP_HORIZONTAL) - gtk_size_request_get_width (GTK_SIZE_REQUEST (tmp_widget), &min_dimension, &nat_dimension); + gtk_widget_get_preferred_width (tmp_widget, &min_dimension, &nat_dimension); else - gtk_size_request_get_height (GTK_SIZE_REQUEST (tmp_widget), &min_dimension, &nat_dimension); + gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension); } if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden) @@ -778,7 +777,7 @@ compute_dimension (GtkWidget *widget, * * This function is used both to update sizegroup minimum and natural size * information and widget minimum and natural sizes in multiple passes from - * the #GtkSizeRequest apis. + * the size request apis. */ void _gtk_size_group_bump_requisition (GtkWidget *widget, |