Feature #1711

[crea.git] / lib / creaDevManagerLib / wxCDMMainFrame.cpp

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 7f51fa05b728bbe1c0f990844f77f530d9fc9d26..ec9543bc16057308a599853452ceb08591332017 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -80,9 +80,9 @@ EVT_BUTTON(ID_BUTTON_OPENPROJECT, wxCDMMainFrame::OnMenuOpenProject)
 
 EVT_TREE_SEL_CHANGED(ID_TREE_PROJECTS, wxCDMMainFrame::OnTreeSelectionChanged)
 
-EVT_COMMAND(wxID_ANY, wxEVT_DISPLAY_CHANGED, wxCDMMainFrame::OnCreationComplete)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxCDMMainFrame::OnElementSelected)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxCDMMainFrame::OnElementDeselected)
+EVT_COMMAND(wxID_ANY, wxEVT_DISPLAY_CHANGED, wxCDMMainFrame::OnChangeView)
+EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCDMMainFrame::OnElementSelected)
+EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_LISTBOX_SELECTED, wxCDMMainFrame::OnElementDeselected)
 
 
 EVT_CHECKBOX(ID_CHECKBOX_DISABLE_HELP, wxCDMMainFrame::OnDisableHelp)
@@ -788,15 +788,17 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
 }
 
-void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
+void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
 {
-  switch(event.GetId() != 0)
+  modelCDMIProjectTreeNode* myItem = NULL;
+  switch(event.GetId())
   {
   case 0:
+    myItem = ((modelCDMIProjectTreeNode*)event.GetClientData());
     //select out old one to generate selection event
-    this->tree_Projects->SelectItem(event.GetInt(), false);
-    this->tree_Projects->SelectItem(event.GetInt(), true);
-    this->tree_Projects->Expand(event.GetInt());
+    this->tree_Projects->SelectItem(myItem->GetId(), false);
+    this->tree_Projects->SelectItem(myItem->GetId(), true);
+    this->tree_Projects->Expand(myItem->GetId());
     break;
   case 1:
     wxPanel* description = NULL;
@@ -866,19 +868,21 @@ void wxCDMMainFrame::OnCreationComplete(wxCommandEvent& event)
 void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
 {
   //std::cout << "element " << event.GetInt() << std::endl;
-  this->tree_Projects->EnsureVisible(event.GetInt());
-  this->tree_Projects->SetItemBold(event.GetInt(), true);
-  this->tree_Projects->SetItemTextColour(event.GetInt(), wxColour(0,0,255));
-  this->tree_Projects->SetItemBackgroundColour(event.GetInt(), wxColour(230,230,255));
+  modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
+  this->tree_Projects->EnsureVisible(item->GetId());
+  this->tree_Projects->SetItemBold(item->GetId(), true);
+  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,255));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(230,230,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }
 
 void wxCDMMainFrame::OnElementDeselected(wxCommandEvent& event)
 {
-  this->tree_Projects->SetItemBold(event.GetInt(), false);
-  this->tree_Projects->SetItemTextColour(event.GetInt(), wxColour(0,0,0));
-  this->tree_Projects->SetItemBackgroundColour(event.GetInt(), wxColour(255,255,255));
+  modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
+  this->tree_Projects->SetItemBold(item->GetId(), false);
+  this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,0));
+  this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(255,255,255));
   this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
   auiManager.Update();
 }