Practically everything changed.

[~andy/gtk] / gtk / gtkbox.h

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 7e9bec260ae5c060173c5c65fe593d1ce025da46..af4921bd6aa99fe51826f4846eb34916c4d9942a 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -1,29 +1,33 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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/.
  */
 
+#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__
 
@@ -32,16 +36,15 @@
 #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_TYPE_BOX            (gtk_box_get_type ())
+#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;
@@ -51,10 +54,11 @@ typedef struct _GtkBoxChild   GtkBoxChild;
 struct _GtkBox
 {
   GtkContainer container;
-  
-  GList *children;
-  gint16 spacing;
-  guint homogeneous : 1;
+
+  /*< public >*/
+  GList *GSEAL (children);
+  gint16 GSEAL (spacing);
+  guint GSEAL (homogeneous) : 1;
 };
 
 struct _GtkBoxClass
@@ -69,10 +73,11 @@ struct _GtkBoxChild
   guint expand : 1;
   guint fill : 1;
   guint pack : 1;
+  guint is_secondary : 1;
 };
 
 
-GtkType           gtk_box_get_type            (void);
+GType     gtk_box_get_type            (void) G_GNUC_CONST;
 void      gtk_box_pack_start          (GtkBox       *box,
                                        GtkWidget    *child,
                                        gboolean      expand,
@@ -89,8 +94,10 @@ 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);
@@ -108,10 +115,7 @@ void          gtk_box_set_child_packing   (GtkBox       *box,
                                        GtkPackType   pack_type);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_BOX_H__ */