From 3778b86c2e2fe91fc668234f66bf6b88de48c084 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 1 Jul 2002 21:15:35 +0000 Subject: [PATCH] sync up white space/variable names to match tree_store equiv. Mon Jul 1 17:04:09 2002 Jonathan Blandford * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up white space/variable names to match tree_store equiv. * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we set the value. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkliststore.c | 6 +++--- gtk/gtktreestore.c | 16 ++++++++++------ gtk/gtktreeview.c | 4 ++-- 9 files changed, 63 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d25662a94..d300035da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d25662a94..d300035da 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d25662a94..d300035da 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d25662a94..d300035da 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d25662a94..d300035da 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d25662a94..d300035da 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Jul 1 17:04:09 2002 Jonathan Blandford + + * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up + white space/variable names to match tree_store equiv. + + * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we + set the value. + Mon Jul 01 17:19:00 2002 Bill Haneman * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index c25fa01eb..b029efbea 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -659,9 +659,9 @@ gtk_list_store_real_set_value (GtkListStore *list_store, { GtkTreeDataList *list; GtkTreeDataList *prev; + 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_LIST_STORE (list_store), FALSE); @@ -736,12 +736,13 @@ gtk_list_store_real_set_value (GtkListStore *list_store, _gtk_tree_data_list_value_to_node (list, &real_value); else _gtk_tree_data_list_value_to_node (list, value); + retval = TRUE; if (converted) g_value_unset (&real_value); if (sort && GTK_LIST_STORE_IS_SORTED (list_store)) - gtk_list_store_sort_iter_changed (list_store, iter, orig_column); + gtk_list_store_sort_iter_changed (list_store, iter, old_column); return retval; } @@ -1771,7 +1772,6 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, cmp_b = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data); } - if (list_store->order == GTK_SORT_DESCENDING) { if (cmp_a < 0) diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 579c8f394..e26f1fa41 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -778,11 +778,16 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, { GtkTreeDataList *list; GtkTreeDataList *prev; - GtkTreePath *path = NULL; + gint old_column = column; GValue real_value = {0, }; gboolean converted = FALSE; 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]) && @@ -808,8 +813,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, 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) @@ -819,7 +822,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, 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; @@ -848,16 +850,19 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, 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); retval = TRUE; - gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); + if (sort && GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (tree_store, iter, old_column); + return retval; } @@ -2067,7 +2072,6 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data); } - if (tree_store->order == GTK_SORT_DESCENDING) { if (cmp_a < 0) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 07501c81e..fe30f83d9 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4182,8 +4182,8 @@ validate_rows (GtkTreeView *tree_view) tree_view->priv->validate_rows_timer = 0; } - return retval; - } + return retval; +} static gboolean validate_rows_handler (GtkTreeView *tree_view) -- 2.43.2