* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <glib.h>
+#include <glib/gprintf.h>
#include <gobject/gvaluecollector.h>
#include "gtktreemodel.h"
#include "gtktreeview.h"
#include "gtktreeprivate.h"
#include "gtkmarshalers.h"
-#include "gtksignal.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+#define INITIALIZE_TREE_ITER(Iter) \
+ G_STMT_START{ \
+ (Iter)->stamp = 0; \
+ (Iter)->user_data = NULL; \
+ (Iter)->user_data2 = NULL; \
+ (Iter)->user_data3 = NULL; \
+ }G_STMT_END
+
+#define ROW_REF_DATA_STRING "gtk-tree-row-refs"
+
+enum {
+ ROW_CHANGED,
+ ROW_INSERTED,
+ ROW_HAS_CHILD_TOGGLED,
+ ROW_DELETED,
+ ROWS_REORDERED,
+ LAST_SIGNAL
+};
+
+static guint tree_model_signals[LAST_SIGNAL] = { 0 };
+
struct _GtkTreePath
{
gint depth;
gint *indices;
};
-static void gtk_tree_model_base_init (gpointer g_class);
+typedef struct
+{
+ GSList *list;
+} RowRefList;
+static void gtk_tree_model_base_init (gpointer g_class);
+
+/* custom closures */
+static void row_inserted_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_value,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+static void row_deleted_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_value,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+static void rows_reordered_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_value,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+
+static void gtk_tree_row_ref_inserted (RowRefList *refs,
+ GtkTreePath *path,
+ GtkTreeIter *iter);
+static void gtk_tree_row_ref_deleted (RowRefList *refs,
+ GtkTreePath *path);
+static void gtk_tree_row_ref_reordered (RowRefList *refs,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order);
-GtkType
+GType
gtk_tree_model_get_type (void)
{
- static GtkType tree_model_type = 0;
+ static GType tree_model_type = 0;
if (! tree_model_type)
{
- static const GTypeInfo tree_model_info =
+ const GTypeInfo tree_model_info =
{
sizeof (GtkTreeModelIface), /* class_size */
gtk_tree_model_base_init, /* base_init */
NULL
};
- tree_model_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel", &tree_model_info, 0);
+ tree_model_type =
+ g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeModel"),
+ &tree_model_info, 0);
+
g_type_interface_add_prerequisite (tree_model_type, G_TYPE_OBJECT);
}
gtk_tree_model_base_init (gpointer g_class)
{
static gboolean initialized = FALSE;
+ GClosure *closure;
if (! initialized)
{
- g_signal_new ("row_changed",
- GTK_TYPE_TREE_MODEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
- NULL, NULL,
- _gtk_marshal_VOID__BOXED_BOXED,
- G_TYPE_NONE, 2,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_ITER);
- g_signal_new ("row_inserted",
- GTK_TYPE_TREE_MODEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
- NULL, NULL,
- _gtk_marshal_VOID__BOXED_BOXED,
- G_TYPE_NONE, 2,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_ITER);
- g_signal_new ("row_has_child_toggled",
- GTK_TYPE_TREE_MODEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
- NULL, NULL,
- _gtk_marshal_VOID__BOXED_BOXED,
- G_TYPE_NONE, 2,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_ITER);
- g_signal_new ("row_deleted",
- GTK_TYPE_TREE_MODEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
- NULL, NULL,
- _gtk_marshal_VOID__BOXED,
- G_TYPE_NONE, 1,
- GTK_TYPE_TREE_PATH);
- g_signal_new ("rows_reordered",
- GTK_TYPE_TREE_MODEL,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
- NULL, NULL,
- _gtk_marshal_VOID__BOXED_BOXED_POINTER,
- G_TYPE_NONE, 3,
- GTK_TYPE_TREE_PATH,
- GTK_TYPE_TREE_ITER,
- G_TYPE_POINTER);
+ GType row_inserted_params[2];
+ GType row_deleted_params[1];
+ GType rows_reordered_params[3];
+
+ row_inserted_params[0] = GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE;
+ row_inserted_params[1] = GTK_TYPE_TREE_ITER;
+
+ row_deleted_params[0] = GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE;
+
+ rows_reordered_params[0] = GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE;
+ rows_reordered_params[1] = GTK_TYPE_TREE_ITER;
+ rows_reordered_params[2] = G_TYPE_POINTER;
+
+ /**
+ * GtkTreeModel::row-changed:
+ * @tree_model: the #GtkTreeModel on which the signal is emitted
+ * @path: a #GtkTreePath identifying the changed row
+ * @iter: a valid #GtkTreeIter pointing to the changed row
+ *
+ * This signal is emitted when a row in the model has changed.
+ */
+ tree_model_signals[ROW_CHANGED] =
+ g_signal_new (I_("row_changed"),
+ GTK_TYPE_TREE_MODEL,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
+ NULL, NULL,
+ _gtk_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
+ GTK_TYPE_TREE_ITER);
+
+ /* We need to get notification about structure changes
+ * to update row references., so instead of using the
+ * standard g_signal_new() with an offset into our interface
+ * structure, we use a customs closures for the class
+ * closures (default handlers) that first update row references
+ * and then calls the function from the interface structure.
+ *
+ * The reason we don't simply update the row references from
+ * the wrapper functions (gtk_tree_model_row_inserted(), etc.)
+ * is to keep proper ordering with respect to signal handlers
+ * connected normally and after.
+ */
+
+ /**
+ * GtkTreeModel::row-inserted:
+ * @tree_model: the #GtkTreeModel on which the signal is emitted
+ * @path: a #GtkTreePath identifying the new row
+ * @iter: a valid #GtkTreeIter pointing to the new row
+ *
+ * This signal is emitted when a new row has been inserted in the model.
+ *
+ * Note that the row may still be empty at this point, since
+ * it is a common pattern to first insert an empty row, and
+ * then fill it with the desired values.
+ */
+ closure = g_closure_new_simple (sizeof (GClosure), NULL);
+ g_closure_set_marshal (closure, row_inserted_marshal);
+ tree_model_signals[ROW_INSERTED] =
+ g_signal_newv (I_("row_inserted"),
+ GTK_TYPE_TREE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ closure,
+ NULL, NULL,
+ _gtk_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2,
+ row_inserted_params);
+
+ /**
+ * GtkTreeModel::row-has-child-toggled:
+ * @tree_model: the #GtkTreeModel on which the signal is emitted
+ * @path: a #GtkTreePath identifying the row
+ * @iter: a valid #GtkTreeIter pointing to the row
+ *
+ * This signal is emitted when a row has gotten the first child row or lost
+ * its last child row.
+ */
+ tree_model_signals[ROW_HAS_CHILD_TOGGLED] =
+ g_signal_new (I_("row_has_child_toggled"),
+ GTK_TYPE_TREE_MODEL,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
+ NULL, NULL,
+ _gtk_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
+ GTK_TYPE_TREE_ITER);
+
+ /**
+ * GtkTreeModel::row-deleted:
+ * @tree_model: the #GtkTreeModel on which the signal is emitted
+ * @path: a #GtkTreePath identifying the row
+ *
+ * This signal is emitted when a row has been deleted.
+ *
+ * Note that no iterator is passed to the signal handler,
+ * since the row is already deleted.
+ *
+ * Implementations of GtkTreeModel must emit row-deleted
+ * <emphasis>before</emphasis> removing the node from its
+ * internal data structures. This is because models and
+ * views which access and monitor this model might have
+ * references on the node which need to be released in the
+ * row-deleted handler.
+ */
+ closure = g_closure_new_simple (sizeof (GClosure), NULL);
+ g_closure_set_marshal (closure, row_deleted_marshal);
+ tree_model_signals[ROW_DELETED] =
+ g_signal_newv (I_("row_deleted"),
+ GTK_TYPE_TREE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ closure,
+ NULL, NULL,
+ _gtk_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1,
+ row_deleted_params);
+
+ /**
+ * GtkTreeModel::rows-reordered:
+ * @tree_model: the #GtkTreeModel on which the signal is emitted
+ * @path: a #GtkTreePath identifying the tree node whose children
+ * have been reordered
+ * @iter: a valid #GtkTreeIter pointing to the node whose
+ *
+ * This signal is emitted when the children of a node in the #GtkTreeModel
+ * have been reordered.
+ *
+ * Note that this signal is <emphasis>not</emphasis> emitted
+ * when rows are reordered by DND, since this is implemented
+ * by removing and then reinserting the row.
+ */
+ closure = g_closure_new_simple (sizeof (GClosure), NULL);
+ g_closure_set_marshal (closure, rows_reordered_marshal);
+ tree_model_signals[ROWS_REORDERED] =
+ g_signal_newv (I_("rows_reordered"),
+ GTK_TYPE_TREE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ closure,
+ NULL, NULL,
+ _gtk_marshal_VOID__BOXED_BOXED_POINTER,
+ G_TYPE_NONE, 3,
+ rows_reordered_params);
initialized = TRUE;
}
}
+static void
+row_inserted_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ GtkTreeModelIface *iface;
+
+ void (* row_inserted_callback) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter) = NULL;
+
+ GObject *model = g_value_get_object (param_values + 0);
+ GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
+ GtkTreeIter *iter = (GtkTreeIter *)g_value_get_boxed (param_values + 2);
+
+ /* first, we need to update internal row references */
+ gtk_tree_row_ref_inserted ((RowRefList *)g_object_get_data (model, ROW_REF_DATA_STRING),
+ path, iter);
+
+ /* fetch the interface ->row_inserted implementation */
+ iface = GTK_TREE_MODEL_GET_IFACE (model);
+ row_inserted_callback = G_STRUCT_MEMBER (gpointer, iface,
+ G_STRUCT_OFFSET (GtkTreeModelIface,
+ row_inserted));
+
+ /* Call that default signal handler, it if has been set */
+ if (row_inserted_callback)
+ row_inserted_callback (GTK_TREE_MODEL (model), path, iter);
+}
+
+static void
+row_deleted_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ GtkTreeModelIface *iface;
+ void (* row_deleted_callback) (GtkTreeModel *tree_model,
+ GtkTreePath *path) = NULL;
+ GObject *model = g_value_get_object (param_values + 0);
+ GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
+
+
+ /* first, we need to update internal row references */
+ gtk_tree_row_ref_deleted ((RowRefList *)g_object_get_data (model, ROW_REF_DATA_STRING),
+ path);
+
+ /* fetch the interface ->row_deleted implementation */
+ iface = GTK_TREE_MODEL_GET_IFACE (model);
+ row_deleted_callback = G_STRUCT_MEMBER (gpointer, iface,
+ G_STRUCT_OFFSET (GtkTreeModelIface,
+ row_deleted));
+
+ /* Call that default signal handler, it if has been set */
+ if (row_deleted_callback)
+ row_deleted_callback (GTK_TREE_MODEL (model), path);
+}
+
+static void
+rows_reordered_marshal (GClosure *closure,
+ GValue /* out */ *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ GtkTreeModelIface *iface;
+ void (* rows_reordered_callback) (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order);
+
+ GObject *model = g_value_get_object (param_values + 0);
+ GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
+ GtkTreeIter *iter = (GtkTreeIter *)g_value_get_boxed (param_values + 2);
+ gint *new_order = (gint *)g_value_get_pointer (param_values + 3);
+
+ /* first, we need to update internal row references */
+ gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (model, ROW_REF_DATA_STRING),
+ path, iter, new_order);
+
+ /* fetch the interface ->rows_reordered implementation */
+ iface = GTK_TREE_MODEL_GET_IFACE (model);
+ rows_reordered_callback = G_STRUCT_MEMBER (gpointer, iface,
+ G_STRUCT_OFFSET (GtkTreeModelIface,
+ rows_reordered));
+
+ /* Call that default signal handler, it if has been set */
+ if (rows_reordered_callback)
+ rows_reordered_callback (GTK_TREE_MODEL (model), path, iter, new_order);
+}
+
/**
* gtk_tree_path_new:
*
- * Creates a new #GtkTreePath. This structure refers to a row
+ * Creates a new #GtkTreePath. This structure refers to a row.
*
* Return value: A newly created #GtkTreePath.
**/
gtk_tree_path_new (void)
{
GtkTreePath *retval;
- retval = (GtkTreePath *) g_new (GtkTreePath, 1);
+ retval = g_new (GtkTreePath, 1);
retval->depth = 0;
retval->indices = NULL;
while (1)
{
i = strtol (path, &ptr, 10);
- gtk_tree_path_append_index (retval, i);
-
if (i < 0)
{
g_warning (G_STRLOC ": Negative numbers in path %s passed to gtk_tree_path_new_from_string", orig_path);
gtk_tree_path_free (retval);
return NULL;
}
+
+ gtk_tree_path_append_index (retval, i);
+
if (*ptr == '\000')
break;
if (ptr == path || *ptr != ':')
return retval;
}
+/**
+ * gtk_tree_path_new_from_indices:
+ * @first_index: first integer
+ * @varargs: list of integers terminated by -1
+ *
+ * Creates a new path with @first_index and @varargs as indices.
+ *
+ * Return value: A newly created #GtkTreePath.
+ *
+ * Since: 2.2
+ **/
+GtkTreePath *
+gtk_tree_path_new_from_indices (gint first_index,
+ ...)
+{
+ int arg;
+ va_list args;
+ GtkTreePath *path;
+
+ path = gtk_tree_path_new ();
+
+ va_start (args, first_index);
+ arg = first_index;
+
+ while (arg != -1)
+ {
+ gtk_tree_path_append_index (path, arg);
+ arg = va_arg (args, gint);
+ }
+
+ va_end (args);
+
+ return path;
+}
+
/**
* gtk_tree_path_to_string:
* @path: A #GtkTreePath
gchar *
gtk_tree_path_to_string (GtkTreePath *path)
{
- gchar *retval, *ptr;
- gint i;
+ gchar *retval, *ptr, *end;
+ gint i, n;
g_return_val_if_fail (path != NULL, NULL);
if (path->depth == 0)
return NULL;
- ptr = retval = (gchar *) g_new0 (char *, path->depth*8);
- sprintf (retval, "%d", path->indices[0]);
- while (*ptr != '\000')
+ n = path->depth * 12;
+ ptr = retval = g_new0 (gchar, n);
+ end = ptr + n;
+ g_snprintf (retval, end - ptr, "%d", path->indices[0]);
+ while (*ptr != '\000')
ptr++;
for (i = 1; i < path->depth; i++)
{
- sprintf (ptr, ":%d", path->indices[i]);
+ g_snprintf (ptr, end - ptr, ":%d", path->indices[i]);
while (*ptr != '\000')
ptr++;
}
/**
* gtk_tree_path_append_index:
* @path: A #GtkTreePath.
- * @index: The index.
+ * @index_: The index.
*
* Appends a new index to a path. As a result, the depth of the path is
* increased.
/**
* gtk_tree_path_prepend_index:
* @path: A #GtkTreePath.
- * @index: The index.
+ * @index_: The index.
*
* Prepends a new index to a path. As a result, the depth of the path is
* increased.
gtk_tree_path_prepend_index (GtkTreePath *path,
gint index)
{
- gint *new_indices = g_new (gint, ++path->depth);
+ gint *new_indices;
+
+ (path->depth)++;
+ new_indices = g_new (gint, path->depth);
+
if (path->indices == NULL)
{
path->indices = new_indices;
void
gtk_tree_path_free (GtkTreePath *path)
{
- g_return_if_fail (path != NULL);
+ if (!path)
+ return;
g_free (path->indices);
g_free (path);
* Return value: A new #GtkTreePath.
**/
GtkTreePath *
-gtk_tree_path_copy (GtkTreePath *path)
+gtk_tree_path_copy (const GtkTreePath *path)
{
GtkTreePath *retval;
return retval;
}
+GType
+gtk_tree_path_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static (I_("GtkTreePath"),
+ (GBoxedCopyFunc) gtk_tree_path_copy,
+ (GBoxedFreeFunc) gtk_tree_path_free);
+
+ return our_type;
+}
+
/**
* gtk_tree_path_compare:
* @a: A #GtkTreePath.
* gtk_tree_path_prev:
* @path: A #GtkTreePath.
*
- * Moves the @path to point to the previous node at the current depth, if it exists.
+ * Moves the @path to point to the previous node at the current depth,
+ * if it exists.
*
* Return value: %TRUE if @path has a previous node, and the move was made.
**/
{
g_return_val_if_fail (path != NULL, FALSE);
+ if (path->depth == 0)
+ return FALSE;
+
if (path->indices[path->depth - 1] == 0)
return FALSE;
* gtk_tree_path_up:
* @path: A #GtkTreePath.
*
- * Moves the @path to point to it's parent node, if it has a parent.
+ * Moves the @path to point to its parent node, if it has a parent.
*
* Return value: %TRUE if @path has a parent, and the move was made.
**/
g_return_val_if_fail (iter != NULL, NULL);
- retval = g_new (GtkTreeIter, 1);
+ retval = g_slice_new (GtkTreeIter);
*retval = *iter;
return retval;
{
g_return_if_fail (iter != NULL);
- g_free (iter);
+ g_slice_free (GtkTreeIter, iter);
+}
+
+GType
+gtk_tree_iter_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static (I_("GtkTreeIter"),
+ (GBoxedCopyFunc) gtk_tree_iter_copy,
+ (GBoxedFreeFunc) gtk_tree_iter_free);
+
+ return our_type;
}
/**
*
* Returns a set of flags supported by this interface. The flags are a bitwise
* combination of #GtkTreeModelFlags. The flags supported should not change
- * during the lifecycle of the tree_model.
+ * during the lifecycle of the @tree_model.
*
* Return value: The flags supported by this interface.
**/
GtkTreeModelFlags
gtk_tree_model_get_flags (GtkTreeModel *tree_model)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), 0);
- if (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_flags)
- return (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_flags) (tree_model);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ if (iface->get_flags)
+ return (* iface->get_flags) (tree_model);
return 0;
}
gint
gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
{
+ GtkTreeModelIface *iface;
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), 0);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_n_columns != NULL, 0);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->get_n_columns) (tree_model);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->get_n_columns != NULL, 0);
+
+ return (* iface->get_n_columns) (tree_model);
}
/**
* gtk_tree_model_get_column_type:
* @tree_model: A #GtkTreeModel.
- * @index: The column index.
+ * @index_: The column index.
*
* Returns the type of the column.
*
gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
gint index)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), G_TYPE_INVALID);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_column_type != NULL, G_TYPE_INVALID);
+
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->get_column_type != NULL, G_TYPE_INVALID);
g_return_val_if_fail (index >= 0, G_TYPE_INVALID);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->get_column_type) (tree_model, index);
+ return (* iface->get_column_type) (tree_model, index);
}
/**
GtkTreeIter *iter,
GtkTreePath *path)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (path != NULL, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_iter != NULL, FALSE);
+
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->get_iter != NULL, FALSE);
g_return_val_if_fail (path->depth > 0, FALSE);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->get_iter) (tree_model, iter, path);
+ INITIALIZE_TREE_ITER (iter);
+
+ return (* iface->get_iter) (tree_model, iter, path);
}
/**
return retval;
}
+/**
+ * gtk_tree_model_get_string_from_iter:
+ * @tree_model: A #GtkTreeModel.
+ * @iter: An #GtkTreeIter.
+ *
+ * Generates a string representation of the iter. This string is a ':'
+ * separated list of numbers. For example, "4:10:0:3" would be an
+ * acceptable return value for this string.
+ *
+ * Return value: A newly-allocated string. Must be freed with g_free().
+ *
+ * Since: 2.2
+ **/
+gchar *
+gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
+{
+ GtkTreePath *path;
+ gchar *ret;
+
+ g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), NULL);
+ g_return_val_if_fail (iter != NULL, NULL);
+
+ path = gtk_tree_model_get_path (tree_model, iter);
+
+ g_return_val_if_fail (path != NULL, NULL);
+
+ ret = gtk_tree_path_to_string (path);
+ gtk_tree_path_free (path);
+
+ return ret;
+}
/**
* gtk_tree_model_get_iter_first:
gtk_tree_model_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_path != NULL, NULL);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->get_path) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->get_path != NULL, NULL);
+
+ return (* iface->get_path) (tree_model, iter);
}
/**
gint column,
GValue *value)
{
+ GtkTreeModelIface *iface;
+
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (iter != NULL);
g_return_if_fail (value != NULL);
- g_return_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_value != NULL);
- (* GTK_TREE_MODEL_GET_IFACE (tree_model)->get_value) (tree_model, iter, column, value);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_if_fail (iface->get_value != NULL);
+
+ (* iface->get_value) (tree_model, iter, column, value);
}
/**
gtk_tree_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_next != NULL, FALSE);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_next) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_next != NULL, FALSE);
+
+ return (* iface->iter_next) (tree_model, iter);
}
/**
* gtk_tree_model_iter_children:
* @tree_model: A #GtkTreeModel.
* @iter: The new #GtkTreeIter to be set to the child.
- * @parent: The #GtkTreeIter.
+ * @parent: The #GtkTreeIter, or %NULL
+ *
+ * Sets @iter to point to the first child of @parent. If @parent has no
+ * children, %FALSE is returned and @iter is set to be invalid. @parent
+ * will remain a valid node after this function has been called.
*
- * Sets @iter to point to the first child of @parent. If @parent has no children,
- * %FALSE is returned and @iter is set to be invalid. @parent will remain a valid
- * node after this function has been called.
+ * If @parent is %NULL returns the first node, equivalent to
+ * <literal>gtk_tree_model_get_iter_first (tree_model, iter);</literal>
*
* Return value: %TRUE, if @child has been set to the first child.
**/
GtkTreeIter *iter,
GtkTreeIter *parent)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_children != NULL, FALSE);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_children) (tree_model, iter, parent);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_children != NULL, FALSE);
+
+ INITIALIZE_TREE_ITER (iter);
+
+ return (* iface->iter_children) (tree_model, iter, parent);
}
/**
gtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_has_child != NULL, FALSE);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_has_child) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_has_child != NULL, FALSE);
+
+ return (* iface->iter_has_child) (tree_model, iter);
}
/**
gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), 0);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_n_children != NULL, 0);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_n_children) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_n_children != NULL, 0);
+
+ return (* iface->iter_n_children) (tree_model, iter);
}
/**
* @n: Then index of the desired child.
*
* Sets @iter to be the child of @parent, using the given index. The first
- * index is 0. If @index is too big, or @parent has no children, @iter is set
+ * index is 0. If @n is too big, or @parent has no children, @iter is set
* to an invalid iterator and %FALSE is returned. @parent will remain a valid
* node after this function has been called. As a special case, if @parent is
- * %NULL, then the @n<!>th root node is set.
+ * %NULL, then the @n<!-- -->th root node is set.
*
- * Return value: %TRUE, if @parent has an @n<!>th child.
+ * Return value: %TRUE, if @parent has an @n<!-- -->th child.
**/
gboolean
gtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *parent,
gint n)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (n >= 0, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_nth_child != NULL, FALSE);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_nth_child) (tree_model, iter, parent, n);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_nth_child != NULL, FALSE);
+
+ INITIALIZE_TREE_ITER (iter);
+
+ return (* iface->iter_nth_child) (tree_model, iter, parent, n);
}
/**
GtkTreeIter *iter,
GtkTreeIter *child)
{
+ GtkTreeModelIface *iface;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (child != NULL, FALSE);
- g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_parent != NULL, FALSE);
+
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ g_return_val_if_fail (iface->iter_parent != NULL, FALSE);
+
+ INITIALIZE_TREE_ITER (iter);
- return (* GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_parent) (tree_model, iter, child);
+ return (* iface->iter_parent) (tree_model, iter, child);
}
/**
* implement. To be more specific, models may ignore this call as it exists
* primarily for performance reasons.
*
- * This function is primarily meant as a way for views to let caching model know
- * when nodes are being displayed (and hence, whether or not to cache that
+ * This function is primarily meant as a way for views to let caching model
+ * know when nodes are being displayed (and hence, whether or not to cache that
* node.) For example, a file-system based model would not want to keep the
* entire file-hierarchy in memory, just the sections that are currently being
* displayed by every current view.
*
- * A model should be expected to be able to get an iter independent of it's
+ * A model should be expected to be able to get an iter independent of its
* reffed state.
**/
void
gtk_tree_model_ref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
- if (GTK_TREE_MODEL_GET_IFACE (tree_model)->ref_node)
- (* GTK_TREE_MODEL_GET_IFACE (tree_model)->ref_node) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ if (iface->ref_node)
+ (* iface->ref_node) (tree_model, iter);
}
/**
gtk_tree_model_unref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ GtkTreeModelIface *iface;
+
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (iter != NULL);
- if (GTK_TREE_MODEL_GET_IFACE (tree_model)->unref_node)
- (* GTK_TREE_MODEL_GET_IFACE (tree_model)->unref_node) (tree_model, iter);
+ iface = GTK_TREE_MODEL_GET_IFACE (tree_model);
+ if (iface->unref_node)
+ (* iface->unref_node) (tree_model, iter);
}
/**
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
- g_signal_emit_by_name (tree_model, "row_changed", path, iter);
+ g_signal_emit (tree_model, tree_model_signals[ROW_CHANGED], 0, path, iter);
}
/**
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
- g_signal_emit_by_name (tree_model, "row_inserted", path, iter);
+ g_signal_emit (tree_model, tree_model_signals[ROW_INSERTED], 0, path, iter);
}
/**
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
- g_signal_emit_by_name (tree_model, "row_has_child_toggled", path, iter);
+ g_signal_emit (tree_model, tree_model_signals[ROW_HAS_CHILD_TOGGLED], 0, path, iter);
}
/**
* @path: A #GtkTreePath pointing to the previous location of the deleted row.
*
* Emits the "row_deleted" signal on @tree_model. This should be called by
- * models after a row has been removed. The location pointed to by @path should
- * be the location that the row previously was at. It may not be a valid
- * location anymore.
+ * models after a row has been removed. The location pointed to by @path
+ * should be the location that the row previously was at. It may not be a
+ * valid location anymore.
**/
void
gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
- g_signal_emit_by_name (tree_model, "row_deleted", path);
+ g_signal_emit (tree_model, tree_model_signals[ROW_DELETED], 0, path);
}
/**
* gtk_tree_model_rows_reordered:
* @tree_model: A #GtkTreeModel
- * @path: A #GtkTreePath pointing to the tree node whose children have been reordered
- * @iter: A valid #GtkTreeIter pointing to the node whose children have been reordered
- * @new_order: an array of integers containing the new indices of the children,
- * i.e. the former child <literal>n</literal> is now at position
- * @new_order<literal>[n]</literal>.
+ * @path: A #GtkTreePath pointing to the tree node whose children have been
+ * reordered
+ * @iter: A valid #GtkTreeIter pointing to the node whose children have been
+ * reordered, or %NULL if the depth of @path is 0.
+ * @new_order: an array of integers mapping the current position of each child
+ * to its old position before the re-ordering,
+ * i.e. @new_order<literal>[newpos] = oldpos</literal>.
*
* Emits the "rows_reordered" signal on @tree_model. This should be called by
* models when their rows have been reordered.
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (new_order != NULL);
- g_signal_emit_by_name (tree_model, "rows_reordered", path, iter, new_order);
+ g_signal_emit (tree_model, tree_model_signals[ROWS_REORDERED], 0, path, iter, new_order);
}
GtkTreeModelForeachFunc func,
gpointer user_data)
{
- gtk_tree_path_append_index (path, 0);
-
do
{
GtkTreeIter child;
+ if ((* func) (model, path, iter, user_data))
+ return TRUE;
+
if (gtk_tree_model_iter_children (model, &child, iter))
{
+ gtk_tree_path_down (path);
if (gtk_tree_model_foreach_helper (model, &child, path, func, user_data))
return TRUE;
+ gtk_tree_path_up (path);
}
- if ((* func) (model, path, iter, user_data))
- return TRUE;
-
gtk_tree_path_next (path);
}
while (gtk_tree_model_iter_next (model, iter));
- gtk_tree_path_up (path);
return FALSE;
}
* @func: A function to be called on each row
* @user_data: User data to passed to func.
*
- * Calls func on each node in model in a depth-first fashion. If func returns
- * %TRUE, then the tree ceases to be walked, and gtk_tree_model_foreach() returns.
+ * Calls func on each node in model in a depth-first fashion.
+ * If @func returns %TRUE, then the tree ceases to be walked, and
+ * gtk_tree_model_foreach() returns.
**/
-
void
gtk_tree_model_foreach (GtkTreeModel *model,
GtkTreeModelForeachFunc func,
gint depth);
-#define ROW_REF_DATA_STRING "gtk-tree-row-refs"
+GType
+gtk_tree_row_reference_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static (I_("GtkTreeRowReference"),
+ (GBoxedCopyFunc) gtk_tree_row_reference_copy,
+ (GBoxedFreeFunc) gtk_tree_row_reference_free);
+
+ return our_type;
+}
+
struct _GtkTreeRowReference
{
GtkTreePath *path;
};
-typedef struct
-{
- GSList *list;
-} RowRefList;
-
static void
release_row_references (gpointer data)
}
static void
-gtk_tree_row_ref_inserted_callback (GObject *object,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+gtk_tree_row_ref_inserted (RowRefList *refs,
+ GtkTreePath *path,
+ GtkTreeIter *iter)
{
- RowRefList *refs = g_object_get_data (data, ROW_REF_DATA_STRING);
-
GSList *tmp_list;
if (refs == NULL)
}
static void
-gtk_tree_row_ref_deleted_callback (GObject *object,
- GtkTreePath *path,
- gpointer data)
+gtk_tree_row_ref_deleted (RowRefList *refs,
+ GtkTreePath *path)
{
- RowRefList *refs = g_object_get_data (data, ROW_REF_DATA_STRING);
GSList *tmp_list;
if (refs == NULL)
/* We know it affects us. */
if (path->indices[i] == reference->path->indices[i])
{
- gtk_tree_row_reference_unref_path (reference->path, reference->model, reference->path->depth - 1);
+ if (reference->path->depth > path->depth)
+ /* some parent was deleted, trying to unref any node
+ * between the deleted parent and the node the reference
+ * is pointing to is bad, as those nodes are already gone.
+ */
+ gtk_tree_row_reference_unref_path (reference->path, reference->model, path->depth - 1);
+ else
+ gtk_tree_row_reference_unref_path (reference->path, reference->model, reference->path->depth - 1);
gtk_tree_path_free (reference->path);
reference->path = NULL;
}
}
static void
-gtk_tree_row_ref_reordered_callback (GObject *object,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gint *new_order,
- gpointer data)
+gtk_tree_row_ref_reordered (RowRefList *refs,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gint *new_order)
{
- RowRefList *refs = g_object_get_data (data, ROW_REF_DATA_STRING);
GSList *tmp_list;
gint length;
tmp_list = g_slist_next (tmp_list);
}
-
}
-
-static void
-connect_ref_callbacks (GtkTreeModel *model)
-{
- g_signal_connect (G_OBJECT (model),
- "row_inserted",
- (GCallback) gtk_tree_row_ref_inserted_callback,
- model);
- g_signal_connect (G_OBJECT (model),
- "row_deleted",
- (GCallback) gtk_tree_row_ref_deleted_callback,
- model);
- g_signal_connect (G_OBJECT (model),
- "rows_reordered",
- (GCallback) gtk_tree_row_ref_reordered_callback,
- model);
-}
-
/* We do this recursively so that we can unref children nodes before their parent */
static void
gtk_tree_model_unref_node (model, &iter);
}
-static void
-disconnect_ref_callbacks (GtkTreeModel *model)
-{
- g_signal_handlers_disconnect_matched (G_OBJECT (model),
- G_SIGNAL_MATCH_FUNC,
- 0, 0, NULL,
- gtk_tree_row_ref_inserted_callback,
- NULL);
- g_signal_handlers_disconnect_matched (G_OBJECT (model),
- G_SIGNAL_MATCH_FUNC,
- 0, 0, NULL,
- gtk_tree_row_ref_deleted_callback,
- NULL);
- g_signal_handlers_disconnect_matched (G_OBJECT (model),
- G_SIGNAL_MATCH_FUNC,
- 0, 0, NULL,
- gtk_tree_row_ref_reordered_callback,
- NULL);
-}
-
/**
* gtk_tree_row_reference_new:
* @model: A #GtkTreeModel
* @path: A valid #GtkTreePath to monitor
*
- * Creates a row reference based on @path. This reference will keep pointing to
- * the node pointed to by @path, so long as it exists. It listens to all
- * signals emitted by @model, and updates it's path appropriately. If @path
+ * Creates a row reference based on @path. This reference will keep pointing
+ * to the node pointed to by @path, so long as it exists. It listens to all
+ * signals emitted by @model, and updates its path appropriately. If @path
* isn't a valid path in @model, then %NULL is returned.
*
* Return value: A newly allocated #GtkTreeRowReference, or %NULL
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
g_return_val_if_fail (path != NULL, NULL);
+ /* We use the model itself as the proxy object; and call
+ * gtk_tree_row_reference_inserted(), etc, in the
+ * class closure (default handler) marshalers for the signal.
+ */
return gtk_tree_row_reference_new_proxy (G_OBJECT (model), model, path);
}
* @path: A valid #GtkTreePath to monitor
*
* You do not need to use this function. Creates a row reference based on
- * @path. This reference will keep pointing to the node pointed to by @path, so
- * long as it exists. If @path isn't a valid path in @model, then %NULL is
+ * @path. This reference will keep pointing to the node pointed to by @path,
+ * so long as it exists. If @path isn't a valid path in @model, then %NULL is
* returned. However, unlike references created with
* gtk_tree_row_reference_new(), it does not listen to the model for changes.
* The creator of the row reference must do this explicitly using
* gtk_tree_row_reference_inserted(), gtk_tree_row_reference_deleted(),
- * gtk_tree_row_reference_reordered(). This must be called once per signal per
- * proxy.
+ * gtk_tree_row_reference_reordered().
+ *
+ * These functions must be called exactly once per proxy when the
+ * corresponding signal on the model is emitted. This single call
+ * updates all row references for that proxy. Since built-in GTK+
+ * objects like #GtkTreeView already use this mechanism internally,
+ * using them as the proxy object will produce unpredictable results.
+ * Further more, passing the same object as @model and @proxy
+ * doesn't work for reasons of internal implementation.
*
* This type of row reference is primarily meant by structures that need to
- * carefully monitor exactly when a row_reference updates itself, and is not
+ * carefully monitor exactly when a row reference updates itself, and is not
* generally needed by most applications.
*
* Return value: A newly allocated #GtkTreeRowReference, or %NULL
parent_iter = iter;
}
- /* Make ther row reference */
+ /* Make the row reference */
reference = g_new (GtkTreeRowReference, 1);
g_object_ref (proxy);
refs = g_new (RowRefList, 1);
refs->list = NULL;
- if (G_OBJECT (model) == proxy)
- connect_ref_callbacks (model);
-
g_object_set_data_full (G_OBJECT (proxy),
- ROW_REF_DATA_STRING,
+ I_(ROW_REF_DATA_STRING),
refs, release_row_references);
}
return gtk_tree_path_copy (reference->path);
}
+/**
+ * gtk_tree_row_reference_get_model:
+ * @reference: A #GtkTreeRowReference
+ *
+ * Returns the model that the row reference is monitoring.
+ *
+ * Return value: the model
+ *
+ * Since: 2.8
+ */
+GtkTreeModel *
+gtk_tree_row_reference_get_model (GtkTreeRowReference *reference)
+{
+ g_return_val_if_fail (reference != NULL, NULL);
+
+ return reference->model;
+}
+
/**
* gtk_tree_row_reference_valid:
- * @reference: A #GtkTreeRowReference, or NULL
+ * @reference: A #GtkTreeRowReference, or %NULL
*
- * Returns TRUE if the %reference is non-NULL and refers to a current valid
+ * Returns %TRUE if the @reference is non-%NULL and refers to a current valid
* path.
*
- * Return value: TRUE if %reference points to a valid path.
+ * Return value: %TRUE if @reference points to a valid path.
**/
gboolean
gtk_tree_row_reference_valid (GtkTreeRowReference *reference)
return TRUE;
}
+
+/**
+ * gtk_tree_row_reference_copy:
+ * @reference: a #GtkTreeRowReference
+ *
+ * Copies a #GtkTreeRowReference.
+ *
+ * Return value: a copy of @reference.
+ *
+ * Since: 2.2
+ **/
+GtkTreeRowReference *
+gtk_tree_row_reference_copy (GtkTreeRowReference *reference)
+{
+ return gtk_tree_row_reference_new_proxy (reference->proxy,
+ reference->model,
+ reference->path);
+}
+
/**
* gtk_tree_row_reference_free:
- * @reference: A #GtkTreeRowReference, or NULL
+ * @reference: A #GtkTreeRowReference, or %NULL
*
- * Free's %reference. %reference may be NULL.
+ * Free's @reference. @reference may be %NULL.
**/
void
gtk_tree_row_reference_free (GtkTreeRowReference *reference)
if (refs->list == NULL)
{
- disconnect_ref_callbacks (reference->model);
g_object_set_data (G_OBJECT (reference->proxy),
- ROW_REF_DATA_STRING,
+ I_(ROW_REF_DATA_STRING),
NULL);
}
{
g_return_if_fail (G_IS_OBJECT (proxy));
- gtk_tree_row_ref_inserted_callback (NULL, path, NULL, proxy);
-
+ gtk_tree_row_ref_inserted ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, NULL);
}
/**
- * gtk_tree_row_reference_inserted:
+ * gtk_tree_row_reference_deleted:
* @proxy: A #GObject
* @path: The path position that was deleted
*
{
g_return_if_fail (G_IS_OBJECT (proxy));
- gtk_tree_row_ref_deleted_callback (NULL, path, proxy);
+ gtk_tree_row_ref_deleted ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path);
}
/**
{
g_return_if_fail (G_IS_OBJECT (proxy));
- gtk_tree_row_ref_reordered_callback (NULL, path, iter, new_order, proxy);
+ gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (proxy, ROW_REF_DATA_STRING), path, iter, new_order);
}
-
+#define __GTK_TREE_MODEL_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff