we probably have rows_reordered nailed down now (this code is not yet

Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
        nailed down now (this code is not yet ready for general consumption)

ChangeLog

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-0

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-10

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-2

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-4

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-6

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

ChangeLog.pre-2-8

@@ -1,3 +1,8 @@
+Fri Oct 19 22:46:54 2001  Kristian Rietveld  <kristian@planet.nl>
+
+	* gtk/gtktreemodelsort.[ch]: we probably have rows_reordered
+	nailed down now (this code is not yet ready for general consumption)
+
 Fri Oct 19 13:44:51 2001  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtktreeview.c (gtk_treeview_scroll_to_cell): correct docs

gtk/gtktreemodelsort.h

@@ -23,9 +23,7 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
-#ifdef __cplusplus
+G_BEGIN_DECLS
-extern "C" {
-#endif /* __cplusplus */
 
 #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))
@@ -44,26 +42,26 @@ struct _GtkTreeModelSort
   /* < private > */
   gpointer root;
   gint stamp;
-  guint flags;
+  guint child_flags;
   GtkTreeModel *child_model;
-  gboolean cache_child_iters;
+  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;
-
-  /* default sort */
-  GtkTreeIterCompareFunc default_sort_func;
-  gpointer default_sort_data;
-  GtkDestroyNotify default_sort_destroy;
 };
 
 struct _GtkTreeModelSortClass
@@ -72,21 +70,24 @@ struct _GtkTreeModelSortClass
 };
 
 
-GtkType       gtk_tree_model_sort_get_type       (void);
+GType         gtk_tree_model_sort_get_type                   (void) G_GNUC_CONST;
-GtkTreeModel *gtk_tree_model_sort_new            (void);
+GtkTreeModel *gtk_tree_model_sort_new_with_model             (GtkTreeModel     *child_model);
-GtkTreeModel *gtk_tree_model_sort_new_with_model (GtkTreeModel      *child_model);
-void          gtk_tree_model_sort_set_model      (GtkTreeModelSort  *tree_model_sort,
-						  GtkTreeModel      *child_model);
-GtkTreeModel *gtk_tree_model_sort_get_model      (GtkTreeModelSort  *tree_model);
-GtkTreePath  *gtk_tree_model_sort_convert_path   (GtkTreeModelSort  *tree_model_sort,
-						  GtkTreePath       *child_path);
-void          gtk_tree_model_sort_convert_iter    (GtkTreeModelSort  *tree_model_sort,
-                                                   GtkTreeIter       *sort_iter,
-                                                   GtkTreeIter       *child_iter);
 
-#ifdef __cplusplus
+GtkTreeModel *gtk_tree_model_sort_get_model                  (GtkTreeModelSort *tree_model);
-}
+GtkTreePath  *gtk_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
-#endif /* __cplusplus */
+							      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);
 
 
+G_END_DECLS
+
 #endif /* __GTK_TREE_MODEL_SORT_H__ */