g_string_printfa => g_string_append_printf.

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

diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 6076cdbf535a56541f6a8f6629910c470a06e994..508a4c286718dc2a39c74a34f11d9f30e7effdf4 100644 (file)
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -21,6 +21,7 @@
 #define __GTK_TREE_STORE_H__
 
 #include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
 #include <stdarg.h>
 
 #ifdef __cplusplus
@@ -32,6 +33,7 @@ extern "C" {
 #define GTK_TREE_STORE_CLASS(klass)            (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
 #define GTK_IS_TREE_STORE(obj)                 (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_STORE))
 #define GTK_IS_TREE_STORE_CLASS(klass)         (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_STORE))
+#define GTK_TREE_STORE_GET_CLASS(obj)           (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_STORE, GtkTreeStoreClass))
 
 typedef struct _GtkTreeStore       GtkTreeStore;
 typedef struct _GtkTreeStoreClass  GtkTreeStoreClass;
@@ -40,12 +42,17 @@ struct _GtkTreeStore
 {
   GObject parent;
 
-  GList *sort_list;
   gint stamp;
   gpointer root;
   gpointer last;
   gint n_columns;
+  gint sort_column_id;
+  GList *sort_list;
+  GtkSortType order;
   GType *column_headers;
+  GtkTreeIterCompareFunc default_sort_func;
+  gpointer default_sort_data;
+  GtkDestroyNotify default_sort_destroy;
 };
 
 struct _GtkTreeStoreClass
@@ -55,15 +62,10 @@ struct _GtkTreeStoreClass
 
 
 GtkType       gtk_tree_store_get_type        (void);
-GtkTreeStore *gtk_tree_store_new             (void);
-
-GtkTreeStore *gtk_tree_store_new_with_types  (gint          n_columns,
+GtkTreeStore *gtk_tree_store_new             (gint          n_columns,
                                              ...);
-void          gtk_tree_store_set_n_columns   (GtkTreeStore *tree_store,
-                                             gint          n_columns);
-void          gtk_tree_store_set_column_type (GtkTreeStore *store,
-                                             gint          column,
-                                             GType         type);
+GtkTreeStore *gtk_tree_store_newv            (gint          n_columns,
+                                             GType        *types);
 void          gtk_tree_store_set_value       (GtkTreeStore *tree_store,
                                              GtkTreeIter  *iter,
                                              gint          column,
@@ -99,7 +101,7 @@ gboolean      gtk_tree_store_is_ancestor     (GtkTreeStore *tree_store,
                                              GtkTreeIter  *descendant);
 gint          gtk_tree_store_iter_depth      (GtkTreeStore *tree_store,
                                              GtkTreeIter  *iter);
-
+void          gtk_tree_store_clear           (GtkTreeStore *tree_store);
 
 #ifdef __cplusplus
 }