From 17c3a6e32b700aaf8462a227a58a81b4c5e456da Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Jan 2004 21:43:36 +0000 Subject: [PATCH] Merge from HEAD: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct the documentation for new_order. (#124790, Tim-Philipp Müller) * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Reset use_resized_width when setting fixed_width. (#108612, Felipe Heidrich) --- ChangeLog | 11 +++++++++-- ChangeLog.pre-2-10 | 11 +++++++++-- ChangeLog.pre-2-4 | 11 +++++++++-- ChangeLog.pre-2-6 | 11 +++++++++-- ChangeLog.pre-2-8 | 11 +++++++++-- gtk/gtktreemodel.c | 6 +++--- gtk/gtktreeviewcolumn.c | 1 + 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e9bc4c252..8212ca055f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ -Sat Jan 31 22:10:48 2004 Matthias Clasen +Sat Jan 31 22:43:49 2004 Matthias Clasen Merge from HEAD: + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct + the documentation for new_order. (#124790, Tim-Philipp Müller) + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): + Reset use_resized_width when setting fixed_width. (#108612, + Felipe Heidrich) + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) - + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4e9bc4c252..8212ca055f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,10 +1,17 @@ -Sat Jan 31 22:10:48 2004 Matthias Clasen +Sat Jan 31 22:43:49 2004 Matthias Clasen Merge from HEAD: + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct + the documentation for new_order. (#124790, Tim-Philipp Müller) + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): + Reset use_resized_width when setting fixed_width. (#108612, + Felipe Heidrich) + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) - + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4e9bc4c252..8212ca055f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,10 +1,17 @@ -Sat Jan 31 22:10:48 2004 Matthias Clasen +Sat Jan 31 22:43:49 2004 Matthias Clasen Merge from HEAD: + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct + the documentation for new_order. (#124790, Tim-Philipp Müller) + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): + Reset use_resized_width when setting fixed_width. (#108612, + Felipe Heidrich) + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) - + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4e9bc4c252..8212ca055f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,10 +1,17 @@ -Sat Jan 31 22:10:48 2004 Matthias Clasen +Sat Jan 31 22:43:49 2004 Matthias Clasen Merge from HEAD: + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct + the documentation for new_order. (#124790, Tim-Philipp Müller) + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): + Reset use_resized_width when setting fixed_width. (#108612, + Felipe Heidrich) + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) - + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4e9bc4c252..8212ca055f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,10 +1,17 @@ -Sat Jan 31 22:10:48 2004 Matthias Clasen +Sat Jan 31 22:43:49 2004 Matthias Clasen Merge from HEAD: + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct + the documentation for new_order. (#124790, Tim-Philipp Müller) + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): + Reset use_resized_width when setting fixed_width. (#108612, + Felipe Heidrich) + * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the GtkKeySnooperData. (#132038, R. McFarland) - + 2004-01-30 Not Zed Fixes #132929. diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index eca14bd0ff..95de138c3f 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1254,9 +1254,9 @@ gtk_tree_model_row_deleted (GtkTreeModel *tree_model, * @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 n is now at position - * @new_order[n]. + * @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[newpos] = oldpos. * * Emits the "rows_reordered" signal on @tree_model. This should be called by * models when their rows have been reordered. diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index ee6e60d0c9..ba3e154daa 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1724,6 +1724,7 @@ gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column, g_return_if_fail (fixed_width > 0); tree_column->fixed_width = fixed_width; + tree_column->use_resized_width = FALSE; if (tree_column->tree_view && GTK_WIDGET_REALIZED (tree_column->tree_view) &&