/* gtktreestore.c
- * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
+ * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* Boston, MA 02111-1307, USA.
*/
+#include <string.h>
+#include <gobject/gvaluecollector.h>
#include "gtktreemodel.h"
#include "gtktreestore.h"
#include "gtktreedatalist.h"
#include "gtktreednd.h"
-#include <string.h>
-#include <gobject/gvaluecollector.h>
#define G_NODE(node) ((GNode *)node)
#define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != -2)
static void gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface);
static void gtk_tree_store_sortable_init (GtkTreeSortableIface *iface);
static void gtk_tree_store_finalize (GObject *object);
-static void gtk_tree_store_destroy (GtkObject *object);
-static guint gtk_tree_store_get_flags (GtkTreeModel *tree_model);
+static GtkTreeModelFlags gtk_tree_store_get_flags (GtkTreeModel *tree_model);
static gint gtk_tree_store_get_n_columns (GtkTreeModel *tree_model);
static GType gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
gint index);
GtkTreePath *dest,
GtkSelectionData *selection_data);
static gboolean gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreeModel *src_model,
- GtkTreePath *src_path,
- GtkTreePath *dest_path);
+ GtkTreePath *dest_path,
+ GtkSelectionData *selection_data);
/* Sortable Interfaces */
GtkDestroyNotify destroy);
static gboolean gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable);
-static void validate_gnode (GNode *node);
+static void validate_gnode (GNode *node);
+
+static void gtk_tree_store_move (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position,
+ gboolean before);
+
+
+static GObjectClass *parent_class = NULL;
+
static inline void
validate_tree (GtkTreeStore *tree_store)
}
}
-GtkType
+GType
gtk_tree_store_get_type (void)
{
static GType tree_store_type = 0;
NULL
};
- tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore", &tree_store_info, 0);
+ tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore",
+ &tree_store_info, 0);
g_type_add_interface_static (tree_store_type,
GTK_TYPE_TREE_MODEL,
}
static void
-gtk_tree_store_class_init (GtkTreeStoreClass *tree_store_class)
+gtk_tree_store_class_init (GtkTreeStoreClass *class)
{
GObjectClass *object_class;
- GtkObjectClass *gobject_class;
- object_class = (GObjectClass *) tree_store_class;
- gobject_class = (GtkObjectClass *) tree_store_class;
+ parent_class = g_type_class_peek_parent (class);
+ object_class = (GObjectClass *) class;
object_class->finalize = gtk_tree_store_finalize;
- gobject_class->destroy = gtk_tree_store_destroy;
}
static void
gtk_tree_store_init (GtkTreeStore *tree_store)
{
tree_store->root = g_node_new (NULL);
+ /* While the odds are against us getting 0...
+ */
do
{
tree_store->stamp = g_random_int ();
}
while (tree_store->stamp == 0);
+
tree_store->sort_list = NULL;
tree_store->sort_column_id = -2;
+ tree_store->columns_dirty = FALSE;
}
/**
* @Varargs: all #GType types for the columns, from first to last
*
* Creates a new tree store as with @n_columns columns each of the types passed
- * in. As an example, gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
- * GDK_TYPE_PIXBUF); will create a new GtkTreeStore with three columns, of type
- * int, string and GDkPixbuf respectively.
+ * in. As an example, <literal>gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
+ * GDK_TYPE_PIXBUF);</literal> will create a new #GtkTreeStore with three columns, of type
+ * <type>int</type>, <type>string</type> and #GdkPixbuf respectively.
*
* Return value: a new #GtkTreeStore
**/
g_return_val_if_fail (n_columns > 0, NULL);
- retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+ retval = g_object_new (GTK_TYPE_TREE_STORE, NULL);
gtk_tree_store_set_n_columns (retval, n_columns);
va_start (args, n_columns);
GType type = va_arg (args, GType);
if (! _gtk_tree_data_list_check_type (type))
{
- g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type));
- g_object_unref (G_OBJECT (retval));
+ g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n",
+ G_STRLOC, g_type_name (type));
+ g_object_unref (retval);
return NULL;
}
gtk_tree_store_set_column_type (retval, i, type);
g_return_val_if_fail (n_columns > 0, NULL);
- retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+ retval = g_object_new (GTK_TYPE_TREE_STORE, NULL);
gtk_tree_store_set_n_columns (retval, n_columns);
for (i = 0; i < n_columns; i++)
{
if (! _gtk_tree_data_list_check_type (types[i]))
{
- g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (types[i]));
- g_object_unref (G_OBJECT (retval));
+ g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n",
+ G_STRLOC, g_type_name (types[i]));
+ g_object_unref (retval);
return NULL;
}
gtk_tree_store_set_column_type (retval, i, types[i]);
return retval;
}
+
+/**
+ * gtk_tree_store_set_column_types:
+ * @tree_store: A #GtkTreeStore
+ * @n_columns: Number of columns for the tree store
+ * @types: An array of #GType types, one for each column
+ *
+ * This function is meant primarily for #GObjects that inherit from
+ * #GtkTreeStore, and should only be used when constructing a new
+ * #GtkTreeStore. It will not function after a row has been added,
+ * or a method on the #GtkTreeModel interface is called.
+ **/
+void
+gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
+ gint n_columns,
+ GType *types)
+{
+ gint i;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (tree_store->columns_dirty == 0);
+
+ gtk_tree_store_set_n_columns (tree_store, n_columns);
+ for (i = 0; i < n_columns; i++)
+ {
+ if (! _gtk_tree_data_list_check_type (types[i]))
+ {
+ g_warning ("%s: Invalid type %s passed to gtk_tree_store_set_column_types\n", G_STRLOC, g_type_name (types[i]));
+ continue;
+ }
+ gtk_tree_store_set_column_type (tree_store, i, types[i]);
+ }
+}
+
static void
gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
gint n_columns)
tree_store->column_headers[column] = type;
}
-static void
+static gboolean
node_free (GNode *node, gpointer data)
{
- _gtk_tree_data_list_free (node->data, (GType*)data);
+ if (node->data)
+ _gtk_tree_data_list_free (node->data, (GType*)data);
+ node->data = NULL;
+
+ return FALSE;
}
static void
{
GtkTreeStore *tree_store = GTK_TREE_STORE (object);
- g_node_children_foreach (tree_store->root, G_TRAVERSE_LEAFS, node_free, tree_store->column_headers);
+ g_node_traverse (tree_store->root, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+ node_free, tree_store->column_headers);
+ g_node_destroy (tree_store->root);
_gtk_tree_data_list_header_free (tree_store->sort_list);
g_free (tree_store->column_headers);
-}
-
-static void
-gtk_tree_store_destroy (GtkObject *gobject)
-{
- GtkTreeStore *tree_store = GTK_TREE_STORE (gobject);
if (tree_store->default_sort_destroy)
{
- (* tree_store->default_sort_destroy) (tree_store->default_sort_data);
+ GtkDestroyNotify d = tree_store->default_sort_destroy;
+
tree_store->default_sort_destroy = NULL;
+ d (tree_store->default_sort_data);
tree_store->default_sort_data = NULL;
}
+
+ /* must chain up */
+ (* parent_class->finalize) (object);
}
/* fulfill the GtkTreeModel requirements */
*/
-static guint
+static GtkTreeModelFlags
gtk_tree_store_get_flags (GtkTreeModel *tree_model)
{
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
static gint
gtk_tree_store_get_n_columns (GtkTreeModel *tree_model)
{
+ GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
+
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
- return GTK_TREE_STORE (tree_model)->n_columns;
+ tree_store->columns_dirty = TRUE;
+
+ return tree_store->n_columns;
}
static GType
gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
gint index)
{
+ GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
+
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), G_TYPE_INVALID);
g_return_val_if_fail (index < GTK_TREE_STORE (tree_model)->n_columns &&
index >= 0, G_TYPE_INVALID);
- return GTK_TREE_STORE (tree_model)->column_headers[index];
+ tree_store->columns_dirty = TRUE;
+
+ return tree_store->column_headers[index];
}
static gboolean
gint depth, i;
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
-
+
+ tree_store->columns_dirty = TRUE;
+
indices = gtk_tree_path_get_indices (path);
depth = gtk_tree_path_get_depth (path);
g_return_if_fail (GTK_IS_TREE_STORE (tree_model));
g_return_if_fail (iter != NULL);
+ g_return_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp);
g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns);
list = G_NODE (iter->user_data)->data;
gtk_tree_store_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
+ g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
+ g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
if (G_NODE (iter->user_data)->next)
{
GNode *children;
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
+ g_return_val_if_fail (parent == NULL || parent->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
if (parent)
children = G_NODE (parent->user_data)->children;
GtkTreeIter *iter)
{
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
- g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
return G_NODE (iter->user_data)->children != NULL;
GNode *parent;
g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
+ g_return_val_if_fail (child != NULL, FALSE);
+ g_return_val_if_fail (child->user_data != NULL, FALSE);
+ g_return_val_if_fail (child->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
parent = G_NODE (child->user_data)->parent;
/* Does not emit a signal */
-gboolean
+static gboolean
gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
GtkTreeIter *iter,
gint column,
- GValue *value)
+ GValue *value,
+ gboolean sort)
{
GtkTreeDataList *list;
GtkTreeDataList *prev;
- GtkTreePath *path = NULL;
+ gint old_column = column;
GValue real_value = {0, };
gboolean converted = FALSE;
- gint orig_column = column;
gboolean retval = FALSE;
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
+ g_return_val_if_fail (column >= 0 && column < tree_store->n_columns, FALSE);
+ g_return_val_if_fail (G_IS_VALUE (value), FALSE);
+
if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
{
if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
prev = list = G_NODE (iter->user_data)->data;
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
-
while (list != NULL)
{
if (column == 0)
else
_gtk_tree_data_list_value_to_node (list, value);
retval = TRUE;
- gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
return retval;
list->next = NULL;
column --;
}
+
if (converted)
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
-
- gtk_tree_path_free (path);
+
+ retval = TRUE;
if (converted)
g_value_unset (&real_value);
- if (GTK_TREE_STORE_IS_SORTED (tree_store))
- gtk_tree_store_sort_iter_changed (tree_store, iter, orig_column);
+ if (sort && GTK_TREE_STORE_IS_SORTED (tree_store))
+ gtk_tree_store_sort_iter_changed (tree_store, iter, old_column);
return retval;
}
g_return_if_fail (column >= 0 && column < tree_store->n_columns);
g_return_if_fail (G_IS_VALUE (value));
- if (gtk_tree_store_real_set_value (tree_store, iter, column, value))
+ if (gtk_tree_store_real_set_value (tree_store, iter, column, value, TRUE))
{
GtkTreePath *path;
* gtk_tree_store_set_valist:
* @tree_store: A #GtkTreeStore
* @iter: A valid #GtkTreeIter for the row being modified
- * @var_args: va_list of column/value pairs
+ * @var_args: <type>va_list</type> of column/value pairs
*
- * See @gtk_tree_store_set; this version takes a va_list for
+ * See gtk_tree_store_set(); this version takes a <type>va_list</type> for
* use by language bindings.
*
**/
{
gint column;
gboolean emit_signal = FALSE;
+ gboolean maybe_need_sort = FALSE;
+ GtkTreeIterCompareFunc func = NULL;
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (VALID_ITER (iter, tree_store));
column = va_arg (var_args, gint);
+ if (GTK_TREE_STORE_IS_SORTED (tree_store))
+ {
+ if (tree_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+ header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+ tree_store->sort_column_id);
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+ func = header->func;
+ }
+ else
+ {
+ func = tree_store->default_sort_func;
+ }
+ }
+
+ if (func != gtk_tree_data_list_compare_func)
+ maybe_need_sort = TRUE;
+
while (column != -1)
{
GValue value = { 0, };
emit_signal = gtk_tree_store_real_set_value (tree_store,
iter,
column,
- &value) || emit_signal;
+ &value,
+ FALSE) || emit_signal;
+
+ if (func == gtk_tree_data_list_compare_func &&
+ column == tree_store->sort_column_id)
+ maybe_need_sort = TRUE;
g_value_unset (&value);
column = va_arg (var_args, gint);
}
+
+ if (maybe_need_sort && GTK_TREE_STORE_IS_SORTED (tree_store))
+ gtk_tree_store_sort_iter_changed (tree_store, iter, tree_store->sort_column_id);
+
if (emit_signal)
{
GtkTreePath *path;
*
* Sets the value of one or more cells in the row referenced by @iter.
* The variable argument list should contain integer column numbers,
- * each column number followed by the value to be set. For example,
+ * each column number followed by the value to be set.
* The list is terminated by a -1. For example, to set column 0 with type
- * %G_TYPE_STRING to "Foo", you would write gtk_tree_store_set (store, iter,
- * 0, "Foo", -1).
+ * %G_TYPE_STRING to "Foo", you would write
+ * <literal>gtk_tree_store_set (store, iter, 0, "Foo", -1)</literal>.
**/
void
gtk_tree_store_set (GtkTreeStore *tree_store,
* @iter: A valid #GtkTreeIter
*
* Removes @iter from @tree_store. After being removed, @iter is set to the
- * next valid row at that level, or invalidated if it previeously pointed to the last one.
+ * next valid row at that level, or invalidated if it previously pointed to the
+ * last one.
+ *
+ * Return value: %TRUE if @iter is still valid, %FALSE if not.
**/
-void
+gboolean
gtk_tree_store_remove (GtkTreeStore *tree_store,
GtkTreeIter *iter)
{
GNode *parent;
GNode *next_node;
- g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
- g_return_if_fail (VALID_ITER (iter, tree_store));
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
parent = G_NODE (iter->user_data)->parent;
g_assert (parent != NULL);
- next_node = G_NODE (iter->user_data);
+ next_node = G_NODE (iter->user_data)->next;
if (G_NODE (iter->user_data)->data)
- _gtk_tree_data_list_free ((GtkTreeDataList *) G_NODE (iter->user_data)->data,
- tree_store->column_headers);
+ g_node_traverse (G_NODE (iter->user_data), G_POST_ORDER, G_TRAVERSE_ALL,
+ -1, node_free, tree_store->column_headers);
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
g_node_destroy (G_NODE (iter->user_data));
{
iter->stamp = tree_store->stamp;
iter->user_data = next_node;
+ return TRUE;
}
else
{
iter->stamp = 0;
+ iter->user_data = NULL;
}
+
+ return FALSE;
}
/**
* gtk_tree_store_insert:
- * @tree_store: A #GtkListStore
+ * @tree_store: A #GtkTreeStore
* @iter: An unset #GtkTreeIter to set to the new row
* @parent: A valid #GtkTreeIter, or %NULL
* @position: position to insert the new row
*
- * Creates a new row at @position. If parent is non-NULL, then the row will be
+ * Creates a new row at @position. If parent is non-%NULL, then the row will be
* made a child of @parent. Otherwise, the row will be created at the toplevel.
* If @position is larger than the number of rows at that level, then the new
* row will be inserted to the end of the list. @iter will be changed to point
- * to this new row. The row will be empty before this function is called. To
- * fill in values, you need to call @gtk_list_store_set or
- * @gtk_list_store_set_value.
+ * to this new row. The row will be empty after this function is called. To
+ * fill in values, you need to call gtk_tree_store_set() or
+ * gtk_tree_store_set_value().
*
**/
void
else
parent_node = tree_store->root;
+ tree_store->columns_dirty = TRUE;
+
iter->stamp = tree_store->stamp;
iter->user_data = g_node_new (NULL);
g_node_insert (parent_node, position, G_NODE (iter->user_data));
* @sibling: A valid #GtkTreeIter, or %NULL
*
* Inserts a new row before @sibling. If @sibling is %NULL, then the row will
- * be appended to the beginning of the @parent 's children. If @parent and
- * @sibling are %NULL, then the row will be appended to the toplevel. If both
- * @sibling and @parent are set, then @parent must be the parent of @sibling.
- * When @sibling is set, @parent is optional.
+ * be appended to @parent 's children. If @parent and @sibling are %NULL, then
+ * the row will be appended to the toplevel. If both @sibling and @parent are
+ * set, then @parent must be the parent of @sibling. When @sibling is set,
+ * @parent is optional.
*
* @iter will be changed to point to this new row. The row will be empty after
* this function is called. To fill in values, you need to call
- * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ * gtk_tree_store_set() or gtk_tree_store_set_value().
*
**/
void
if (sibling != NULL)
g_return_if_fail (VALID_ITER (sibling, tree_store));
+ tree_store->columns_dirty = TRUE;
+
new_node = g_node_new (NULL);
if (parent == NULL && sibling == NULL)
* @sibling: A valid #GtkTreeIter, or %NULL
*
* Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
- * prepended to the beginning of the @parent 's children. If @parent and
- * @sibling are %NULL, then the row will be prepended to the toplevel. If both
- * @sibling and @parent are set, then @parent must be the parent of @sibling.
- * When @sibling is set, @parent is optional.
+ * prepended to @parent 's children. If @parent and @sibling are %NULL, then
+ * the row will be prepended to the toplevel. If both @sibling and @parent are
+ * set, then @parent must be the parent of @sibling. When @sibling is set,
+ * @parent is optional.
*
* @iter will be changed to point to this new row. The row will be empty after
* this function is called. To fill in values, you need to call
- * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ * gtk_tree_store_set() or gtk_tree_store_set_value().
*
**/
void
if (sibling != NULL)
g_return_if_fail (VALID_ITER (sibling, tree_store));
+ tree_store->columns_dirty = TRUE;
+
new_node = g_node_new (NULL);
if (parent == NULL && sibling == NULL)
* @iter: An unset #GtkTreeIter to set to the prepended row
* @parent: A valid #GtkTreeIter, or %NULL
*
- * Prepends a new row to @tree_store. If @parent is non-NULL, then it will prepend
- * the new row before the last child of @parent, otherwise it will prepend a row
+ * Prepends a new row to @tree_store. If @parent is non-%NULL, then it will prepend
+ * the new row before the first child of @parent, otherwise it will prepend a row
* to the top level. @iter will be changed to point to this new row. The row
* will be empty after this function is called. To fill in values, you need to
- * call @gtk_tree_store_set or @gtk_tree_store_set_value.
+ * call gtk_tree_store_set() or gtk_tree_store_set_value().
**/
void
gtk_tree_store_prepend (GtkTreeStore *tree_store,
if (parent != NULL)
g_return_if_fail (VALID_ITER (parent, tree_store));
+ tree_store->columns_dirty = TRUE;
+
if (parent == NULL)
parent_node = tree_store->root;
else
iter->stamp = tree_store->stamp;
iter->user_data = g_node_new (NULL);
- g_node_prepend (parent_node, iter->user_data);
+ g_node_prepend (parent_node, G_NODE (iter->user_data));
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
* @iter: An unset #GtkTreeIter to set to the appended row
* @parent: A valid #GtkTreeIter, or %NULL
*
- * Appends a new row to @tree_store. If @parent is non-NULL, then it will append the
+ * Appends a new row to @tree_store. If @parent is non-%NULL, then it will append the
* new row after the last child of @parent, otherwise it will append a row to
* the top level. @iter will be changed to point to this new row. The row will
* be empty after this function is called. To fill in values, you need to call
- * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ * gtk_tree_store_set() or gtk_tree_store_set_value().
**/
void
gtk_tree_store_append (GtkTreeStore *tree_store,
else
parent_node = parent->user_data;
+ tree_store->columns_dirty = TRUE;
+
if (parent_node->children == NULL)
{
GtkTreePath *path;
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), 0);
g_return_val_if_fail (VALID_ITER (iter, tree_store), 0);
- return g_node_depth (G_NODE (iter->user_data)) - 1;
+ return g_node_depth (G_NODE (iter->user_data)) - 2;
}
+/* simple ripoff from g_node_traverse_post_order */
+static gboolean
+gtk_tree_store_clear_traverse (GNode *node,
+ GtkTreeStore *store)
+{
+ GtkTreeIter iter;
+
+ if (node->children)
+ {
+ GNode *child;
+
+ child = node->children;
+ while (child)
+ {
+ register GNode *current;
+
+ current = child;
+ child = current->next;
+ if (gtk_tree_store_clear_traverse (current, store))
+ return TRUE;
+ }
+
+ if (node->parent)
+ {
+ iter.stamp = store->stamp;
+ iter.user_data = node;
+
+ gtk_tree_store_remove (store, &iter);
+ }
+ }
+ else if (node->parent)
+ {
+ iter.stamp = store->stamp;
+ iter.user_data = node;
+
+ gtk_tree_store_remove (store, &iter);
+ }
+
+ return FALSE;
+}
/**
* gtk_tree_store_clear:
- * @tree_store: @ #GtkTreeStore
+ * @tree_store: a #GtkTreeStore
*
* Removes all rows from @tree_store
**/
void
gtk_tree_store_clear (GtkTreeStore *tree_store)
{
- GtkTreeIter iter;
-
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
- while (G_NODE (tree_store->root)->children)
+ gtk_tree_store_clear_traverse (tree_store->root, tree_store);
+}
+
+static gboolean
+gtk_tree_store_iter_is_valid_helper (GtkTreeIter *iter,
+ GNode *first)
+{
+ GNode *node;
+
+ node = first;
+
+ do
{
- iter.stamp = tree_store->stamp;
- iter.user_data = G_NODE (tree_store->root)->children;
- gtk_tree_store_remove (tree_store, &iter);
+ if (node == iter->user_data)
+ return TRUE;
+
+ if (node->children)
+ if (gtk_tree_store_iter_is_valid_helper (iter, node->children))
+ return TRUE;
+
+ node = node->next;
}
+ while (node);
+
+ return FALSE;
+}
+
+/**
+ * gtk_tree_store_iter_is_valid:
+ * @tree_store: A #GtkTreeStore.
+ * @iter: A #GtkTreeIter.
+ *
+ * WARNING: This function is slow. Only use it for debugging and/or testing
+ * purposes.
+ *
+ * Checks if the given iter is a valid iter for this #GtkTreeStore.
+ *
+ * Return value: %TRUE if the iter is valid, %FALSE if the iter is invalid.
+ **/
+gboolean
+gtk_tree_store_iter_is_valid (GtkTreeStore *tree_store,
+ GtkTreeIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ if (!VALID_ITER (iter, tree_store))
+ return FALSE;
+
+ return gtk_tree_store_iter_is_valid_helper (iter, tree_store->root);
}
/* DND */
* default handler.
*/
- if (gtk_selection_data_set_tree_row (selection_data,
- GTK_TREE_MODEL (drag_source),
- path))
+ if (gtk_tree_set_row_drag_data (selection_data,
+ GTK_TREE_MODEL (drag_source),
+ path))
{
return TRUE;
}
validate_tree (tree_store);
- if (gtk_selection_data_get_tree_row (selection_data,
- &src_model,
- &src_path) &&
+ if (gtk_tree_get_row_drag_data (selection_data,
+ &src_model,
+ &src_path) &&
src_model == tree_model)
{
/* Copy the given row to a new position */
/* Get the parent, NULL if parent is the root */
dest_parent_p = NULL;
parent = gtk_tree_path_copy (dest);
- if (gtk_tree_path_up (parent))
+ if (gtk_tree_path_up (parent) &&
+ gtk_tree_path_get_depth (parent) > 0)
{
gtk_tree_model_get_iter (tree_model,
&dest_parent,
prev))
{
GtkTreeIter tmp_iter = dest_iter;
- gtk_tree_store_insert_after (GTK_TREE_STORE (tree_model),
- &dest_iter,
- NULL,
- &tmp_iter);
+
+ if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append")))
+ {
+ GtkTreeIter parent;
+
+ if (gtk_tree_model_iter_parent (GTK_TREE_MODEL (tree_model), &parent, &tmp_iter))
+ gtk_tree_store_append (GTK_TREE_STORE (tree_model),
+ &dest_iter, &parent);
+ else
+ gtk_tree_store_append (GTK_TREE_STORE (tree_model),
+ &dest_iter, NULL);
+ }
+ else
+ gtk_tree_store_insert_after (GTK_TREE_STORE (tree_model),
+ &dest_iter,
+ NULL,
+ &tmp_iter);
retval = TRUE;
}
}
+ g_object_set_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append",
+ NULL);
+
gtk_tree_path_free (prev);
/* If we succeeded in creating dest_iter, walk src_iter tree branch,
}
static gboolean
-gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreeModel *src_model,
- GtkTreePath *src_path,
- GtkTreePath *dest_path)
+gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
+ GtkTreePath *dest_path,
+ GtkSelectionData *selection_data)
{
+ GtkTreeModel *src_model = NULL;
+ GtkTreePath *src_path = NULL;
+ GtkTreePath *tmp = NULL;
+ gboolean retval = FALSE;
+
+ g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE);
+
+ /* don't accept drops if the tree has been sorted */
+ if (GTK_TREE_STORE_IS_SORTED (drag_dest))
+ return FALSE;
+
+ if (!gtk_tree_get_row_drag_data (selection_data,
+ &src_model,
+ &src_path))
+ goto out;
+
/* can only drag to ourselves */
if (src_model != GTK_TREE_MODEL (drag_dest))
- return FALSE;
+ goto out;
/* Can't drop into ourself. */
if (gtk_tree_path_is_ancestor (src_path,
dest_path))
- return FALSE;
+ goto out;
/* Can't drop if dest_path's parent doesn't exist */
{
GtkTreeIter iter;
- GtkTreePath *tmp = gtk_tree_path_copy (dest_path);
- /* if we can't go up, we know the parent exists, the root
- * always exists.
- */
- if (gtk_tree_path_up (tmp))
+ if (gtk_tree_path_get_depth (dest_path) > 1)
{
- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_dest),
- &iter, tmp))
- {
- if (tmp)
- gtk_tree_path_free (tmp);
- return FALSE;
- }
+ tmp = gtk_tree_path_copy (dest_path);
+ gtk_tree_path_up (tmp);
+
+ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_dest),
+ &iter, tmp))
+ goto out;
}
-
- if (tmp)
- gtk_tree_path_free (tmp);
}
-
+
/* Can otherwise drop anywhere. */
- return TRUE;
+ retval = TRUE;
+
+ out:
+
+ if (src_path)
+ gtk_tree_path_free (src_path);
+ if (tmp)
+ gtk_tree_path_free (tmp);
+
+ return retval;
}
-/* Sorting */
+/* Sorting and reordering */
typedef struct _SortTuple
{
gint offset;
GNode *node;
} SortTuple;
+/* Reordering */
+static gint
+gtk_tree_store_reorder_func (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data)
+{
+ SortTuple *a_reorder;
+ SortTuple *b_reorder;
+
+ a_reorder = (SortTuple *)a;
+ b_reorder = (SortTuple *)b;
+
+ if (a_reorder->offset < b_reorder->offset)
+ return -1;
+ if (a_reorder->offset > b_reorder->offset)
+ return 1;
+
+ return 0;
+}
+
+/**
+ * gtk_tree_store_reorder:
+ * @tree_store: A #GtkTreeStore.
+ * @parent: A #GtkTreeIter.
+ * @new_order: An integer array indication the new order for the list.
+ *
+ * Reorders the children of @parent in @tree_store to follow the order
+ * indicated by @new_order. Note that this function only works with
+ * unsorted stores.
+ **/
+void
+gtk_tree_store_reorder (GtkTreeStore *tree_store,
+ GtkTreeIter *parent,
+ gint *new_order)
+{
+ gint i, length = 0;
+ GNode *level, *node;
+ GtkTreePath *path;
+ SortTuple *sort_array;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (tree_store));
+ g_return_if_fail (parent == NULL || VALID_ITER (parent, tree_store));
+ g_return_if_fail (new_order != NULL);
+
+ if (!parent)
+ level = G_NODE (tree_store->root)->children;
+ else
+ level = G_NODE (parent->user_data)->children;
+
+ /* count nodes */
+ node = level;
+ while (node)
+ {
+ length++;
+ node = node->next;
+ }
+
+ /* set up sortarray */
+ sort_array = g_new (SortTuple, length);
+
+ node = level;
+ for (i = 0; i < length; i++)
+ {
+ sort_array[i].offset = new_order[i];
+ sort_array[i].node = node;
+
+ node = node->next;
+ }
+
+ g_qsort_with_data (sort_array,
+ length,
+ sizeof (SortTuple),
+ gtk_tree_store_reorder_func,
+ NULL);
+
+ /* fix up level */
+ for (i = 0; i < length - 1; i++)
+ {
+ sort_array[i].node->next = sort_array[i+1].node;
+ sort_array[i+1].node->prev = sort_array[i].node;
+ }
+
+ sort_array[length-1].node->next = NULL;
+ sort_array[0].node->prev = NULL;
+ if (parent)
+ G_NODE (parent->user_data)->children = sort_array[0].node;
+ else
+ G_NODE (tree_store->root)->children = sort_array[0].node;
+
+ /* emit signal */
+ if (parent)
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), parent);
+ else
+ path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path,
+ parent, new_order);
+ gtk_tree_path_free (path);
+ g_free (sort_array);
+}
+
+/**
+ * gtk_tree_store_swap:
+ * @tree_store: A #GtkTreeStore.
+ * @a: A #GtkTreeIter.
+ * @b: Another #GtkTreeIter.
+ *
+ * Swaps @a and @b in the same level of @tree_store. Note that this function
+ * only works with unsorted stores.
+ **/
+void
+gtk_tree_store_swap (GtkTreeStore *tree_store,
+ GtkTreeIter *a,
+ GtkTreeIter *b)
+{
+ GNode *tmp, *node_a, *node_b, *parent_node;
+ GNode *a_prev, *a_next, *b_prev, *b_next;
+ gint i, a_count, b_count, length, *order;
+ GtkTreePath *path_a, *path_b;
+ GtkTreeIter parent;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (VALID_ITER (a, tree_store));
+ g_return_if_fail (VALID_ITER (b, tree_store));
+
+ node_a = G_NODE (a->user_data);
+ node_b = G_NODE (b->user_data);
+
+ /* basic sanity checking */
+ if (node_a == node_b)
+ return;
+
+ path_a = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), a);
+ path_b = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), b);
+
+ g_return_if_fail (path_a && path_b);
+
+ gtk_tree_path_up (path_a);
+ gtk_tree_path_up (path_b);
+
+ if (gtk_tree_path_compare (path_a, path_b))
+ {
+ gtk_tree_path_free (path_a);
+ gtk_tree_path_free (path_b);
+
+ g_warning ("Given childs are not in the same level\n");
+ return;
+ }
+
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path_a);
+ parent_node = G_NODE (parent.user_data);
+
+ gtk_tree_path_free (path_b);
+
+ /* old links which we have to keep around */
+ a_prev = node_a->prev;
+ a_next = node_a->next;
+
+ b_prev = node_b->prev;
+ b_next = node_b->next;
+
+ /* fix up links if the nodes are next to eachother */
+ if (a_prev == node_b)
+ a_prev = node_a;
+ if (a_next == node_b)
+ a_next = node_a;
+
+ if (b_prev == node_a)
+ b_prev = node_b;
+ if (b_next == node_a)
+ b_next = node_b;
+
+ /* counting nodes */
+ tmp = parent_node->children;
+ i = a_count = b_count = 0;
+ while (tmp)
+ {
+ if (tmp == node_a)
+ a_count = i;
+ if (tmp == node_b)
+ b_count = i;
+
+ tmp = tmp->next;
+ i++;
+ }
+ length = i;
+
+ /* hacking the tree */
+ if (!a_prev)
+ parent_node->children = node_b;
+ else
+ a_prev->next = node_b;
+
+ if (a_next)
+ a_next->prev = node_b;
+
+ if (!b_prev)
+ parent_node->children = node_a;
+ else
+ b_prev->next = node_a;
+
+ if (b_next)
+ b_next->prev = node_a;
+
+ node_a->prev = b_prev;
+ node_a->next = b_next;
+
+ node_b->prev = a_prev;
+ node_b->next = a_next;
+
+ /* emit signal */
+ order = g_new (gint, length);
+ for (i = 0; i < length; i++)
+ if (i == a_count)
+ order[i] = b_count;
+ else if (i == b_count)
+ order[i] = a_count;
+ else
+ order[i] = i;
+
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path_a,
+ &parent, order);
+ gtk_tree_path_free (path_a);
+ g_free (order);
+}
+
+/* WARNING: this function is *incredibly* fragily. Please smashtest after
+ * making changes here.
+ * -Kris
+ */
+static void
+gtk_tree_store_move (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position,
+ gboolean before)
+{
+ GNode *parent, *node, *a, *b, *tmp, *tmp_a, *tmp_b;
+ gint old_pos, new_pos, length, i, *order;
+ GtkTreePath *path = NULL, *tmppath, *pos_path = NULL;
+ GtkTreeIter parent_iter, dst_a, dst_b;
+ gint depth = 0;
+ gboolean handle_b = TRUE;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (tree_store));
+ g_return_if_fail (VALID_ITER (iter, tree_store));
+ if (position)
+ g_return_if_fail (VALID_ITER (position, tree_store));
+
+ a = b = NULL;
+
+ /* sanity checks */
+ if (position)
+ {
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+ pos_path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store),
+ position);
+
+ /* if before:
+ * moving the iter before path or "path + 1" doesn't make sense
+ * else
+ * moving the iter before path or "path - 1" doesn't make sense
+ */
+ if (!gtk_tree_path_compare (path, pos_path))
+ goto free_paths_and_out;
+
+ if (before)
+ gtk_tree_path_next (path);
+ else
+ gtk_tree_path_prev (path);
+
+ if (!gtk_tree_path_compare (path, pos_path))
+ goto free_paths_and_out;
+
+ if (before)
+ gtk_tree_path_prev (path);
+ else
+ gtk_tree_path_next (path);
+
+ if (gtk_tree_path_get_depth (path) != gtk_tree_path_get_depth (pos_path))
+ {
+ g_warning ("Given childs are not in the same level\n");
+
+ goto free_paths_and_out;
+ }
+
+ tmppath = gtk_tree_path_copy (pos_path);
+ gtk_tree_path_up (path);
+ gtk_tree_path_up (tmppath);
+
+ if (gtk_tree_path_get_depth (path) > 0 &&
+ gtk_tree_path_compare (path, tmppath))
+ {
+ g_warning ("Given childs are not in the same level\n");
+
+ gtk_tree_path_free (tmppath);
+ goto free_paths_and_out;
+ }
+
+ gtk_tree_path_free (tmppath);
+ }
+
+ if (!path)
+ {
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_path_up (path);
+ }
+
+ depth = gtk_tree_path_get_depth (path);
+
+ if (depth)
+ {
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent_iter, path);
+ gtk_tree_path_free (path);
+
+ parent = G_NODE (parent_iter.user_data);
+ }
+ else
+ parent = G_NODE (tree_store->root);
+
+ /* yes, I know that this can be done shorter, but I'm doing it this way
+ * so the code is also maintainable
+ */
+
+ if (before && position)
+ {
+ b = G_NODE (position->user_data);
+
+ if (gtk_tree_path_get_indices (pos_path)[gtk_tree_path_get_depth (pos_path) - 1] > 0)
+ {
+ gtk_tree_path_prev (pos_path);
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &dst_a, pos_path))
+ a = G_NODE (dst_a.user_data);
+ else
+ a = NULL;
+ gtk_tree_path_next (pos_path);
+ }
+
+ /* if b is NULL, a is NULL too -- we are at the beginning of the list
+ * yes and we leak memory here ...
+ */
+ g_return_if_fail (b);
+ }
+ else if (before && !position)
+ {
+ /* move before without position is appending */
+ a = NULL;
+ b = NULL;
+ }
+ else /* !before */
+ {
+ if (position)
+ a = G_NODE (position->user_data);
+ else
+ a = NULL;
+
+ if (position)
+ {
+ gtk_tree_path_next (pos_path);
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &dst_b, pos_path))
+ b = G_NODE (dst_b.user_data);
+ else
+ b = NULL;
+ gtk_tree_path_prev (pos_path);
+ }
+ else
+ {
+ /* move after without position is prepending */
+ if (depth)
+ gtk_tree_model_iter_children (GTK_TREE_MODEL (tree_store), &dst_b,
+ &parent_iter);
+ else
+ gtk_tree_model_iter_children (GTK_TREE_MODEL (tree_store), &dst_b,
+ NULL);
+
+ b = G_NODE (dst_b.user_data);
+ }
+
+ /* if a is NULL, a is NULL too -- we are at the end of the list
+ * yes and we leak memory here ...
+ */
+ if (position)
+ g_return_if_fail (a);
+ }
+
+ /* counting nodes */
+ tmp = parent->children;
+
+ length = old_pos = 0;
+ while (tmp)
+ {
+ if (tmp == iter->user_data)
+ old_pos = length;
+
+ tmp = tmp->next;
+ length++;
+ }
+
+ /* remove node from list */
+ node = G_NODE (iter->user_data);
+ tmp_a = node->prev;
+ tmp_b = node->next;
+
+ if (tmp_a)
+ tmp_a->next = tmp_b;
+ else
+ parent->children = tmp_b;
+
+ if (tmp_b)
+ tmp_b->prev = tmp_a;
+
+ /* and reinsert the node */
+ if (a)
+ {
+ tmp = a->next;
+
+ a->next = node;
+ node->next = tmp;
+ node->prev = a;
+ }
+ else if (!a && !before)
+ {
+ tmp = parent->children;
+
+ node->prev = NULL;
+ parent->children = node;
+
+ node->next = tmp;
+ tmp->prev = node;
+
+ handle_b = FALSE;
+ }
+ else if (!a && before)
+ {
+ if (!position)
+ {
+ node->parent = NULL;
+ node->next = node->prev = NULL;
+
+ /* before with sibling = NULL appends */
+ g_node_insert_before (parent, NULL, node);
+ }
+ else
+ {
+ node->parent = NULL;
+ node->next = node->prev = NULL;
+
+ /* after with sibling = NULL prepends */
+ g_node_insert_after (parent, NULL, node);
+ }
+ }
+
+ if (handle_b)
+ {
+ if (b)
+ {
+ tmp = b->prev;
+
+ b->prev = node;
+ node->prev = tmp;
+ node->next = b;
+ }
+ else if (!(!a && before)) /* !a && before is completely handled above */
+ node->next = NULL;
+ }
+
+ /* emit signal */
+ if (position)
+ new_pos = gtk_tree_path_get_indices (pos_path)[gtk_tree_path_get_depth (pos_path)-1];
+ else if (before)
+ {
+ if (depth)
+ new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tree_store),
+ &parent_iter) - 1;
+ else
+ new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tree_store),
+ NULL) - 1;
+ }
+ else
+ new_pos = 0;
+
+ if (new_pos > old_pos)
+ {
+ if (before && position)
+ new_pos--;
+ }
+ else
+ {
+ if (!before && position)
+ new_pos++;
+ }
+
+ order = g_new (gint, length);
+ if (new_pos > old_pos)
+ {
+ for (i = 0; i < length; i++)
+ if (i < old_pos)
+ order[i] = i;
+ else if (i >= old_pos && i < new_pos)
+ order[i] = i + 1;
+ else if (i == new_pos)
+ order[i] = old_pos;
+ else
+ order[i] = i;
+ }
+ else
+ {
+ for (i = 0; i < length; i++)
+ if (i == new_pos)
+ order[i] = old_pos;
+ else if (i > new_pos && i <= old_pos)
+ order[i] = i - 1;
+ else
+ order[i] = i;
+ }
+
+ path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+ path, NULL, order);
+
+ for (i = 0; i < length; i++)
+ g_print ("%2d ", order[i]);
+ g_print ("\n");
+
+ gtk_tree_path_free (path);
+ if (position)
+ gtk_tree_path_free (pos_path);
+ g_free (order);
+
+ return;
+
+free_paths_and_out:
+ gtk_tree_path_free (path);
+ gtk_tree_path_free (pos_path);
+}
+
+/**
+ * gtk_tree_store_move_before:
+ * @tree_store: A #GtkTreeStore.
+ * @iter: A #GtkTreeIter.
+ * @position: A #GtkTreeIter or %NULL.
+ *
+ * Moves @iter in @tree_store to the position before @position. @iter and
+ * @position should be in the same level. Note that this function only
+ * works with unsorted stores. If @position is %NULL, @iter will be
+ * moved to the end of the level.
+ **/
+void
+gtk_tree_store_move_before (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position)
+{
+ gtk_tree_store_move (tree_store, iter, position, TRUE);
+}
+
+/**
+ * gtk_tree_store_move_after:
+ * @tree_store: A #GtkTreeStore.
+ * @iter: A #GtkTreeIter.
+ * @position: A #GtkTreeIter.
+ *
+ * Moves @iter in @tree_store to the position after @position. @iter and
+ * @position should be in the same level. Note that this function only
+ * works with unsorted stores. If @position is %NULL, @iter will be moved
+ * to the start of the level.
+ **/
+void
+gtk_tree_store_move_after (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position)
+{
+ gtk_tree_store_move (tree_store, iter, position, FALSE);
+}
+
+/* Sorting */
static gint
gtk_tree_store_compare_func (gconstpointer a,
gconstpointer b,
i++;
}
+ /* Sort the array */
g_array_sort_with_data (sort_array, gtk_tree_store_compare_func, tree_store);
for (i = 0; i < list_length - 1; i++)
cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
}
-
if (tree_store->order == GTK_SORT_DESCENDING)
{
if (cmp_a < 0)
prev->next = next;
else
node->parent->children = next;
+
if (next)
next->prev = prev;
if ((!node->next) && (cmp_a > 0))
{
+ new_location++;
node->next = G_NODE (iter->user_data);
node->next->prev = node;
}
else
{
G_NODE (iter->user_data)->next = G_NODE (iter->user_data)->parent->children;
+ G_NODE (iter->user_data)->next->prev = G_NODE (iter->user_data);
G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data);
}
for (list = tree_store->sort_list; list; list = list->next)
{
- header = (GtkTreeDataSortHeader*) list->data;
- if (header->sort_column_id == sort_column_id)
- break;
+ GtkTreeDataSortHeader *list_header;
+
+ list_header = (GtkTreeDataSortHeader*) list->data;
+ if (list_header->sort_column_id == sort_column_id)
+ {
+ header = list_header;
+ break;
+ }
}
if (header == NULL)
}
if (header->destroy)
- (* header->destroy) (header->data);
+ {
+ GtkDestroyNotify d = header->destroy;
+
+ header->destroy = NULL;
+ d (header->data);
+ }
header->func = func;
header->data = data;
header->destroy = destroy;
-
}
static void
g_return_if_fail (GTK_IS_TREE_STORE (sortable));
if (tree_store->default_sort_destroy)
- (* tree_store->default_sort_destroy) (tree_store->default_sort_data);
+ {
+ GtkDestroyNotify d = tree_store->default_sort_destroy;
+
+ tree_store->default_sort_destroy = NULL;
+ d (tree_store->default_sort_data);
+ }
tree_store->default_sort_func = func;
tree_store->default_sort_data = data;
projects / ~andy / gtk / blobdiff