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

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

diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index a94350e77bab8a856f65808c2d765532bd6e6335..7ee2cbce5667a60774082ce8c907febda1f19f76 100644 (file)
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -20,6 +20,9 @@
 #ifndef __GTK_TREE_MODEL_H__
 #define __GTK_TREE_MODEL_H__
 
+#include <glib-object.h>
+
+/* Not needed, retained for compatibility -Yosh */
 #include <gtk/gtkobject.h>
 
 G_BEGIN_DECLS
@@ -29,6 +32,10 @@ G_BEGIN_DECLS
 #define GTK_IS_TREE_MODEL(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 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;
@@ -77,7 +84,7 @@ struct _GtkTreeModelIface
 
   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);
@@ -113,17 +120,20 @@ 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
+#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             (GtkTreePath       *path);
+GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
+GType        gtk_tree_path_get_type         (void);
 gint         gtk_tree_path_compare          (const GtkTreePath *a,
                                             const GtkTreePath *b);
 void         gtk_tree_path_next             (GtkTreePath       *path);
@@ -141,6 +151,7 @@ gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
  * want to call gtk_tree_row_reference_new.
  */
 
+GType                gtk_tree_row_reference_get_type (void);
 GtkTreeRowReference *gtk_tree_row_reference_new       (GtkTreeModel        *model,
                                                       GtkTreePath         *path);
 GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *proxy,
@@ -148,6 +159,7 @@ GtkTreeRowReference *gtk_tree_row_reference_new_proxy (GObject             *prox
                                                       GtkTreePath         *path);
 GtkTreePath         *gtk_tree_row_reference_get_path  (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,12 +175,13 @@ void                 gtk_tree_row_reference_reordered (GObject     *proxy,
 /* GtkTreeIter operations */
 GtkTreeIter *     gtk_tree_iter_copy             (GtkTreeIter  *iter);
 void              gtk_tree_iter_free             (GtkTreeIter  *iter);
+GType             gtk_tree_iter_get_type         (void);
 
-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 */
@@ -178,6 +191,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);
+gchar *           gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
+                                                       GtkTreeIter  *iter);
 #define gtk_tree_model_get_iter_root(tree_model, iter) gtk_tree_model_get_iter_first(tree_model, iter)
 gboolean          gtk_tree_model_get_iter_first  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);