Fix gtk_widget_get_allocation

svn path=/trunk/; revision=20622

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 30560ba8f1f21b673c0a9dc10284d1ddd83675aa..790d244b9b61e51d089f72e93a05da256fe7ca50 100644 (file)
--- 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 596b8eeac4d007d5696f5f260040dbd9801b9abd..cbf070e034dfa346be1745855956ba286a5651bf 100644 (file)
--- 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);