Welcome _gtk_tree_view_column_get_cell_at_pos to the second dimension

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

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 5a0af05f9f575ac4b704145323a58f853b81eab6..bb5910c5e91183844a464617ff3ca9f4cb8f2b9c 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -17,20 +17,25 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_TREE_MODEL_SORT_H__
 #define __GTK_TREE_MODEL_SORT_H__
 
+#include <gdkconfig.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
 G_BEGIN_DECLS
 
 #define GTK_TYPE_TREE_MODEL_SORT                       (gtk_tree_model_sort_get_type ())
-#define GTK_TREE_MODEL_SORT(obj)                       (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
-#define GTK_TREE_MODEL_SORT_CLASS(klass)               (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
-#define GTK_IS_TREE_MODEL_SORT(obj)                    (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_IS_TREE_MODEL_SORT_CLASS(klass)            (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_MODEL_SORT))
-#define GTK_TREE_MODEL_SORT_GET_CLASS(obj)              (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
+#define GTK_TREE_MODEL_SORT(obj)                       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSort))
+#define GTK_TREE_MODEL_SORT_CLASS(klass)               (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
+#define GTK_IS_TREE_MODEL_SORT(obj)                    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_SORT))
+#define GTK_IS_TREE_MODEL_SORT_CLASS(klass)            (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_MODEL_SORT))
+#define GTK_TREE_MODEL_SORT_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_SORT, GtkTreeModelSortClass))
 
 typedef struct _GtkTreeModelSort       GtkTreeModelSort;
 typedef struct _GtkTreeModelSortClass  GtkTreeModelSortClass;
@@ -40,28 +45,28 @@ struct _GtkTreeModelSort
   GObject parent;
 
   /* < private > */
-  gpointer root;
-  gint stamp;
-  guint child_flags;
-  GtkTreeModel *child_model;
-  gint zero_ref_count;
+  gpointer GSEAL (root);
+  gint GSEAL (stamp);
+  guint GSEAL (child_flags);
+  GtkTreeModel *GSEAL (child_model);
+  gint GSEAL (zero_ref_count);
 
   /* sort information */
-  GList *sort_list;
-  gint sort_column_id;
-  GtkSortType order;
+  GList *GSEAL (sort_list);
+  gint GSEAL (sort_column_id);
+  GtkSortType GSEAL (order);
 
   /* default sort */
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
+  GtkTreeIterCompareFunc GSEAL (default_sort_func);
+  gpointer GSEAL (default_sort_data);
+  GDestroyNotify GSEAL (default_sort_destroy);
 
   /* signal ids */
-  guint changed_id;
-  guint inserted_id;
-  guint has_child_toggled_id;
-  guint deleted_id;
-  guint reordered_id;
+  gulong GSEAL (changed_id);
+  gulong GSEAL (inserted_id);
+  gulong GSEAL (has_child_toggled_id);
+  gulong GSEAL (deleted_id);
+  gulong GSEAL (reordered_id);
 };
 
 struct _GtkTreeModelSortClass
@@ -82,7 +87,7 @@ GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *
 GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
 GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreePath      *child_path);
-void          gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
+gboolean      gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sort,
                                                              GtkTreeIter      *sort_iter,
                                                              GtkTreeIter      *child_iter);
 GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,