]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtklayout.c
Fix #56586
[~andy/gtk] / gtk / gtklayout.c
index 6e1d163c577f5d43b9e73880e664b7d62a368aea..c28f4a59e1609c2b85433af8d537785b0c49d785 100644 (file)
@@ -33,6 +33,7 @@
 #include "gtklayout.h"
 #include "gtksignal.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 
 typedef struct _GtkLayoutChild   GtkLayoutChild;
 
@@ -42,41 +43,80 @@ struct _GtkLayoutChild {
   gint y;
 };
 
-static void     gtk_layout_class_init         (GtkLayoutClass *class);
-static void     gtk_layout_init               (GtkLayout      *layout);
-
-static void     gtk_layout_finalize           (GObject        *object);
-static void     gtk_layout_realize            (GtkWidget      *widget);
-static void     gtk_layout_unrealize          (GtkWidget      *widget);
-static void     gtk_layout_map                (GtkWidget      *widget);
-static void     gtk_layout_size_request       (GtkWidget      *widget,
-                                              GtkRequisition *requisition);
-static void     gtk_layout_size_allocate      (GtkWidget      *widget,
-                                              GtkAllocation  *allocation);
-static gint     gtk_layout_expose             (GtkWidget      *widget, 
-                                              GdkEventExpose *event);
-
-static void     gtk_layout_remove             (GtkContainer *container, 
-                                              GtkWidget    *widget);
-static void     gtk_layout_forall             (GtkContainer *container,
-                                              gboolean      include_internals,
-                                              GtkCallback   callback,
-                                              gpointer      callback_data);
-static void     gtk_layout_set_adjustments    (GtkLayout     *layout,
-                                              GtkAdjustment *hadj,
-                                              GtkAdjustment *vadj);
-
-static void     gtk_layout_allocate_child     (GtkLayout      *layout,
-                                              GtkLayoutChild *child);
-
-
-static void     gtk_layout_adjustment_changed (GtkAdjustment  *adjustment,
-                                              GtkLayout      *layout);
+enum {
+   PROP_0,
+   PROP_HADJUSTMENT,
+   PROP_VADJUSTMENT,
+   PROP_WIDTH,
+   PROP_HEIGHT
+};
+
+enum {
+  CHILD_PROP_0,
+  CHILD_PROP_X,
+  CHILD_PROP_Y
+};
+
+static void gtk_layout_class_init         (GtkLayoutClass *class);
+static void gtk_layout_get_property       (GObject        *object,
+                                           guint           prop_id,
+                                           GValue         *value,
+                                           GParamSpec     *pspec);
+static void gtk_layout_set_property       (GObject        *object,
+                                           guint           prop_id,
+                                           const GValue   *value,
+                                           GParamSpec     *pspec);
+static void gtk_layout_init               (GtkLayout      *layout);
+static void gtk_layout_finalize           (GObject        *object);
+static void gtk_layout_realize            (GtkWidget      *widget);
+static void gtk_layout_unrealize          (GtkWidget      *widget);
+static void gtk_layout_map                (GtkWidget      *widget);
+static void gtk_layout_size_request       (GtkWidget      *widget,
+                                           GtkRequisition *requisition);
+static void gtk_layout_size_allocate      (GtkWidget      *widget,
+                                           GtkAllocation  *allocation);
+static gint gtk_layout_expose             (GtkWidget      *widget,
+                                           GdkEventExpose *event);
+static void gtk_layout_remove             (GtkContainer   *container,
+                                           GtkWidget      *widget);
+static void gtk_layout_forall             (GtkContainer   *container,
+                                           gboolean        include_internals,
+                                           GtkCallback     callback,
+                                           gpointer        callback_data);
+static void gtk_layout_set_adjustments    (GtkLayout      *layout,
+                                           GtkAdjustment  *hadj,
+                                           GtkAdjustment  *vadj);
+static void gtk_layout_set_child_property (GtkContainer   *container,
+                                           GtkWidget      *child,
+                                           guint           property_id,
+                                           const GValue   *value,
+                                           GParamSpec     *pspec);
+static void gtk_layout_get_child_property (GtkContainer   *container,
+                                           GtkWidget      *child,
+                                           guint           property_id,
+                                           GValue         *value,
+                                           GParamSpec     *pspec);
+static void gtk_layout_allocate_child     (GtkLayout      *layout,
+                                           GtkLayoutChild *child);
+static void gtk_layout_adjustment_changed (GtkAdjustment  *adjustment,
+                                           GtkLayout      *layout);
+
 
 static GtkWidgetClass *parent_class = NULL;
 
 /* Public interface
  */
