diff options
author | Tim Janik <timj@src.gnome.org> | 2008-06-20 11:09:56 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2008-06-20 11:09:56 +0000 |
commit | 886ffbe067c0009a77d5f7b350b972dcdeb69ad6 (patch) | |
tree | 6610293f11e48ed3dc8cd3c7dd8ddd43f6db994e | |
parent | cd19149ad5033e403171229afa0fb569802e62a2 (diff) | |
download | gdk-pixbuf-886ffbe067c0009a77d5f7b350b972dcdeb69ad6.tar.gz |
Fix gtk_widget_get_allocation
svn path=/trunk/; revision=20622
-rw-r--r-- | gtk/gtkwidget.c | 18 | ||||
-rw-r--r-- | gtk/gtkwidget.h | 3 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 30560ba8f..790d244b9 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -9890,19 +9890,23 @@ gtk_widget_get_has_tooltip (GtkWidget *widget) /** * gtk_widget_get_allocation: * @widget: a #GtkWidget + * @allocation: a #GtkAllocation * - * Returns the widget's allocation as provided by its parent. - * - * Return value: current allocation of @widget. + * Fills @allocation with the widget's allocation as provided by its parent. * * Since: GSEAL-branch */ -GtkAllocation -gtk_widget_get_allocation (GtkWidget *widget) +void +gtk_widget_get_allocation (GtkWidget *widget, + GtkAllocation *allocation) { - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (allocation != NULL); - return widget->allocation; + allocation->x = widget->allocation.x; + allocation->y = widget->allocation.y; + allocation->width = widget->allocation.width; + allocation->height = widget->allocation.height; } /** diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 596b8eeac..cbf070e03 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -572,7 +572,8 @@ void gtk_widget_set_parent_window (GtkWidget *widget, void gtk_widget_set_child_visible (GtkWidget *widget, gboolean is_visible); gboolean gtk_widget_get_child_visible (GtkWidget *widget); -GtkAllocation gtk_widget_get_allocation (GtkWidget *widget); +void gtk_widget_get_allocation (GtkWidget *widget, + GtkAllocation*allocation); GdkWindow* gtk_widget_get_window (GtkWidget *widget); GtkWidget *gtk_widget_get_parent (GtkWidget *widget); |