#include "images/AIcon20.xpm"
#include "images/ApIcon20.xpm"
#include "images/BBIcon20.xpm"
+#include "images/BBSIcon20.xpm"
+#include "images/BBGIcon20.xpm"
#include "images/CIcon20.xpm"
+#include "images/CFIcon20.xpm"
#include "images/CMIcon20.xpm"
#include "images/FdIcon20.xpm"
#include "images/FlIcon20.xpm"
this->ID_AIcon = images->Add(wxIcon(AIcon20));
this->ID_ApIcon = images->Add(wxIcon(ApIcon20));
this->ID_BBIcon = images->Add(wxIcon(BBIcon20));
+ this->ID_BBGIcon = images->Add(wxIcon(BBGIcon20));
+ this->ID_BBSIcon = images->Add(wxIcon(BBSIcon20));
this->ID_Cicon = images->Add(wxIcon(CIcon20));
this->ID_CMIcon = images->Add(wxIcon(CMIcon20));
this->ID_FdIcon = images->Add(wxIcon(FdIcon20));
this->ID_FlIcon = images->Add(wxIcon(FlIcon20));
+ this->ID_CFIcon = images->Add(wxIcon(CFIcon20));
this->ID_LbIcon = images->Add(wxIcon(LbIcon20));
this->ID_LIcon = images->Add(wxIcon(LIcon20));
this->ID_PrIcon = images->Add(wxIcon(PrIcon20));
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();
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();
}
}
}
-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++)
{
{
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];
}
else
{
- element = dynamic_cast<modelCDMFolder*>(node);
+ element = dynamic_cast<modelCDMCodeFile*>(node);
if(element != NULL)
{
- return this->ID_FdIcon;
+ return this->ID_CFIcon;
}
else
{
- element = dynamic_cast<modelCDMFile*>(node);
+ element = dynamic_cast<modelCDMBBSFile*>(node);
if(element != NULL)
{
- return this->ID_FlIcon;
+ return this->ID_BBSIcon;
}
else
{
- return this->ID_Cicon;
+ element = dynamic_cast<modelCDMBBGFile*>(node);
+ if(element != NULL)
+ {
+ return this->ID_BBGIcon;
+ }
+ else
+ {
+ element = dynamic_cast<modelCDMFolder*>(node);
+ if(element != NULL)
+ {
+ return this->ID_FdIcon;
+ }
+ else
+ {
+ element = dynamic_cast<modelCDMFile*>(node);
+ if(element != NULL)
+ {
+ return this->ID_FlIcon;
+ }
+ else
+ {
+ return this->ID_Cicon;
+ }
+ }
+ }
}
}
}