Merge from HEAD.

2007-01-05  Kristian Rietveld  <kris@gtk.org>

	Merge from HEAD.

	* gtk/gtktreeview.c (gtk_tree_view_row_changed): do allow to
	invalidate nodes if the tree view is not realized. (#363147,
	Carlos Garnacho, Miguel Cabrera).


svn path=/branches/gtk-2-10/; revision=17090
This commit is contained in:
Kristian Rietveld
2007-01-05 21:37:41 +00:00
committed by Kristian Rietveld
parent bc938df68d
commit a2dcca137d
2 changed files with 11 additions and 7 deletions

View File

@@ -1,3 +1,11 @@
2007-01-05 Kristian Rietveld <kris@gtk.org>
Merge from HEAD.
* gtk/gtktreeview.c (gtk_tree_view_row_changed): do allow to
invalidate nodes if the tree view is not realized. (#363147,
Carlos Garnacho, Miguel Cabrera).
2007-01-05 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@@ -8069,11 +8069,6 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
g_return_if_fail (path != NULL || iter != NULL);
if (!GTK_WIDGET_REALIZED (tree_view))
/* We can just ignore ::changed signals if we aren't realized, as we don't care about sizes
*/
return;
if (tree_view->priv->cursor != NULL)
cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
else
@@ -8110,7 +8105,8 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
&& tree_view->priv->fixed_height >= 0)
{
_gtk_rbtree_node_set_height (tree, node, tree_view->priv->fixed_height);
gtk_tree_view_node_queue_redraw (tree_view, tree, node);
if (GTK_WIDGET_REALIZED (tree_view))
gtk_tree_view_node_queue_redraw (tree_view, tree, node);
}
else
{
@@ -8131,7 +8127,7 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
}
done:
if (!tree_view->priv->fixed_height_mode)
if (GTK_WIDGET_REALIZED (tree_view) && !tree_view->priv->fixed_height_mode)
install_presize_handler (tree_view);
if (free_path)
gtk_tree_path_free (path);