X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FcreaDevManagerLib%2FwxCDMAppliDescriptionPanel.cpp;h=7d59be01986df4a14b27d9927a5891bdeb4997a5;hb=f4451b0dfa9bfa593ada3e9462570b6ca250f0d7;hp=109e9db8497a434572ef9a48b681b63c0c884c03;hpb=11150e550ff03ee658e90cda4b475b4c24da0a7f;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
index 109e9db..7d59be0 100644
--- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
@@ -209,7 +209,7 @@ void wxCDMAppliDescriptionPanel::OnBtnCreateApplication(wxCommandEvent& event)
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(application->GetId());
+      newEvent->SetClientData(application);
       wxPostEvent(this->GetParent(), *newEvent);
       event.Skip();
     }
@@ -221,12 +221,11 @@ void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
   if(!this->appli->OpenCMakeListsFile(result))
     wxMessageBox(crea::std2wx(*result),_T("Open CMakeLists File - Error!"),wxOK | wxICON_ERROR);
 
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->appli->GetCMakeLists() != NULL)
     {
-      int CMId = this->appli->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->appli->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -234,23 +233,23 @@ void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
 void wxCDMAppliDescriptionPanel::OnLnkApplicationSelect(wxHyperlinkEvent& event)
 {
-  int applicationId = 0;
+  modelCDMApplication* applicationFound = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
   for (int i = 0; i < applications.size(); i++)
     {
       if(applications[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          applicationId = applications[i]->GetId();
+          applicationFound = applications[i];
           break;
         }
     }
-  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
-  newEvent1->SetInt(applicationId);
+  wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+  newEvent1->SetClientData(applicationFound);
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(applicationId);
+  newEvent->SetClientData(applicationFound);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 }
@@ -265,7 +264,7 @@ void wxCDMAppliDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
       if (parents[i]->GetPath() == parentURL)
         {
           wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-          newEvent->SetInt(parents[i]->GetId());
+          newEvent->SetClientData(parents[i]);
           newEvent->SetId(0);
           wxPostEvent(this->GetParent(), *newEvent);
         }
@@ -281,19 +280,19 @@ void wxCDMAppliDescriptionPanel::OnBtnOpenFolder(wxCommandEvent& event)
 
 void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int appId = 0;
+  modelCDMApplication* theApp = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
   for (int i = 0; i < applications.size(); i++)
     {
       if(applications[i]->GetName() == AppName)
         {
-          appId = applications[i]->GetId();
+          theApp = applications[i];
           break;
         }
     }
-  newEvent->SetInt(appId);
+  newEvent->SetClientData(theApp);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -301,19 +300,19 @@ void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 
 void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string AppName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int appId = 0;
+  modelCDMApplication* theApp = NULL;
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
   for (int i = 0; i < applications.size(); i++)
     {
       if(applications[i]->GetName() == AppName)
         {
-          appId = applications[i]->GetId();
+          theApp = applications[i];
           break;
         }
     }
-  newEvent->SetInt(appId);
+  newEvent->SetClientData(theApp);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -321,12 +320,11 @@ void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 
 void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
 
   if(this->appli->GetCMakeLists() != NULL)
     {
-      int CMId = this->appli->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->appli->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -335,12 +333,11 @@ void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
 void wxCDMAppliDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 {
-  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LIST_ITEM_DESELECTED);
+  wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 
   if(this->appli->GetCMakeLists() != NULL)
     {
-      int CMId = this->appli->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->appli->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }