From 79cd1d2ccb62f22adf8b1ed4e8b5dfb5dea845bc Mon Sep 17 00:00:00 2001
From: Greg Ercolano <erco@seriss.com>
Date: Tue, 8 Dec 2009 08:39:31 +0000
Subject: Small fixed to SebHoll's user_data() mods (init + copy ctor), added
 select_all() to Fl_Tree and Fl_Tree_Item.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6957 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Tree.cxx      | 13 +++++++++++++
 src/Fl_Tree_Item.cxx |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx
index e946ccaf5..4c3a99b14 100644
--- a/src/Fl_Tree.cxx
+++ b/src/Fl_Tree.cxx
@@ -347,6 +347,19 @@ int Fl_Tree::deselect_all(Fl_Tree_Item *item) {
   return(count);
 }
 
+/// Select item and all its children.
+///     If item is NULL, root() is used.
+///     Handles calling redraw() if anything was changed.
+///     Returns count of how many items were in the 'deselected' state,
+///     ie. how many items were "changed".
+///
+int Fl_Tree::select_all(Fl_Tree_Item *item) {
+  item = item ? item : root();			// NULL? use root()
+  int count = item->select_all();
+  if ( count ) redraw();			// anything changed? cause redraw
+  return(count);
+}
+
 /// Select only this item.
 ///     If item is NULL, root() is used.
 ///     Handles calling redraw() if anything was changed.
diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx
index cf92b7078..66950ed4f 100644
--- a/src/Fl_Tree_Item.cxx
+++ b/src/Fl_Tree_Item.cxx
@@ -64,6 +64,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Prefs &prefs) {
   _label_xywh[2]    = 0;
   _label_xywh[3]    = 0;
   _usericon         = 0;
+  _userdata         = 0;
   _parent           = 0;
 }
 
@@ -103,7 +104,7 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Item *o) {
   _label_xywh[2]    = o->_label_xywh[2];
   _label_xywh[3]    = o->_label_xywh[3];
   _usericon         = o->usericon();
-  _userdata         = 0;
+  _userdata         = o->user_data();
   _parent           = o->_parent;
 }
 
-- 
cgit v1.2.3