Merged from stable.

Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. * gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent assert for get_info. (reported by Michael Natterer), (gtk_tree_view_expand_all_emission_helper), (gtk_tree_view_expand_all_helper): emit row_expanded for all expanded rows during an _expand_all operation. (Fixes #111280, reported by Benjamin Bayart).

Merged from stable.
Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. * gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent assert for get_info. (reported by Michael Natterer), (gtk_tree_view_expand_all_emission_helper), (gtk_tree_view_expand_all_helper): emit row_expanded for all expanded rows during an _expand_all operation. (Fixes #111280, reported by Benjamin Bayart).
5afcde9a · Kristian Rietveld · Kristian Rietveld · eb6debd4 · 5afcde9a · 5afcde9a
Commit 5afcde9a authored Jun 04, 2003 by Kristian Rietveld Committed by Kristian Rietveld Jun 04, 2003
6 changed files
--- a/ChangeLog
+++ b/ChangeLog
+Wed Jun  4 21:25:35 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent
+	assert for get_info. (reported by Michael Natterer),
+	(gtk_tree_view_expand_all_emission_helper),
+	(gtk_tree_view_expand_all_helper): emit row_expanded for all
+	expanded rows during an _expand_all operation. (Fixes #111280,
+	reported by Benjamin Bayart).
+
 Tue Jun  3 18:32:30 2003  Owen Taylor  <otaylor@redhat.com>

 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't

--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
+Wed Jun  4 21:25:35 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent
+	assert for get_info. (reported by Michael Natterer),
+	(gtk_tree_view_expand_all_emission_helper),
+	(gtk_tree_view_expand_all_helper): emit row_expanded for all
+	expanded rows during an _expand_all operation. (Fixes #111280,
+	reported by Benjamin Bayart).
+
 Tue Jun  3 18:32:30 2003  Owen Taylor  <otaylor@redhat.com>

 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't

--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
+Wed Jun  4 21:25:35 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent
+	assert for get_info. (reported by Michael Natterer),
+	(gtk_tree_view_expand_all_emission_helper),
+	(gtk_tree_view_expand_all_helper): emit row_expanded for all
+	expanded rows during an _expand_all operation. (Fixes #111280,
+	reported by Benjamin Bayart).
+
 Tue Jun  3 18:32:30 2003  Owen Taylor  <otaylor@redhat.com>

 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't

--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
+Wed Jun  4 21:25:35 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent
+	assert for get_info. (reported by Michael Natterer),
+	(gtk_tree_view_expand_all_emission_helper),
+	(gtk_tree_view_expand_all_helper): emit row_expanded for all
+	expanded rows during an _expand_all operation. (Fixes #111280,
+	reported by Benjamin Bayart).
+
 Tue Jun  3 18:32:30 2003  Owen Taylor  <otaylor@redhat.com>

 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't

--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
+Wed Jun  4 21:25:35 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from stable.
+
+	* gtk/gtktreeview.c (gtk_tree_view_drag_begin): use a silent
+	assert for get_info. (reported by Michael Natterer),
+	(gtk_tree_view_expand_all_emission_helper),
+	(gtk_tree_view_expand_all_helper): emit row_expanded for all
+	expanded rows during an _expand_all operation. (Fixes #111280,
+	reported by Benjamin Bayart).
+
 Tue Jun  3 18:32:30 2003  Owen Taylor  <otaylor@redhat.com>

 	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't

--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5160,7 +5160,9 @@ gtk_tree_view_drag_begin (GtkWidget      *widget,

  tree_view = GTK_TREE_VIEW (widget);

-  g_return_if_fail (get_info (tree_view) != NULL);
+  /* if the user uses a custom DnD impl, we don't set the icon here */
+  if (!get_info (tree_view))
+    return;

  gtk_tree_view_get_path_at_pos (tree_view,
                                 tree_view->priv->press_start_x,
@@ -9078,6 +9080,35 @@ gtk_tree_view_row_activated (GtkTreeView       *tree_view,
 }


+static void
+gtk_tree_view_expand_all_emission_helper (GtkRBTree *tree,
+                                          GtkRBNode *node,
+                                          gpointer   data)
+{
+  GtkTreeView *tree_view = data;
+
+  if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT &&
+      node->children)
+    {
+      GtkTreePath *path;
+      GtkTreeIter iter;
+
+      path = _gtk_tree_view_find_path (tree_view, tree, node);
+      gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+
+      g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
+
+      gtk_tree_path_free (path);
+    }
+
+  if (node->children)
+    _gtk_rbtree_traverse (node->children,
+                          node->children->root,
+                          G_PRE_ORDER,
+                          gtk_tree_view_expand_all_emission_helper,
+                          tree_view);
+}
+
 static void
 gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
 				 GtkRBNode  *node,
@@ -9108,6 +9139,13 @@ gtk_tree_view_expand_all_helper (GtkRBTree  *tree,
 				&child,
 				gtk_tree_path_get_depth (path) + 1,
 				TRUE);
+
+      g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
+      _gtk_rbtree_traverse (node->children,
+                            node->children->root,
+                            G_PRE_ORDER,
+                            gtk_tree_view_expand_all_emission_helper,
+                            tree_view);
      gtk_tree_path_free (path);
    }
 }