X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMPackageDescriptionPanel.cpp;h=bed6dc5e8d878f3dabadafc453893d88c16f9a0f;hb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;hp=bb06283c278d80bad4b5252865a63d6205939929;hpb=5ff0bb2664c3cd508c1dd438666a71b8a96459c3;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
index bb06283..bed6dc5 100644
--- a/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageDescriptionPanel.cpp
@@ -99,12 +99,13 @@ void wxCDMPackageDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->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);
         }
@@ -183,14 +184,14 @@ void wxCDMPackageDescriptionPanel::CreateControls()
 
 
   std::vector<modelCDMBlackBox*> blackBoxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < blackBoxes.size(); i++)
+  for (int i = 0; i < (int)(blackBoxes.size()); i++)
     {
 
       if(blackBoxes[i] != NULL)
         {
 
-          wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()));
-          pBBlk->SetWindowStyle(wxALIGN_LEFT);
+			wxHyperlinkCtrl* pBBlk = new wxHyperlinkCtrl(BBPanel,ID_LINK_SELECT_BLACKBOX, crea::std2wx(blackBoxes[i]->GetName().c_str()), crea::std2wx(blackBoxes[i]->GetName().c_str()), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+          pBBlk->SetWindowStyle(wxALIGN_LEFT | wxNO_BORDER);
           std::string tt = "Author: " + blackBoxes[i]->GetAuthors() + "\nDescription: " + blackBoxes[i]->GetDescription() + "\nCategories: " + blackBoxes[i]->GetCategories();
           pBBlk->SetToolTip(crea::std2wx(tt));
           pBBlk->Connect(wxEVT_ENTER_WINDOW, (wxObjectEventFunction)(wxEventFunction)(wxMouseEventFunction)&wxCDMPackageDescriptionPanel::OnMouseEnter,NULL,this);
@@ -248,7 +249,7 @@ void wxCDMPackageDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->package->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)
         {
@@ -341,7 +342,7 @@ void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
 {
   modelCDMBlackBox* bb;
   std::vector<modelCDMBlackBox*> bbs = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < bbs.size(); i++)
+  for (int i = 0; i < (int)(bbs.size()); i++)
     {
       if(bbs[i]->GetName() == crea::wx2std(event.GetURL()))
         {
@@ -357,7 +358,7 @@ void wxCDMPackageDescriptionPanel::OnLnkBlackBoxSelect(wxHyperlinkEvent& event)
   wxPostEvent(this->GetParent(), *newEvent);
 
   wxCommandEvent* newEvent1 = new wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
-  newEvent1->SetClientData(bb);
+  newEvent1->SetClientData(bb->GetHeaderFile());
   newEvent1->SetId(0);
   wxPostEvent(this->GetParent(), *newEvent1);
 
@@ -438,7 +439,7 @@ void wxCDMPackageDescriptionPanel::OnMouseEnter(wxMouseEvent& event)
 
   modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {
@@ -458,7 +459,7 @@ void wxCDMPackageDescriptionPanel::OnMouseExit(wxMouseEvent& event)
   std::string BBName = crea::wx2std(((wxHyperlinkCtrl*)event.GetEventObject())->GetURL());
   modelCDMFile* bbHeader = NULL;
   std::vector<modelCDMBlackBox*> boxes = this->package->GetSrc()->GetBlackBoxes();
-  for (int i = 0; i < boxes.size(); i++)
+  for (int i = 0; i < (int)(boxes.size()); i++)
     {
       if(boxes[i]->GetName() == BBName)
         {