[Wired-commits] SF.net SVN: wired: [1388] trunk/wired/src/gui/MLTree.cpp

[<ti...@us...>]

Revision: 1388
          http://svn.sourceforge.net/wired/?rev=1388&view=rev
Author:   tinou81
Date:     2007-04-28 07:35:16 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Bug  0000006 : samples are no longer deleted from the ML when dragged to the Sequencer

Modified Paths:
--------------
    trunk/wired/src/gui/MLTree.cpp

Modified: trunk/wired/src/gui/MLTree.cpp
===================================================================
--- trunk/wired/src/gui/MLTree.cpp	2007-04-12 16:23:30 UTC (rev 1387)
+++ trunk/wired/src/gui/MLTree.cpp	2007-04-28 14:35:16 UTC (rev 1388)
@@ -1157,32 +1157,38 @@
   map<wxTreeItemId, s_nodeInfo>::iterator it;
   s_nodeInfo		infos;
 
-for (i = 0; i < selection_length; i++)
+  for (i = 0; i < selection_length; i++)
   {
     if (GetItemParent(selection[i]) != GetRootItem() && selection[i] != GetRootItem())
     {
       item_to_drag = selection[i];
       for (it = nodes.begin(); it != nodes.end(); it++)
       {
-        if ((*it).first == item_to_drag)
-	      {
-	        infos = (*it).second;
-	        break;
-	      }
+	if ((*it).first == item_to_drag)
+	{
+	  infos = (*it).second;
+	  break;
+	}
       } 
       if (item.IsOk() && 
-          item != item_to_drag && 
-          item != GetRootItem() && 
-          GetItemParent(item) != item_to_drag && 
-          GetItemParent(item_to_drag) != item && 
-          !GetTreeItemStructFromId(item).extension.Cmp(wxT("")))
+	  item != item_to_drag && 
+	  item != GetRootItem() && 
+	  GetItemParent(item) != item_to_drag && 
+	  GetItemParent(item_to_drag) != item && 
+	  !GetTreeItemStructFromId(item).extension.Cmp(wxT("")))
       {
-        DragAndDrop(item);
-        Expand(item_begin);
+	DragAndDrop(item);
+	Expand(item_begin);
       }
     }
   } 
-  OnRemove();
+  if (item.IsOk() && 
+      item != item_to_drag && 
+      item != GetRootItem() && 
+      GetItemParent(item) != item_to_drag && 
+      GetItemParent(item_to_drag) != item && 
+      !GetTreeItemStructFromId(item).extension.Cmp(wxT("")))
+    OnRemove();
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.