X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FwxCDMPackageManagerPanel.cpp;h=cd3adf3fa28ef4313a25325d39597fab7f34bf0c;hb=5ff0bb2664c3cd508c1dd438666a71b8a96459c3;hp=8356b655b3e482d7513ae938be5a947539d3a358;hpb=e75a80c4a8a5d67aeb1e941f0c980a11c09cc125;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
index 8356b65..cd3adf3 100644
--- a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
@@ -175,31 +175,31 @@ modelCDMProject* wxCDMPackageManagerPanel::GetProject() const
 void wxCDMPackageManagerPanel::OnBtnReturn(wxHyperlinkEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(project->GetId());
+  newEvent->SetClientData(project);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 }
 
 void wxCDMPackageManagerPanel::OnLnkPackageSelect(wxHyperlinkEvent& event)
 {
-  int packageId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
   for (int i = 0; i < packages.size(); i++)
     {
       if(packages[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          packageId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
 
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(packageId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 
   wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-  newEvent1->SetInt(packageId);
+  newEvent1->SetClientData(thePackage);
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
@@ -237,7 +237,7 @@ void wxCDMPackageManagerPanel::OnBtnCreatePackage(wxCommandEvent& event)
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(package->GetId());
+      newEvent->SetClientData(package);
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
       event.Skip();
@@ -256,8 +256,7 @@ void wxCDMPackageManagerPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -267,17 +266,17 @@ void wxCDMPackageManagerPanel::OnMouseEnter(wxMouseEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string PkgName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int pkgId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
   for (int i = 0; i < packages.size(); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {
-          pkgId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
-  newEvent->SetInt(pkgId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -287,18 +286,18 @@ void wxCDMPackageManagerPanel::OnMouseExit(wxMouseEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string PkgName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int pkgId = 0;
+  modelCDMPackage* thePackage = NULL;
   std::vector<modelCDMPackage*> packages = this->project->GetPackages();
   project->GetPackages();
   for (int i = 0; i < packages.size(); i++)
     {
       if(packages[i]->GetName() == PkgName)
         {
-          pkgId = packages[i]->GetId();
+          thePackage = packages[i];
           break;
         }
     }
-  newEvent->SetInt(pkgId);
+  newEvent->SetClientData(thePackage);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -310,8 +309,7 @@ void wxCDMPackageManagerPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -324,8 +322,7 @@ void wxCDMPackageManagerPanel::OnCMakeMouseExit(wxMouseEvent& event)
 
   if(this->project->GetCMakeLists() != NULL)
     {
-      int CMId = this->project->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->project->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }