X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=c196659863950190bbb9ac0d2a1123333ca3d8be;hb=a67d921cdc10d438852b48c2985f14d91320e016;hp=fdf3a5c67ccfd2036071fd683d00f66bb952f8df;hpb=e13ea6551e8721b11998dc33ddccf3f89458f173;p=creaImageIO.git

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index fdf3a5c..c196659 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -5,26 +5,11 @@
 #include <wx/gdicmn.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
 
-const std::string empty_string("");
 
 //=====================================================================
 namespace creaImageIO
 {
-  //=====================================================================
-  /// Data stored by the list items
-  struct ItemData
-  {
-    ItemData() : node(0), id(-1), attr(&empty_string) {}
-    // The corresponding Node
-    tree::Node* node;
-    // The id ?
-    int id;
-    // The pointer on the current attribute string to sort on
-    const std::string* attr;
-    // Was the item previously selected ?
-    // Useful for reselecting the item after sort
-    bool selected;
-  };
+
   //=====================================================================
 }
 //=====================================================================
@@ -263,6 +248,9 @@ namespace creaImageIO
   {
     GimmickDebugMessage(1,"WxTreeView::~WxTreeView"
 			<<std::endl);
+	delete menu;
+	delete menuItem;
+
   }
   //=====================================================================
   
@@ -275,7 +263,10 @@ namespace creaImageIO
     int l = level - 1;
     // the selection of upper level
 	std::vector<tree::Node*>& sel(mLevelList[l].Selected);
-    sel.clear();
+	if (sel.size() > 0)
+	{
+		sel.clear();
+	}
 	  if (level == 1) 
       {
 	sel.push_back(GetTreeHandler()->GetTree().GetTree());
@@ -492,13 +483,13 @@ namespace creaImageIO
 			 wxLIST_MASK_FORMAT
 			 );
 	    
-	    ItemData* data = new ItemData;
+		ItemData* data = new ItemData();
 	    data->node = *j;
 	    data->id = _id;
-	    
+		
 	    item.SetId(_id);
 	    item.SetData(data);
-	    
+
 	    _id++;
 	    GetCtrl(l)->InsertItem(item);
 	    
@@ -545,6 +536,7 @@ namespace creaImageIO
 		item.SetText( crea::std2wx(val));
 		item.SetColumn(k);
 		GetCtrl(l)->SetItem(item);
+		item.Clear();
 	      }	
 	    
 	  }