+/**
+ * gtk_layout_new:
+ * @hadjustment: horizontal scroll adjustment, or %NULL
+ * @vadjustment: vertical scroll adjustment, or %NULL
+ * 
+ * Creates a new #GtkLayout. Unless you have a specific adjustment
+ * you'd like the layout to use for scrolling, pass %NULL for
+ * @hadjustment and @vadjustment.
+ * 
+ * Return value: a new #GtkLayout
+ **/
   
 GtkWidget*    
 gtk_layout_new (GtkAdjustment *hadjustment,
@@ -91,18 +131,42 @@ gtk_layout_new (GtkAdjustment *hadjustment,
   return GTK_WIDGET (layout);
 }
 
+/**
+ * gtk_layout_get_hadjustment:
+ * @layout: a #GtkLayout
+ * 
+ * This function should only be called after the layout has been
+ * placed in a #GtkScrolledWindow or otherwise configured for
+ * scrolling. It returns the #GtkAdjustment used for communication
+ * between the horizontal scrollbar and @layout.
+ *
+ * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
+ * 
+ * Return value: horizontal scroll adjustment
+ **/
 GtkAdjustment* 
 gtk_layout_get_hadjustment (GtkLayout     *layout)
 {
-  g_return_val_if_fail (layout != NULL, NULL);
   g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
 
   return layout->hadjustment;
 }
+/**
+ * gtk_layout_get_vadjustment:
+ * @layout: a #GtkLayout
+ * 
+ * This function should only be called after the layout has been
+ * placed in a #GtkScrolledWindow or otherwise configured for
+ * scrolling. It returns the #GtkAdjustment used for communication
+ * between the vertical scrollbar and @layout.
+ *
+ * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
+ * 
+ * Return value: vertical scroll adjustment
+ **/
 GtkAdjustment* 
 gtk_layout_get_vadjustment (GtkLayout     *layout)
 {
-  g_return_val_if_fail (layout != NULL, NULL);
   g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
 
   return layout->vadjustment;
@@ -115,7 +179,6 @@ gtk_layout_set_adjustments (GtkLayout     *layout,
 {
   gboolean need_adjust = FALSE;
 
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
   if (hadj)
@@ -178,28 +241,78 @@ gtk_layout_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+/**
+ * gtk_layout_set_hadjustment:
+ * @layout: a #GtkLayout
+ * @adjustment: new scroll adjustment
+ *
+ * Sets the horizontal scroll adjustment for the layout.
+ *
+ * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
+ * 
+ **/
 void           
 gtk_layout_set_hadjustment (GtkLayout     *layout,
                            GtkAdjustment *adjustment)
 {
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
   gtk_layout_set_adjustments (layout, adjustment, layout->vadjustment);
+  g_object_notify (G_OBJECT (layout), "hadjustment");
 }
  
-
+/**
+ * gtk_layout_set_vadjustment:
+ * @layout: a #GtkLayout
+ * @adjustment: new scroll adjustment
+ *
+ * Sets the vertical scroll adjustment for the layout.
+ *
+ * See #GtkScrolledWindow, #GtkScrollbar, #GtkAdjustment for details.
+ * 
+ **/
 void           
 gtk_layout_set_vadjustment (GtkLayout     *layout,
                            GtkAdjustment *adjustment)
 {
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
   
   gtk_layout_set_adjustments (layout, layout->hadjustment, adjustment);
+  g_object_notify (G_OBJECT (layout), "vadjustment");
 }
 
+static GtkLayoutChild*
+get_child (GtkLayout  *layout,
+           GtkWidget  *widget)
+{
+  GList *children;
+  
+  children = layout->children;
+  while (children)
+    {
+      GtkLayoutChild *child;
+      
+      child = children->data;
+      children = children->next;
+
+      if (child->widget == widget)
+        return child;
+    }
+
+  return NULL;
+}
 
+/**
+ * gtk_layout_put:
+ * @layout: a #GtkLayout
+ * @child_widget: child widget
+ * @x: X position of child widget
+ * @y: Y position of child widget
+ *
+ * Adds @child_widget to @layout, at position (@x,@y).
+ * @layout becomes the new parent container of @child_widget.
+ * 
+ **/
 void           
 gtk_layout_put (GtkLayout     *layout, 
                GtkWidget     *child_widget, 
@@ -208,9 +321,7 @@ gtk_layout_put (GtkLayout     *layout,
 {
   GtkLayoutChild *child;
 
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
-  g_return_if_fail (child_widget != NULL);
   g_return_if_fail (GTK_IS_WIDGET (child_widget));
   
   child = g_new (GtkLayoutChild, 1);
@@ -221,59 +332,80 @@ gtk_layout_put (GtkLayout     *layout,
 
   layout->children = g_list_append (layout->children, child);
   
-  gtk_widget_set_parent (child_widget, GTK_WIDGET (layout));
   if (GTK_WIDGET_REALIZED (layout))
     gtk_widget_set_parent_window (child->widget, layout->bin_window);
 
-  if (GTK_WIDGET_REALIZED (layout))
-    gtk_widget_realize (child_widget);
-    
-  if (GTK_WIDGET_VISIBLE (layout) && GTK_WIDGET_VISIBLE (child_widget))
+  gtk_widget_set_parent (child_widget, GTK_WIDGET (layout));
+}
+
+static void
+gtk_layout_move_internal (GtkLayout       *layout,
+                          GtkWidget       *widget,
+                          gboolean         change_x,
+                          gint             x,
+                          gboolean         change_y,
+                          gint             y)
+{
+  GtkLayoutChild *child;
+  
+  g_return_if_fail (GTK_IS_LAYOUT (layout));
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (widget->parent == GTK_WIDGET (layout));  
+  
+  child = get_child (layout, widget);
+
+  g_assert (child);
+
+  gtk_widget_freeze_child_notify (widget);
+  
+  if (change_x)
     {
-      if (GTK_WIDGET_MAPPED (layout))
-       gtk_widget_map (child_widget);
+      child->x = x;
+      gtk_widget_child_notify (widget, "x");
+    }
 
-      gtk_widget_queue_resize (child_widget);
+  if (change_y)
+    {
+      child->y = y;
+      gtk_widget_child_notify (widget, "y");
     }
+
+  gtk_widget_thaw_child_notify (widget);
+  
+  if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (layout))
+    gtk_widget_queue_resize (GTK_WIDGET (layout));
 }
 
+/**
+ * gtk_layout_move:
+ * @layout: a #GtkLayout
+ * @child_widget: a current child of @layout
+ * @x: X position to move to
+ * @y: Y position to move to
+ *
+ * Moves a current child of @layout to a new position.
+ * 
+ **/
 void           
 gtk_layout_move (GtkLayout     *layout, 
                 GtkWidget     *child_widget, 
                 gint           x, 
                 gint           y)
 {
-  GList *tmp_list;
-  GtkLayoutChild *child;
-  
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
+  g_return_if_fail (GTK_IS_WIDGET (child_widget));
+  g_return_if_fail (child_widget->parent == GTK_WIDGET (layout));  
 
-  tmp_list = layout->children;
-  while (tmp_list)
-    {
-      child = tmp_list->data;
-      tmp_list = tmp_list->next;
-
-      if (child->widget == child_widget)
-       {
-         child->x = x;
-         child->y = y;
-
-         if (GTK_WIDGET_VISIBLE (child_widget) && GTK_WIDGET_VISIBLE (layout))
-           gtk_widget_queue_resize (child_widget);
-
-         return;
-       }
-    }
+  gtk_layout_move_internal (layout, child_widget, TRUE, x, TRUE, y);
 }
 
 static void
-gtk_layout_set_adjustment_upper (GtkAdjustment *adj, gfloat upper)
+gtk_layout_set_adjustment_upper (GtkAdjustment *adj,
+                                gdouble        upper)
 {
   if (upper != adj->upper)
     {
-      gfloat min = MAX (0., upper - adj->page_size);
+      gdouble min = MAX (0., upper - adj->page_size);
       gboolean value_changed = FALSE;
       
       adj->upper = upper;
@@ -290,6 +422,15 @@ gtk_layout_set_adjustment_upper (GtkAdjustment *adj, gfloat upper)
     }
 }
 
+/**
+ * gtk_layout_set_size:
+ * @layout: a #GtkLayout
+ * @width: width of entire scrollable area
+ * @height: height of entire scrollable area
+ *
+ * Sets the size of the scrollable area of the layout.
+ * 
+ **/
 void
 gtk_layout_set_size (GtkLayout     *layout, 
                     guint          width,
@@ -297,13 +438,22 @@ gtk_layout_set_size (GtkLayout     *layout,
 {
   GtkWidget *widget;
   
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
   widget = GTK_WIDGET (layout);
   
-  layout->width = width;
-  layout->height = height;
+  g_object_freeze_notify (G_OBJECT (layout));
+  if (width != layout->width)
+     {
+       layout->width = width;
+       g_object_notify (G_OBJECT (layout), "width");
+     }
+  if (height != layout->height)
+     {
+       layout->height = height;
+       g_object_notify (G_OBJECT (layout), "height");
+     }
+  g_object_thaw_notify (G_OBJECT (layout));
 
   gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width);
   gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height);
@@ -316,19 +466,52 @@ gtk_layout_set_size (GtkLayout     *layout,
     }
 }
 
+/**
+ * gtk_layout_get_size:
+ * @layout: a #GtkLayout
+ * @width: location to store the width set on @layout, or %NULL
+ * @height: location to store the height set on @layout, or %NULL
+ *
+ * Gets the size that has been set on the layout, and that determines
+ * the total extents of the layout's scrollbar area. See
+ * gtk_layout_set_size ().
+ **/
+void
+gtk_layout_get_size (GtkLayout *layout,
+                    guint     *width,
+                    guint     *height)
+{
+  g_return_if_fail (GTK_IS_LAYOUT (layout));
+
+  if (width)
+    *width = layout->width;
+  if (height)
+    *height = layout->height;
+}
+
+/**
+ * gtk_layout_freeze:
+ * @layout: a #GtkLayout
+ * 
+ * This is a deprecated function, it doesn't do anything useful.
+ **/
 void
 gtk_layout_freeze (GtkLayout *layout)
 {
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
   layout->freeze_count++;
 }
 
+/**
+ * gtk_layout_thaw:
+ * @layout: a #GtkLayout
+ * 
+ * This is a deprecated function, it doesn't do anything useful.
+ **/
 void
 gtk_layout_thaw (GtkLayout *layout)
 {
-  g_return_if_fail (layout != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (layout));
 
   if (layout->freeze_count)
@@ -367,19 +550,79 @@ gtk_layout_get_type (void)
 static void
 gtk_layout_class_init (GtkLayoutClass *class)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  GObjectClass *gobject_class;
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
+  gobject_class = (GObjectClass*) class;
   object_class = (GtkObjectClass*) class;
   widget_class = (GtkWidgetClass*) class;
   container_class = (GtkContainerClass*) class;
 
   parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
 
+  gobject_class->set_property = gtk_layout_set_property;
+  gobject_class->get_property = gtk_layout_get_property;
   gobject_class->finalize = gtk_layout_finalize;
 
+  container_class->set_child_property = gtk_layout_set_child_property;
+  container_class->get_child_property = gtk_layout_get_child_property;
+
+  gtk_container_class_install_child_property (container_class,
+                                             CHILD_PROP_X,
+                                             g_param_spec_int ("x",
+                                                                _("X position"),
+                                                                _("X position of child widget"),
+                                                                G_MININT,
+                                                                G_MAXINT,
+                                                                0,
+                                                                G_PARAM_READWRITE));
+
+  gtk_container_class_install_child_property (container_class,
+                                             CHILD_PROP_Y,
+                                             g_param_spec_int ("y",
+                                                                _("Y position"),
+                                                                _("Y position of child widget"),
+                                                                G_MININT,
+                                                                G_MAXINT,
+                                                                0,
+                                                                G_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                  PROP_HADJUSTMENT,
+                                  g_param_spec_object ("hadjustment",
+                                                       _("Horizontal adjustment"),
+                                                       _("The GtkAdjustment for the horizontal position."),
+                                                       GTK_TYPE_ADJUSTMENT,
+                                                       G_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                  PROP_VADJUSTMENT,
+                                  g_param_spec_object ("vadjustment",
+                                                       _("Vertical adjustment"),
+                                                       _("The GtkAdjustment for the vertical position."),
+                                                       GTK_TYPE_ADJUSTMENT,
+                                                       G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                  PROP_WIDTH,
+                                  g_param_spec_uint ("width",
+                                                    _("Width"),
+                                                    _("The width of the layout."),
+                                                    0,
+                                                    G_MAXINT,
+                                                    100,
+                                                    G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                  PROP_HEIGHT,
+                                  g_param_spec_uint ("height",
+                                                    _("Height"),
+                                                    _("The height of the layout."),
+                                                    0,
+                                                    G_MAXINT,
+                                                    100,
+                                                    G_PARAM_READWRITE));
   widget_class->realize = gtk_layout_realize;
   widget_class->unrealize = gtk_layout_unrealize;
   widget_class->map = gtk_layout_map;
@@ -401,6 +644,118 @@ gtk_layout_class_init (GtkLayoutClass *class)
                    GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
 }
 
+static void
+gtk_layout_get_property (GObject     *object,
+                        guint        prop_id,
+                        GValue      *value,
+                        GParamSpec  *pspec)
+{
+  GtkLayout *layout = GTK_LAYOUT (object);
+  
+  switch (prop_id)
+    {
+    case PROP_HADJUSTMENT:
+      g_value_set_object (value, G_OBJECT (layout->hadjustment));
+      break;
+    case PROP_VADJUSTMENT:
+      g_value_set_object (value, G_OBJECT (layout->vadjustment));
+      break;
+    case PROP_WIDTH:
+      g_value_set_uint (value, layout->width);
+      break;
+    case PROP_HEIGHT:
+      g_value_set_uint (value, layout->height);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_layout_set_property (GObject      *object,
+                        guint         prop_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GtkLayout *layout = GTK_LAYOUT (object);
+  
+  switch (prop_id)
+    {
+    case PROP_HADJUSTMENT:
+      gtk_layout_set_hadjustment (layout, 
+                                 (GtkAdjustment*) g_value_get_object (value));
+      break;
+    case PROP_VADJUSTMENT:
+      gtk_layout_set_vadjustment (layout, 
+                                 (GtkAdjustment*) g_value_get_object (value));
+      break;
+    case PROP_WIDTH:
+      gtk_layout_set_size (layout, g_value_get_uint (value),
+                          layout->height);
+      break;
+    case PROP_HEIGHT:
+      gtk_layout_set_size (layout, layout->width,
+                          g_value_get_uint (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_layout_set_child_property (GtkContainer    *container,
+                               GtkWidget       *child,
+                               guint            property_id,
+                               const GValue    *value,
+                               GParamSpec      *pspec)
+{
+  switch (property_id)
+    {
+    case CHILD_PROP_X:
+      gtk_layout_move_internal (GTK_LAYOUT (container),
+                                child,
+                                TRUE, g_value_get_int (value),
+                                FALSE, 0);
+      break;
+    case CHILD_PROP_Y:
+      gtk_layout_move_internal (GTK_LAYOUT (container),
+                                child,
+                                FALSE, 0,
+                                TRUE, g_value_get_int (value));
+      break;
+    default:
+      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_layout_get_child_property (GtkContainer *container,
+                               GtkWidget    *child,
+                               guint         property_id,
+                               GValue       *value,
+                               GParamSpec   *pspec)
+{
+  GtkLayoutChild *layout_child;
+
+  layout_child = get_child (GTK_LAYOUT (container), child);
+  
+  switch (property_id)
+    {
+    case CHILD_PROP_X:
+      g_value_set_int (value, layout_child->x);
+      break;
+    case CHILD_PROP_Y:
+      g_value_set_int (value, layout_child->y);
+      break;
+    default:
+      GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+      break;
+    }
+}
+
 static void
 gtk_layout_init (GtkLayout *layout)
 {
@@ -432,7 +787,6 @@ gtk_layout_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   layout = GTK_LAYOUT (widget);
@@ -485,7 +839,6 @@ gtk_layout_map (GtkWidget *widget)
   GList *tmp_list;
   GtkLayout *layout;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   layout = GTK_LAYOUT (widget);
@@ -514,7 +867,6 @@ gtk_layout_unrealize (GtkWidget *widget)
 {
   GtkLayout *layout;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   layout = GTK_LAYOUT (widget);
@@ -534,7 +886,6 @@ gtk_layout_size_request (GtkWidget     *widget,
   GList *tmp_list;
   GtkLayout *layout;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   layout = GTK_LAYOUT (widget);
@@ -562,7 +913,6 @@ gtk_layout_size_allocate (GtkWidget     *widget,
   GList *tmp_list;
   GtkLayout *layout;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (widget));
 
   widget->allocation = *allocation;
@@ -608,7 +958,6 @@ gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
 {
   GtkLayout *layout;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
 
   layout = GTK_LAYOUT (widget);
@@ -631,7 +980,6 @@ gtk_layout_remove (GtkContainer *container,
   GtkLayout *layout;
   GtkLayoutChild *child = NULL;
   
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (container));
   
   layout = GTK_LAYOUT (container);
@@ -665,7 +1013,6 @@ gtk_layout_forall (GtkContainer *container,
   GtkLayoutChild *child;
   GList *tmp_list;
 
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_LAYOUT (container));
   g_return_if_fail (callback != NULL);