Feature #1711

[crea.git] / lib / creaDevManagerLib / wxCDMProjectsTreeCtrl.cxx

diff --git a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
index af393af26e2fc55e16f7f40603b2b9abb91c7138..6f7e33354cbff7aeb8eb380e1b112a4aa345c81f 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
+++ b/lib/creaDevManagerLib/wxCDMProjectsTreeCtrl.cxx
@@ -99,11 +99,12 @@ 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)
 {
   std::cout << "building tree" << std::endl;
   this->DeleteAllItems();
@@ -117,7 +118,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 +128,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 +137,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];