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

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index b6de573f5..d51ccf08b 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -12,108 +12,101 @@
  * 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/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #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>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_BOX            (gtk_box_get_type ())
-#define GTK_BOX(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_BOX, GtkBox))
-#define GTK_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
-#define GTK_IS_BOX(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_BOX))
-#define GTK_IS_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
-#define GTK_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BOX, GtkBoxClass))
+#define GTK_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX, GtkBox))
+#define GTK_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX, GtkBoxClass))
+#define GTK_IS_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX))
+#define GTK_IS_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX))
+#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;
-  
-  GList *children;
-  gint16 spacing;
-  guint 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;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType	   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);
-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);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+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__ */