X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMProjectsTreeCtrl.cxx;h=2d217184e0f71524b8e139156454f2b908a2b266;hb=840bfdc0bf081a680040c0a68f8d68db399cec2a;hp=af393af26e2fc55e16f7f40603b2b9abb91c7138;hpb=6a43a8cc1e5216f06e41799fbe154b2b1ef6d44b;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
index af393af..2d21718 100755
--- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
+++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
@@ -99,12 +99,14 @@ bool wxCDMProjectsTreeCtrl::Create(
   this->AssignImageList(images);
 
   wxTreeItemId rootIndex = this->AddRoot(wxT("No Open Project"), this->ID_Cicon, this->ID_Cicon);
+
   this->Update();
   return TRUE;
 }
 
-void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree)
+void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxCDMTreeItemId, modelCDMIProjectTreeNode* >& modelElements, modelCDMProject* projectTree)
 {
+  this->Unselect();
   std::cout << "building tree" << std::endl;
   this->DeleteAllItems();
   modelElements.clear();
@@ -117,7 +119,7 @@ void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTr
       std::cout << "Building TreeCtrl for " << projectTree->GetName() << std::endl;
       this->BuildTree(projectTree->GetChildren(), modelElements, projectTree->GetId());
 
-      this->Expand(projectTree->GetId());
+      this->Expand(projectTree->GetId().GetWxId());
 
       this->Update();
     }
@@ -127,7 +129,7 @@ void wxCDMProjectsTreeCtrl::BuildTree(std::map< wxTreeItemId, modelCDMIProjectTr
     }
 }
 
-void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxTreeItemId, modelCDMIProjectTreeNode* >& modelElements, const wxTreeItemId& parent)
+void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode*>& treeNodes, std::map< wxCDMTreeItemId, modelCDMIProjectTreeNode* >& modelElements, const wxCDMTreeItemId& parent)
 {
   for (int i = 0; i < (int)(treeNodes.size()); i++)
     {
@@ -136,7 +138,7 @@ void wxCDMProjectsTreeCtrl::BuildTree(const std::vector<modelCDMIProjectTreeNode
         {
           int idIcon = GetIconId(treeNodes[i]);
           wxString nodeName((treeNodes[i]->GetName()).c_str(), wxConvUTF8);
-          treeNodes[i]->SetId(this->AppendItem(parent, nodeName, idIcon));
+          treeNodes[i]->SetId(wxCDMTreeItemId(this->AppendItem(parent.GetWxId(), nodeName, idIcon)));
 	  
 		  modelElements[treeNodes[i]->GetId()] = treeNodes[i];