From 418d28282070cc1a66a4b6e9690fba51ffd71354 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 12 Nov 2009 21:35:45 +0000
Subject: [PATCH] CtrlLib: TreeCtrl InsertDrop now returns ids of inserted
 nodes

git-svn-id: svn://ultimatepp.org/upp/trunk@1691 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/TreeCtrl.cpp               | 7 ++++---
 uppsrc/CtrlLib/TreeCtrl.h                 | 4 ++--
 uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/uppsrc/CtrlLib/TreeCtrl.cpp b/uppsrc/CtrlLib/TreeCtrl.cpp
index 98946e0cc..87c12af37 100644
--- a/uppsrc/CtrlLib/TreeCtrl.cpp
+++ b/uppsrc/CtrlLib/TreeCtrl.cpp
@@ -1512,7 +1512,7 @@ void TreeCtrl::AdjustAction(int parent, PasteClip& d)
 		d.SetAction(DND_COPY);
 }
 
-void TreeCtrl::InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& d)
+Vector<int> TreeCtrl::InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& d)
 {
 	TreeCtrl copy;
 	Vector<int> sel = src.GetSel();
@@ -1529,11 +1529,12 @@ void TreeCtrl::InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& d)
 	}
 	for(int i = 0; i < did.GetCount(); i++)
 		SelectOne(did[i], true);
+	return did;
 }
 
-void TreeCtrl::InsertDrop(int parent, int ii, PasteClip& d)
+Vector<int> TreeCtrl::InsertDrop(int parent, int ii, PasteClip& d)
 {
-	InsertDrop(parent, ii, GetInternal<TreeCtrl>(d), d);
+	return InsertDrop(parent, ii, GetInternal<TreeCtrl>(d), d);
 }
 
 void TreeCtrl::Swap(int id1, int id2)
diff --git a/uppsrc/CtrlLib/TreeCtrl.h b/uppsrc/CtrlLib/TreeCtrl.h
index 026eaf1dd..5befce6f5 100644
--- a/uppsrc/CtrlLib/TreeCtrl.h
+++ b/uppsrc/CtrlLib/TreeCtrl.h
@@ -279,8 +279,8 @@ public:
 	void         RemoveSelection()              { Remove(GetSel()); }
 
 	void         AdjustAction(int parent, PasteClip& x);
-	void         InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& x);
-	void         InsertDrop(int parent, int ii, PasteClip& d);
+	Vector<int>  InsertDrop(int parent, int ii, const TreeCtrl& src, PasteClip& x);
+	Vector<int>  InsertDrop(int parent, int ii, PasteClip& d);
 	Image        GetDragSample();
 
 	void         StdLeftDouble();
diff --git a/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp b/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp
index f17476e8f..de732f4a4 100644
--- a/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp
+++ b/uppsrc/CtrlLib/src.tpp/TreeCtrl$en-us.tpp
@@ -720,4 +720,4 @@ pen]([@(0.0.255) bool]_[*@3 b]_`=_[@(0.0.255) true])&]
 nSelect]([@(0.0.255) bool]_[*@3 b])&]
 [s2;%% Sets canselect flag.&]
 [s3; &]
-[s0;%% ]
\ No newline at end of file
+[s0; ]
\ No newline at end of file