X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbox.h;h=d51ccf08b6f54701f5853c397348d809d6a09332;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=038c3b1c3a1b35a6b095b8b1a28986973e0190b8;hpb=db76c77b819b1b31e19609bb1b30c85f22b5b482;p=~andy%2Fgtk

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 038c3b1c3..d51ccf08b 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_BOX_H__
 #define __GTK_BOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
@@ -46,61 +44,32 @@ G_BEGIN_DECLS
 #define GTK_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
 
 
-typedef struct _GtkBox	      GtkBox;
-typedef struct _GtkBoxClass   GtkBoxClass;
-typedef struct _GtkBoxChild   GtkBoxChild;
+typedef struct _GtkBox              GtkBox;
+typedef struct _GtkBoxPrivate       GtkBoxPrivate;
+typedef struct _GtkBoxClass         GtkBoxClass;
 
 struct _GtkBox
 {
   GtkContainer container;
 
-  /*< public >*/
-  GList *GSEAL (children);
-  gint16 GSEAL (spacing);
-  guint GSEAL (homogeneous) : 1;
+  /*< private >*/
+  GtkBoxPrivate *priv;
 };
 
 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.
- */
-struct _GtkBoxChild
-{
-  GtkWidget *widget;
-  guint16 padding;
-  guint expand : 1;
-  guint fill : 1;
-  guint pack : 1;
-  guint is_secondary : 1;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
-GtkWidget* _gtk_box_new                 (GtkOrientation  orientation,
-                                         gboolean        homogeneous,
+GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
                                          gint            spacing);
 
 void        gtk_box_pack_start          (GtkBox         *box,
@@ -114,13 +83,6 @@ void        gtk_box_pack_end            (GtkBox         *box,
                                          gboolean        fill,
                                          guint           padding);
 
-#ifndef GTK_DISABLE_DEPRECATED
-void        gtk_box_pack_start_defaults (GtkBox         *box,
-                                         GtkWidget      *widget);
-void        gtk_box_pack_end_defaults   (GtkBox         *box,
-                                         GtkWidget      *widget);
-#endif
-
 void        gtk_box_set_homogeneous     (GtkBox         *box,
                                          gboolean        homogeneous);
 gboolean    gtk_box_get_homogeneous     (GtkBox         *box);
@@ -145,12 +107,6 @@ void        gtk_box_set_child_packing   (GtkBox         *box,
                                          guint           padding,
                                          GtkPackType     pack_type);
 
-/* internal API */
-void        _gtk_box_set_old_defaults   (GtkBox         *box);
-gboolean    _gtk_box_get_spacing_set    (GtkBox         *box);
-void        _gtk_box_set_spacing_set    (GtkBox         *box,
-                                         gboolean        spacing_set);
-
 G_END_DECLS
 
 #endif /* __GTK_BOX_H__ */