X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMLibDescriptionPanel.cpp;h=abc0a8e2bd11328ff97c475c133a16c28ad3a281;hb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;hp=d05245bf3106e955630db646046bacec48907412;hpb=e75a80c4a8a5d67aeb1e941f0c980a11c09cc125;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
index d05245b..abc0a8e 100644
--- a/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMLibDescriptionPanel.cpp
@@ -89,12 +89,13 @@ void wxCDMLibDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->lib->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()));
-      returnLnk->SetToolTip(crea::std2wx("Return to " + parents[parents.size()-1-i]->GetName() + "."));
+      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);
         }
@@ -120,10 +121,10 @@ void wxCDMLibDescriptionPanel::CreateControls()
   wxBoxSizer* propertiesPanelSizer = new wxBoxSizer(wxVERTICAL);
 
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
-      wxHyperlinkCtrl* pLibrarylk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_LIBRARY, crea::std2wx(libraries[i]->GetName().c_str()), crea::std2wx(libraries[i]->GetName().c_str()));
-      pLibrarylk->SetWindowStyle(wxALIGN_LEFT);
+		wxHyperlinkCtrl* pLibrarylk = new wxHyperlinkCtrl(propertiesPanel, ID_LINK_SELECT_LIBRARY, crea::std2wx(libraries[i]->GetName().c_str()), crea::std2wx(libraries[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+      pLibrarylk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
       std::string tt = "Name: " + libraries[i]->GetName() + "\n";
       tt += "Location: " + libraries[i]->GetPath();
       pLibrarylk->SetToolTip(crea::std2wx(tt.c_str()));
@@ -207,7 +208,7 @@ void wxCDMLibDescriptionPanel::OnBtnCreateLibrary(wxCommandEvent& event)
       ((wxCDMMainFrame*)this->GetParent())->RefreshProject();
 
       wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-      newEvent->SetInt(library->GetId());
+      newEvent->SetClientData(library);
       wxPostEvent(this->GetParent(), *newEvent);
     }
 }
@@ -222,8 +223,7 @@ void wxCDMLibDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
   if(this->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -231,24 +231,24 @@ void wxCDMLibDescriptionPanel::OnBtnEditCMakeLists(wxCommandEvent& event)
 
 void wxCDMLibDescriptionPanel::OnLnkLibrarySelect(wxHyperlinkEvent& event)
 {
-  int libraryId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == crea::wx2std(event.GetURL()))
         {
-          libraryId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
 
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_DISPLAY_CHANGED);
-  newEvent->SetInt(libraryId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
 
   wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-  newEvent1->SetInt(libraryId);
+  newEvent1->SetClientData(theLibrary);
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
@@ -259,12 +259,12 @@ void wxCDMLibDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->lib->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);
         }
@@ -282,17 +282,17 @@ void wxCDMLibDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int lbId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {
-          lbId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
-  newEvent->SetInt(lbId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -302,17 +302,17 @@ void wxCDMLibDescriptionPanel::OnMouseExit(wxMouseEvent& event)
 {
   wxCommandEvent* newEvent = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
   std::string LibName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
-  int lbId = 0;
+  modelCDMLibrary* theLibrary = NULL;
   std::vector<modelCDMLibrary*> libraries = this->lib->GetLibraries();
-  for (int i = 0; i < libraries.size(); i++)
+  for (int i = 0; i < (int)(libraries.size()); i++)
     {
       if(libraries[i]->GetName() == LibName)
         {
-          lbId = libraries[i]->GetId();
+          theLibrary = libraries[i];
           break;
         }
     }
-  newEvent->SetInt(lbId);
+  newEvent->SetClientData(theLibrary);
   newEvent->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent);
   event.Skip();
@@ -324,8 +324,7 @@ void wxCDMLibDescriptionPanel::OnCMakeMouseEnter(wxMouseEvent& event)
 
   if(this->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -338,8 +337,7 @@ void wxCDMLibDescriptionPanel::OnCMakeMouseExit(wxMouseEvent& event)
 
   if(this->lib->GetCMakeLists() != NULL)
     {
-      int CMId = this->lib->GetCMakeLists()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->lib->GetCMakeLists());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }