X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellareabox.h;h=854faa0fe3725b8b17274acb8027338c8d01182a;hb=bb3c56abe2e7916126bd4f8234dee080b5381941;hp=1913995ce4437f8b169cd8e04f3cbcd8f3125e79;hpb=8679563247f6a20633ceba7fc26171b1085bb681;p=~andy%2Fgtk

diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 1913995ce..854faa0fe 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -16,26 +16,24 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  */
 
+#ifndef __GTK_CELL_AREA_BOX_H__
+#define __GTK_CELL_AREA_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_BOX_H__
-#define __GTK_CELL_AREA_BOX_H__
-
 #include <gtk/gtkcellarea.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CELL_AREA_BOX		  (gtk_cell_area_box_get_type ())
-#define GTK_CELL_AREA_BOX(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_AREA_BOX, GtkCellAreaBox))
-#define GTK_CELL_AREA_BOX_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_AREA_BOX, GtkCellAreaBoxClass))
-#define GTK_IS_CELL_AREA_BOX(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_AREA_BOX))
+#define GTK_TYPE_CELL_AREA_BOX            (gtk_cell_area_box_get_type ())
+#define GTK_CELL_AREA_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_AREA_BOX, GtkCellAreaBox))
+#define GTK_CELL_AREA_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_AREA_BOX, GtkCellAreaBoxClass))
+#define GTK_IS_CELL_AREA_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_AREA_BOX))
 #define GTK_IS_CELL_AREA_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_AREA_BOX))
 #define GTK_CELL_AREA_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_AREA_BOX, GtkCellAreaBoxClass))
 
@@ -45,6 +43,7 @@ typedef struct _GtkCellAreaBoxPrivate       GtkCellAreaBoxPrivate;
 
 struct _GtkCellAreaBox
 {
+  /*< private >*/
   GtkCellArea parent_instance;
 
   GtkCellAreaBoxPrivate *priv;
@@ -52,9 +51,9 @@ struct _GtkCellAreaBox
 
 struct _GtkCellAreaBoxClass
 {
+  /*< private >*/
   GtkCellAreaClass parent_class;
 
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -62,15 +61,26 @@ struct _GtkCellAreaBoxClass
   void (*_gtk_reserved4) (void);
 };
 
-GType              gtk_cell_area_box_get_type    (void) G_GNUC_CONST;
+GType        gtk_cell_area_box_get_type    (void) G_GNUC_CONST;
+
+GtkCellArea *gtk_cell_area_box_new         (void);
+void         gtk_cell_area_box_pack_start  (GtkCellAreaBox  *box,
+                                            GtkCellRenderer *renderer,
+                                            gboolean         expand,
+                                            gboolean         align,
+                                            gboolean         fixed);
+void         gtk_cell_area_box_pack_end    (GtkCellAreaBox  *box,
+                                            GtkCellRenderer *renderer,
+                                            gboolean         expand,
+                                            gboolean         align,
+                                            gboolean         fixed);
+gint         gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box);
+void         gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
+                                            gint             spacing);
 
-GtkCellArea       *gtk_cell_area_box_new         (void);
-void               gtk_cell_area_box_pack_start  (GtkCellAreaBox  *box,
-						  GtkCellRenderer *renderer,
-						  gboolean         expand);
-void               gtk_cell_area_box_pack_end    (GtkCellAreaBox  *box,
-						  GtkCellRenderer *renderer,
-						  gboolean         expand);
+/* Private interaction with GtkCellAreaBoxContext */
+gboolean    _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
+                                              gint             group_idx);
 
 G_END_DECLS