X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreemodel.h;h=b48e87b642cc1ccc29be5dbcbb9b466635c616d8;hb=086b952267eb5abc577b67bf9597f3ddbfb3f04c;hp=e498a14605de34ff825a280505d7c38eeed00759;hpb=7cc14762b9c1cbef337242dd47eea85136f66a4f;p=~andy%2Fgtk diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index e498a1460..b48e87b64 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -17,9 +17,16 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_H__ #define __GTK_TREE_MODEL_H__ +#include + +/* Not needed, retained for compatibility -Yosh */ #include G_BEGIN_DECLS @@ -31,6 +38,7 @@ G_BEGIN_DECLS #define GTK_TYPE_TREE_ITER (gtk_tree_iter_get_type ()) #define GTK_TYPE_TREE_PATH (gtk_tree_path_get_type ()) +#define GTK_TYPE_TREE_ROW_REFERENCE (gtk_tree_row_reference_get_type ()) typedef struct _GtkTreeIter GtkTreeIter; typedef struct _GtkTreePath GtkTreePath; @@ -76,11 +84,11 @@ struct _GtkTreeModelIface gint *new_order); /* Virtual Table */ - GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model); + GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model); gint (* get_n_columns) (GtkTreeModel *tree_model); GType (* get_column_type) (GtkTreeModel *tree_model, - gint index); + gint index_); gboolean (* get_iter) (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path); @@ -116,18 +124,19 @@ struct _GtkTreeModelIface /* GtkTreePath operations */ GtkTreePath *gtk_tree_path_new (void); GtkTreePath *gtk_tree_path_new_from_string (const gchar *path); +GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, + ...); gchar *gtk_tree_path_to_string (GtkTreePath *path); -#define gtk_tree_path_new_root() gtk_tree_path_new_first() GtkTreePath *gtk_tree_path_new_first (void); void gtk_tree_path_append_index (GtkTreePath *path, - gint index); + gint index_); void gtk_tree_path_prepend_index (GtkTreePath *path, - gint index); + gint index_); gint gtk_tree_path_get_depth (GtkTreePath *path); gint *gtk_tree_path_get_indices (GtkTreePath *path); void gtk_tree_path_free (GtkTreePath *path); GtkTreePath *gtk_tree_path_copy (const GtkTreePath *path); -GType gtk_tree_path_get_type (void); +GType gtk_tree_path_get_type (void) G_GNUC_CONST; gint gtk_tree_path_compare (const GtkTreePath *a, const GtkTreePath *b); void gtk_tree_path_next (GtkTreePath *path); @@ -140,18 +149,25 @@ gboolean gtk_tree_path_is_ancestor (GtkTreePath *path, gboolean gtk_tree_path_is_descendant (GtkTreePath *path, GtkTreePath *ancestor); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_tree_path_new_root() gtk_tree_path_new_first() +#endif /* !GTK_DISABLE_DEPRECATED */ + /* Row reference (an object that tracks model changes so it refers to the same * row always; a path refers to a position, not a fixed row). You almost always * want to call gtk_tree_row_reference_new. */ +GType gtk_tree_row_reference_get_type (void) G_GNUC_CONST; GtkTreeRowReference *gtk_tree_row_reference_new (GtkTreeModel *model, GtkTreePath *path); GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject *proxy, GtkTreeModel *model, GtkTreePath *path); GtkTreePath *gtk_tree_row_reference_get_path (GtkTreeRowReference *reference); +GtkTreeModel *gtk_tree_row_reference_get_model (GtkTreeRowReference *reference); gboolean gtk_tree_row_reference_valid (GtkTreeRowReference *reference); +GtkTreeRowReference *gtk_tree_row_reference_copy (GtkTreeRowReference *reference); void gtk_tree_row_reference_free (GtkTreeRowReference *reference); /* These two functions are only needed if you created the row reference with a * proxy object */ @@ -163,17 +179,17 @@ void gtk_tree_row_reference_reordered (GObject *proxy, GtkTreePath *path, GtkTreeIter *iter, gint *new_order); - + /* GtkTreeIter operations */ GtkTreeIter * gtk_tree_iter_copy (GtkTreeIter *iter); void gtk_tree_iter_free (GtkTreeIter *iter); -GType gtk_tree_iter_get_type (void); +GType gtk_tree_iter_get_type (void) G_GNUC_CONST; -GtkType gtk_tree_model_get_type (void) G_GNUC_CONST; +GType gtk_tree_model_get_type (void) G_GNUC_CONST; GtkTreeModelFlags gtk_tree_model_get_flags (GtkTreeModel *tree_model); gint gtk_tree_model_get_n_columns (GtkTreeModel *tree_model); GType gtk_tree_model_get_column_type (GtkTreeModel *tree_model, - gint index); + gint index_); /* Iterator movement */ @@ -183,7 +199,8 @@ gboolean gtk_tree_model_get_iter (GtkTreeModel *tree_model, gboolean gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, GtkTreeIter *iter, const gchar *path_string); -#define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter) +gchar * gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, + GtkTreeIter *iter); gboolean gtk_tree_model_get_iter_first (GtkTreeModel *tree_model, GtkTreeIter *iter); GtkTreePath * gtk_tree_model_get_path (GtkTreeModel *tree_model, @@ -225,6 +242,10 @@ void gtk_tree_model_foreach (GtkTreeModel *model gpointer user_data); +#ifndef GTK_DISABLE_DEPRECATED +#define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter) +#endif /* !GTK_DISABLE_DEPRECATED */ + /* Signals */ void gtk_tree_model_row_changed (GtkTreeModel *tree_model, GtkTreePath *path, @@ -242,9 +263,6 @@ void gtk_tree_model_rows_reordered (GtkTreeModel *tree_model, GtkTreeIter *iter, gint *new_order); - - - G_END_DECLS #endif /* __GTK_TREE_MODEL_H__ */