Increment page sequence before print of the page, not after

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

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 89073858b2a3d6131ecd9dbd689d9de4e636c4d4..b06e845d9fe9c115693fb36bc82c9fd08de60911 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -17,10 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#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_TREE_VIEW_COLUMN_H__
 #define __GTK_TREE_VIEW_COLUMN_H__
 
-#include <glib-object.h>
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
@@ -55,56 +58,56 @@ typedef void (* GtkTreeCellDataFunc) (GtkTreeViewColumn *tree_column,
                                      GtkTreeIter       *iter,
                                      gpointer           data);
 
-  
+
 struct _GtkTreeViewColumn
 {
   GtkObject parent;
 
-  GtkWidget *tree_view;
-  GtkWidget *button;
-  GtkWidget *child;  
-  GtkWidget *arrow;
-  GtkWidget *alignment;
-  GdkWindow *window;
-  GtkCellEditable *editable_widget;
-  gfloat xalign;
-  guint property_changed_signal;
-  gint spacing;
+  GtkWidget *GSEAL (tree_view);
+  GtkWidget *GSEAL (button);
+  GtkWidget *GSEAL (child);
+  GtkWidget *GSEAL (arrow);
+  GtkWidget *GSEAL (alignment);
+  GdkWindow *GSEAL (window);
+  GtkCellEditable *GSEAL (editable_widget);
+  gfloat GSEAL (xalign);
+  guint GSEAL (property_changed_signal);
+  gint GSEAL (spacing);
 
   /* Sizing fields */
   /* see gtk+/doc/tree-column-sizing.txt for more information on them */
-  GtkTreeViewColumnSizing column_type;
-  gint requested_width;
-  gint button_request;
-  gint resized_width;
-  gint width;
-  gint fixed_width;
-  gint min_width;
-  gint max_width;
+  GtkTreeViewColumnSizing GSEAL (column_type);
+  gint GSEAL (requested_width);
+  gint GSEAL (button_request);
+  gint GSEAL (resized_width);
+  gint GSEAL (width);
+  gint GSEAL (fixed_width);
+  gint GSEAL (min_width);
+  gint GSEAL (max_width);
 
   /* dragging columns */
-  gint drag_x;
-  gint drag_y;
+  gint GSEAL (drag_x);
+  gint GSEAL (drag_y);
 
-  gchar *title;
-  GList *cell_list;
+  gchar *GSEAL (title);
+  GList *GSEAL (cell_list);
 
   /* Sorting */
-  guint sort_clicked_signal;
-  guint sort_column_changed_signal;
-  gint sort_column_id;
-  GtkSortType sort_order;
+  guint GSEAL (sort_clicked_signal);
+  guint GSEAL (sort_column_changed_signal);
+  gint GSEAL (sort_column_id);
+  GtkSortType GSEAL (sort_order);
 
   /* Flags */
-  guint visible             : 1;
-  guint resizable           : 1;
-  guint clickable           : 1;
-  guint dirty               : 1;
-  guint show_sort_indicator : 1;
-  guint maybe_reordered     : 1;
-  guint reorderable         : 1;
-  guint use_resized_width   : 1;
-  guint expand              : 1;
+  guint GSEAL (visible)             : 1;
+  guint GSEAL (resizable)           : 1;
+  guint GSEAL (clickable)           : 1;
+  guint GSEAL (dirty)               : 1;
+  guint GSEAL (show_sort_indicator) : 1;
+  guint GSEAL (maybe_reordered)     : 1;
+  guint GSEAL (reorderable)         : 1;
+  guint GSEAL (use_resized_width)   : 1;
+  guint GSEAL (expand)              : 1;
 };
 
 struct _GtkTreeViewColumnClass
@@ -132,7 +135,9 @@ void                    gtk_tree_view_column_pack_end            (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
 void                    gtk_tree_view_column_clear               (GtkTreeViewColumn       *tree_column);
+#ifndef GTK_DISABLE_DEPRECATED
 GList                  *gtk_tree_view_column_get_cell_renderers  (GtkTreeViewColumn       *tree_column);
+#endif
 void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  const gchar             *attribute,
@@ -144,7 +149,7 @@ void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  GtkTreeCellDataFunc      func,
                                                                  gpointer                 func_data,
-                                                                 GtkDestroyNotify         destroy);
+                                                                 GDestroyNotify           destroy);
 void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer);
 void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,
@@ -238,4 +243,3 @@ G_END_DECLS
 
 
 #endif /* __GTK_TREE_VIEW_COLUMN_H__ */
-