X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbox.h;h=3f80117af3cbb485f4d9bf13bdd5db0f70611e47;hb=81c0d11551dd8fb9e84ac21d7cf6094ad54fa238;hp=3110fa3a05edb827e29ed026d47d9c26508e817e;hpb=fe53ab75bb6de7bacd1ee2c212131eaf241bed5a;p=~andy%2Fgtk
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 3110fa3a0..3f80117af 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 .
*/
/*
@@ -24,7 +22,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
@@ -32,7 +30,6 @@
#define __GTK_BOX_H__
-#include
#include
@@ -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__ */