]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreemodel.h
Remove GtkObject completely
[~andy/gtk] / gtk / gtktreemodel.h
index 9d3c5422fa5d57a9151746b70d31117326b8fb88..b706a00f97dcb424988cf2f7b165f8126220ebcc 100644 (file)
  * 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_H__
 #define __GTK_TREE_MODEL_H__
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TREE_MODEL            (gtk_tree_model_get_type ())
 #define GTK_TREE_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModel))
 #define GTK_IS_TREE_MODEL(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL))
-#define GTK_TREE_MODEL_GET_IFACE(obj)  ((GtkTreeModelIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_MODEL (obj))->g_class, GTK_TYPE_TREE_MODEL))
+#define GTK_TREE_MODEL_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModelIface))
+
+#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;
 typedef struct _GtkTreeRowReference GtkTreeRowReference;
 typedef struct _GtkTreeModel        GtkTreeModel; /* Dummy typedef */
 typedef struct _GtkTreeModelIface   GtkTreeModelIface;
+typedef gboolean (* GtkTreeModelForeachFunc) (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
 
 
 typedef enum
 {
-  GTK_TREE_MODEL_ITERS_PERSIST = 1 << 0
+  GTK_TREE_MODEL_ITERS_PERSIST = 1 << 0,
+  GTK_TREE_MODEL_LIST_ONLY = 1 << 1
 } GtkTreeModelFlags;
 
 struct _GtkTreeIter
@@ -56,27 +64,28 @@ struct _GtkTreeModelIface
   GTypeInterface g_iface;
 
   /* Signals */
-  void         (* changed)           (GtkTreeModel *tree_model,
-                                     GtkTreePath  *path,
-                                     GtkTreeIter  *iter);
-  void         (* inserted)          (GtkTreeModel *tree_model,
-                                     GtkTreePath  *path,
-                                     GtkTreeIter  *iter);
-  void         (* has_child_toggled) (GtkTreeModel *tree_model,
-                                     GtkTreePath  *path,
-                                     GtkTreeIter  *iter);
-  void         (* deleted)           (GtkTreeModel *tree_model,
-                                     GtkTreePath  *path);
-  void         (* reordered)         (GtkTreeModel *tree_model,
-                                     GtkTreePath  *path,
-                                     gint         *new_order);
+  void         (* row_changed)           (GtkTreeModel *tree_model,
+                                         GtkTreePath  *path,
+                                         GtkTreeIter  *iter);
+  void         (* row_inserted)          (GtkTreeModel *tree_model,
+                                         GtkTreePath  *path,
+                                         GtkTreeIter  *iter);
+  void         (* row_has_child_toggled) (GtkTreeModel *tree_model,
+                                         GtkTreePath  *path,
+                                         GtkTreeIter  *iter);
+  void         (* row_deleted)           (GtkTreeModel *tree_model,
+                                         GtkTreePath  *path);
+  void         (* rows_reordered)        (GtkTreeModel *tree_model,
+                                         GtkTreePath  *path,
+                                         GtkTreeIter  *iter,
+                                         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);
@@ -111,17 +120,24 @@ struct _GtkTreeModelIface
 
 /* GtkTreePath operations */
 GtkTreePath *gtk_tree_path_new              (void);
-GtkTreePath *gtk_tree_path_new_from_string  (gchar             *path);
+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);
-GtkTreePath *gtk_tree_path_new_root         (void);
+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);
+
+gint        *gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
+                                                  gint        *depth);
+
 void         gtk_tree_path_free             (GtkTreePath       *path);
-GtkTreePath *gtk_tree_path_copy             (GtkTreePath       *path);
+GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
+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);
@@ -139,37 +155,50 @@ gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
  * 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 */
 void                 gtk_tree_row_reference_inserted  (GObject     *proxy,
                                                       GtkTreePath *path);
 void                 gtk_tree_row_reference_deleted   (GObject     *proxy,
                                                       GtkTreePath *path);
-                                                      
+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) 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 */
 gboolean          gtk_tree_model_get_iter        (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreePath  *path);
-gboolean          gtk_tree_model_get_first       (GtkTreeModel *tree_model,
+gboolean          gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model,
+                                                      GtkTreeIter  *iter,
+                                                      const gchar  *path_string);
+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,
                                                  GtkTreeIter  *iter);
@@ -205,24 +234,27 @@ void              gtk_tree_model_get_valist      (GtkTreeModel *tree_model,
                                                  va_list       var_args);
 
 
-/* Signals */
-void gtk_tree_model_changed           (GtkTreeModel *tree_model,
-                                      GtkTreePath  *path,
-                                      GtkTreeIter  *iter);
-void gtk_tree_model_inserted          (GtkTreeModel *tree_model,
-                                      GtkTreePath  *path,
-                                      GtkTreeIter  *iter);
-void gtk_tree_model_has_child_toggled (GtkTreeModel *tree_model,
-                                      GtkTreePath  *path,
-                                      GtkTreeIter  *iter);
-void gtk_tree_model_deleted           (GtkTreeModel *tree_model,
-                                      GtkTreePath  *path);
-
+void              gtk_tree_model_foreach         (GtkTreeModel            *model,
+                                                 GtkTreeModelForeachFunc  func,
+                                                 gpointer                 user_data);
 
+/* Signals */
+void gtk_tree_model_row_changed           (GtkTreeModel *tree_model,
+                                          GtkTreePath  *path,
+                                          GtkTreeIter  *iter);
+void gtk_tree_model_row_inserted          (GtkTreeModel *tree_model,
+                                          GtkTreePath  *path,
+                                          GtkTreeIter  *iter);
+void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
+                                          GtkTreePath  *path,
+                                          GtkTreeIter  *iter);
+void gtk_tree_model_row_deleted           (GtkTreeModel *tree_model,
+                                          GtkTreePath  *path);
+void gtk_tree_model_rows_reordered        (GtkTreeModel *tree_model,
+                                          GtkTreePath  *path,
+                                          GtkTreeIter  *iter,
+                                          gint         *new_order);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TREE_MODEL_H__ */