X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FwxCDMAppliDescriptionPanel.cpp;h=1378f60efb7da213b4c938143d1c0fac8b876f3d;hb=327c33758d25e6ff1f90f9ab74ea219eaed934a9;hp=3cbe28dee709981de2f2e8ac76f7b5077db819f6;hpb=e75a80c4a8a5d67aeb1e941f0c980a11c09cc125;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
index 3cbe28d..1378f60 100644
--- a/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMAppliDescriptionPanel.cpp
@@ -91,12 +91,13 @@ void wxCDMAppliDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
-      wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()));
+      wxHyperlinkCtrl* returnLnk = new wxHyperlinkCtrl(this, ID_BUTTON_PREV, crea::std2wx(parents[parents.size()-1-i]->GetName()), crea::std2wx(parents[parents.size()-1-i]->GetPath()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+      returnLnk->SetWindowStyle(wxNO_BORDER);
       returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
       linksSizer->Add(returnLnk, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-      if (i < parents.size()-1)
+      if (i < (int)(parents.size())-1)
         {
           linksSizer->Add(new wxStaticText(this,wxID_ANY, wxT("/")), 0, wxALIGN_CENTER, 0);
         }
@@ -123,10 +124,10 @@ void wxCDMAppliDescriptionPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMApplication*> applications = this->appli->GetApplications();
-  for (int i = 0; i < applications.size(); i++)
+  for (int i = 0; i < (int)(applications.size()); i++)
     {
-      wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()));
-      pApplicationlk->SetWindowStyle(wxALIGN_LEFT);
+		wxHyperlinkCtrl* pApplicationlk = new wxHyperlinkCtrl(propertiesPanel,ID_LINK_SELECT_APPLICATION, crea::std2wx(applications[i]->GetName().c_str()), crea::std2wx(applications[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+      pApplicationlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
       std::string tt = "Name: " + applications[i]->GetName() + "\n";
       tt += "Location: " + applications[i]->GetPath();
       pApplicationlk->SetToolTip(crea::std2wx(tt.c_str()));
@@ -209,7 +210,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();
     }
@@ -225,8 +226,7 @@ void wxCDMAppliDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
   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 +234,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++)
+  for (int i = 0; i < (int)(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_LISTBOX_SELECTED);
-  newEvent1->SetInt(applicationId);
+  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);
 }
@@ -260,12 +260,12 @@ void wxCDMAppliDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->appli->GetParents();
   std::string parentURL = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   //std::cout << parentURL << std::endl;
-  for (int i = 0; i < parents.size(); i++)
+  for (int i = 0; i < (int)(parents.size()); i++)
     {
       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);
         }
@@ -283,17 +283,17 @@ void wxCDMAppliDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 {
   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++)
+  for (int i = 0; i < (int)(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();
@@ -303,17 +303,17 @@ void wxCDMAppliDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 {
   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++)
+  for (int i = 0; i < (int)(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();
@@ -325,8 +325,7 @@ void wxCDMAppliDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
   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);
     }
@@ -339,8 +338,7 @@ void wxCDMAppliDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 
   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);
     }