Fix includes

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

diff --git a/gtk/gtkcellareaboxcontextprivate.h b/gtk/gtkcellareaboxcontextprivate.h
index d586cc341a15954f6d4fa381ff0056f43ae9c4ed..5feb7e6313fb5825fa2f9b50027d32c5b2dd28ed 100644 (file)
--- a/gtk/gtkcellareaboxcontextprivate.h
+++ b/gtk/gtkcellareaboxcontextprivate.h
@@ -16,18 +16,16 @@
  * 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_CONTEXT_H__
+#define __GTK_CELL_AREA_BOX_CONTEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_BOX_CONTEXT_H__
-#define __GTK_CELL_AREA_BOX_CONTEXT_H__
-
 #include <gtk/gtkcellareacontext.h>
 #include <gtk/gtkcellareabox.h>
 #include <gtk/gtkcellrenderer.h>
@@ -35,7 +33,7 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CELL_AREA_BOX_CONTEXT            (gtk_cell_area_box_context_get_type ())
+#define GTK_TYPE_CELL_AREA_BOX_CONTEXT            (_gtk_cell_area_box_context_get_type ())
 #define GTK_CELL_AREA_BOX_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_AREA_BOX_CONTEXT, GtkCellAreaBoxContext))
 #define GTK_CELL_AREA_BOX_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_AREA_BOX_CONTEXT, GtkCellAreaBoxContextClass))
 #define GTK_IS_CELL_AREA_BOX_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_AREA_BOX_CONTEXT))
@@ -59,68 +57,68 @@ struct _GtkCellAreaBoxContextClass
 
 };
 
-GType   gtk_cell_area_box_context_get_type                     (void) G_GNUC_CONST;
+GType   _gtk_cell_area_box_context_get_type                     (void) G_GNUC_CONST;
 
 
 /* Create a duplicate of the context */
-GtkCellAreaBoxContext *gtk_cell_area_box_context_copy          (GtkCellAreaBox        *box,
+GtkCellAreaBoxContext *_gtk_cell_area_box_context_copy          (GtkCellAreaBox        *box,
                                                                 GtkCellAreaBoxContext *box_context);
 
 /* Initialize group array dimensions */
-void    gtk_cell_area_box_init_groups                          (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_init_groups                         (GtkCellAreaBoxContext *box_context,
                                                                 guint                  n_groups,
                                                                 gboolean              *expand_groups,
-                                                               gboolean              *align_groups);
+                                                                gboolean              *align_groups);
 
 /* Update cell-group sizes */
-void    gtk_cell_area_box_context_push_group_width             (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_push_group_width             (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   minimum_width,
                                                                 gint                   natural_width);
 
-void    gtk_cell_area_box_context_push_group_height_for_width  (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_push_group_height_for_width  (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   for_width,
                                                                 gint                   minimum_height,
                                                                 gint                   natural_height);
 
-void    gtk_cell_area_box_context_push_group_height            (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_push_group_height            (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   minimum_height,
                                                                 gint                   natural_height);
 
-void    gtk_cell_area_box_context_push_group_width_for_height  (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_push_group_width_for_height  (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   for_height,
                                                                 gint                   minimum_width,
                                                                 gint                   natural_width);
 
 /* Fetch cell-group sizes */
-void    gtk_cell_area_box_context_get_group_width              (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_get_group_width              (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                  *minimum_width,
                                                                 gint                  *natural_width);
 
-void    gtk_cell_area_box_context_get_group_height_for_width   (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_get_group_height_for_width   (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   for_width,
                                                                 gint                  *minimum_height,
                                                                 gint                  *natural_height);
 
-void    gtk_cell_area_box_context_get_group_height             (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_get_group_height             (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                  *minimum_height,
                                                                 gint                  *natural_height);
 
-void    gtk_cell_area_box_context_get_group_width_for_height   (GtkCellAreaBoxContext *box_context,
+void    _gtk_cell_area_box_context_get_group_width_for_height   (GtkCellAreaBoxContext *box_context,
                                                                 gint                   group_idx,
                                                                 gint                   for_height,
                                                                 gint                  *minimum_width,
                                                                 gint                  *natural_width);
 
-GtkRequestedSize *gtk_cell_area_box_context_get_widths         (GtkCellAreaBoxContext *box_context,
+GtkRequestedSize *_gtk_cell_area_box_context_get_widths         (GtkCellAreaBoxContext *box_context,
                                                                 gint                  *n_widths);
-GtkRequestedSize *gtk_cell_area_box_context_get_heights        (GtkCellAreaBoxContext *box_context,
+GtkRequestedSize *_gtk_cell_area_box_context_get_heights        (GtkCellAreaBoxContext *box_context,
                                                                 gint                  *n_heights);
 
 /* Private context/area interaction */
@@ -131,7 +129,7 @@ typedef struct {
 } GtkCellAreaBoxAllocation;
 
 GtkCellAreaBoxAllocation *
-gtk_cell_area_box_context_get_orientation_allocs (GtkCellAreaBoxContext *context,
+_gtk_cell_area_box_context_get_orientation_allocs (GtkCellAreaBoxContext *context,
                                                   gint                  *n_allocs);
 
 G_END_DECLS