Use the correct screen for getting the height. (Fix from Stephen Browne,

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

diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 01366e6cb73e9f82d51aa33fe8be51cfc2cf3baa..bfd24e90b955b43df0f7390832596fca70dfc1c6 100644 (file)
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -21,74 +21,81 @@
 #define __GTK_TREE_MODEL_SORT_H__
 
 #include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+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 ((obj), GTK_TYPE_TREE_MODEL_SORT))
+#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;
 
-typedef gint (* GValueCompareFunc) (const GValue *a,
-                                   const GValue *b);
-
 struct _GtkTreeModelSort
 {
-  GtkObject parent;
+  GObject parent;
 
   /* < private > */
   gpointer root;
   gint stamp;
-  guint flags;
-  GtkTreeModel *model;
-  gint sort_col;
-  GValueCompareFunc *func;
+  guint child_flags;
+  GtkTreeModel *child_model;
+  gint zero_ref_count;
+
+  /* sort information */
+  GList *sort_list;
+  gint sort_column_id;
+  GtkSortType order;
+
+  /* default sort */
+  GtkTreeIterCompareFunc default_sort_func;
+  gpointer default_sort_data;
+  GtkDestroyNotify default_sort_destroy;
+
+  /* signal ids */
+  guint changed_id;
+  guint inserted_id;
+  guint has_child_toggled_id;
+  guint deleted_id;
+  guint reordered_id;
 };
 
 struct _GtkTreeModelSortClass
 {
-  GtkObjectClass parent_class;
-
-  /* signals */
-  /* Will be moved into the GtkTreeModelIface eventually */
-  void (* changed)       (GtkTreeModel *tree_model,
-                         GtkTreePath  *path,
-                         GtkTreeIter  *iter);
-  void (* inserted)      (GtkTreeModel *tree_model,
-                         GtkTreePath  *path,
-                         GtkTreeIter  *iter);
-  void (* child_toggled) (GtkTreeModel *tree_model,
-                         GtkTreePath  *path,
-                         GtkTreeIter  *iter);
-  void (* deleted)       (GtkTreeModel *tree_model,
-                         GtkTreePath  *path);
+  GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType       gtk_tree_model_sort_get_type       (void);
-GtkTreeModel *gtk_tree_model_sort_new            (void);
-GtkTreeModel *gtk_tree_model_sort_new_with_model (GtkTreeModel      *model,
-                                                 GValueCompareFunc *func,
-                                                 gint               sort_col);
-void          gtk_tree_model_sort_set_model      (GtkTreeModelSort  *tree_model_sort,
-                                                 GtkTreeModel      *model);
-void          gtk_tree_model_sort_set_sort_col   (GtkTreeModelSort  *tree_model_sort,
-                                                 gint               sort_col);
-void          gtk_tree_model_sort_set_compare    (GtkTreeModelSort  *tree_model_sort,
-                                                 GValueCompareFunc *func);
-void          gtk_tree_model_sort_resort         (GtkTreeModelSort  *tree_model_sort);
-GtkTreePath  *gtk_tree_model_sort_convert_path   (GtkTreeModelSort  *tree_model_sort,
-                                                 GtkTreePath       *path);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
+GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
+
+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,
+                                                             GtkTreeIter      *sort_iter,
+                                                             GtkTreeIter      *child_iter);
+GtkTreePath  *gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreePath      *sorted_path);
+void          gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
+                                                             GtkTreeIter      *child_iter,
+                                                             GtkTreeIter      *sorted_iter);
+void          gtk_tree_model_sort_reset_default_sort_func    (GtkTreeModelSort *tree_model_sort);
+void          gtk_tree_model_sort_clear_cache                (GtkTreeModelSort *tree_model_sort);
+gboolean      gtk_tree_model_sort_iter_is_valid              (GtkTreeModelSort *tree_model_sort,
+                                                              GtkTreeIter      *iter);
+
 
+G_END_DECLS
 
 #endif /* __GTK_TREE_MODEL_SORT_H__ */