Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from HEAD:

Browse Source 
* 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)
This commit is contained in:
Matthias Clasen
2004-01-31 21:43:36 +00:00
parent 7307f00206
commit 17c3a6e32b
7 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,10 +1,17 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
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 <NotZed@Ximian.com>
Fixes #132929.

11
ChangeLog.pre-2-10
View File

@@ -1,10 +1,17 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
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 <NotZed@Ximian.com>
Fixes #132929.

11
ChangeLog.pre-2-4
View File

@@ -1,10 +1,17 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
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 <NotZed@Ximian.com>
Fixes #132929.

11
ChangeLog.pre-2-6
View File

@@ -1,10 +1,17 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
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 <NotZed@Ximian.com>
Fixes #132929.

11
ChangeLog.pre-2-8
View File

@@ -1,10 +1,17 @@
Sat Jan 31 22:10:48 2004 Matthias Clasen <maclas@gmx.de>
Sat Jan 31 22:43:49 2004 Matthias Clasen <maclas@gmx.de>
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 <NotZed@Ximian.com>
Fixes #132929.

6
gtk/gtktreemodel.c
View File

@@ -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 <literal>n</literal> is now at position
* @new_order<literal>[n]</literal>.
* @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.

1
gtk/gtktreeviewcolumn.c
View File

@@ -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) &&