[gtk+/gtk-2-22] Deprecate GtkBoxChild

[Matthias Clasen <matthiasc src gnome org>]

commit ef2dc172564a80f87a08aa35a08bbc5e214c532a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 22 00:18:16 2010 -0400

    Deprecate GtkBoxChild
    
    This was discussed in bug 613132.
    
    Conflicts:
    
    	gtk/gtkbox.h

 gtk/gtkbox.h |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 914683b..b09228b 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -48,7 +48,6 @@ G_BEGIN_DECLS
 
 typedef struct _GtkBox	      GtkBox;
 typedef struct _GtkBoxClass   GtkBoxClass;
-typedef struct _GtkBoxChild   GtkBoxChild;
 
 struct _GtkBox
 {
@@ -65,6 +64,32 @@ struct _GtkBoxClass
   GtkContainerClass parent_class;
 };
 
+/**
+ * GtkBoxChild:
+ * @widget: the child widget, packed into the GtkBox.
+ * @padding: the number of extra pixels to put between this child and its
+ *  neighbors, set when packed, zero by default.
+ * @expand: flag indicates whether extra space should be given to this child.
+ *  Any extra space given to the parent GtkBox is divided up among all children
+ *  with this attribute set to %TRUE; set when packed, %TRUE by default.
+ * @fill: flag indicates whether any extra space given to this child due to its
+ *  @expand attribute being set is actually allocated to the child, rather than
+ *  being used as padding around the widget; set when packed, %TRUE by default.
+ * @pack: one of #GtkPackType indicating whether the child is packed with
+ *  reference to the start (top/left) or end (bottom/right) of the GtkBox.
+ * @is_secondary: %TRUE if the child is secondary
+ *
+ * The #GtkBoxChild holds a child widget of #GtkBox and describes how the child
+ * is to be packed into the #GtkBox. All fields of this #GtkBoxChild should be
+ * considered read-only and they should never be set directly by an application.
+ * Use gtk_box_query_child_packing() and gtk_box_set_child_packing() to query
+ * and set the #GtkBoxChild.padding, #GtkBoxChild.expand, #GtkBoxChild.fill and
+ * #GtkBoxChild.pack fields.
+ *
+ * Deprecated: 2.22: Use gtk_container_get_children() instead.
+ */
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+typedef struct _GtkBoxChild   GtkBoxChild;
 struct _GtkBoxChild
 {
   GtkWidget *widget;
@@ -74,7 +99,7 @@ struct _GtkBoxChild
   guint pack : 1;
   guint is_secondary : 1;
 };
-
+#endif
 
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
 GtkWidget* _gtk_box_new                 (GtkOrientation  orientation,