X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbox.h;h=d51ccf08b6f54701f5853c397348d809d6a09332;hb=a89d420270d1a856e072ed87c365b0176f102e6c;hp=af4921bd6aa99fe51826f4846eb34916c4d9942a;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index af4921bd6..d51ccf08b 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -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,15 +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__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
@@ -47,75 +44,69 @@ 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;
-};
 
-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;
-void	   gtk_box_pack_start	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_end	       (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding);
-void	   gtk_box_pack_start_defaults (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_pack_end_defaults   (GtkBox	     *box,
-					GtkWidget    *widget);
-void	   gtk_box_set_homogeneous     (GtkBox	     *box,
-					gboolean      homogeneous);
-gboolean   gtk_box_get_homogeneous     (GtkBox	     *box);
-void	   gtk_box_set_spacing	       (GtkBox	     *box,
-					gint	      spacing);
-gint       gtk_box_get_spacing         (GtkBox       *box);
-void	   gtk_box_reorder_child       (GtkBox	     *box,
-					GtkWidget    *child,
-					gint	      position);
-void	   gtk_box_query_child_packing (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean     *expand,
-					gboolean     *fill,
-					guint	     *padding,
-					GtkPackType  *pack_type);
-void	   gtk_box_set_child_packing   (GtkBox	     *box,
-					GtkWidget    *child,
-					gboolean      expand,
-					gboolean      fill,
-					guint	      padding,
-					GtkPackType   pack_type);
-
+GType       gtk_box_get_type            (void) G_GNUC_CONST;
+GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
+                                         gint            spacing);
+
+void        gtk_box_pack_start          (GtkBox         *box,
+                                         GtkWidget      *child,
+                                         gboolean        expand,
+                                         gboolean        fill,
+                                         guint           padding);
+void        gtk_box_pack_end            (GtkBox         *box,
+                                         GtkWidget      *child,
+                                         gboolean        expand,
+                                         gboolean        fill,
+                                         guint           padding);
+
+void        gtk_box_set_homogeneous     (GtkBox         *box,
+                                         gboolean        homogeneous);
+gboolean    gtk_box_get_homogeneous     (GtkBox         *box);
+void        gtk_box_set_spacing         (GtkBox         *box,
+                                         gint            spacing);
+gint        gtk_box_get_spacing         (GtkBox         *box);
+
+void        gtk_box_reorder_child       (GtkBox         *box,
+                                         GtkWidget      *child,
+                                         gint            position);
+
+void        gtk_box_query_child_packing (GtkBox         *box,
+                                         GtkWidget      *child,
+                                         gboolean       *expand,
+                                         gboolean       *fill,
+                                         guint          *padding,
+                                         GtkPackType    *pack_type);
+void        gtk_box_set_child_packing   (GtkBox         *box,
+                                         GtkWidget      *child,
+                                         gboolean        expand,
+                                         gboolean        fill,
+                                         guint           padding,
+                                         GtkPackType     pack_type);
 
 G_END_DECLS
 
-
 #endif /* __GTK_BOX_H__ */