X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMBlackBoxDescriptionPanel.cpp;h=c511afff2a4bb27babc9d6678dd6ed4e2b513e2e;hb=58f32bff34779e30ecef47a095f08c96aae6edba;hp=22a8f879a28ae8190ce5561e4e0998a1e499b2d4;hpb=e75a80c4a8a5d67aeb1e941f0c980a11c09cc125;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
index 22a8f87..c511aff 100644
--- a/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMBlackBoxDescriptionPanel.cpp
@@ -91,12 +91,13 @@ void wxCDMBlackBoxDescriptionPanel::CreateControls()
   //Links to return
   wxBoxSizer *linksSizer = new wxBoxSizer(wxHORIZONTAL);
   std::vector<modelCDMIProjectTreeNode*> parents = this->blackBox->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);
         }
@@ -214,12 +215,12 @@ void wxCDMBlackBoxDescriptionPanel::OnBtnReturn(wxHyperlinkEvent& event)
   std::vector<modelCDMIProjectTreeNode*> parents = this->blackBox->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);
         }
@@ -318,8 +319,7 @@ void wxCDMBlackBoxDescriptionPanel::OnBtnOpenCxx(wxCommandEvent& event)
 
   if(this->blackBox->GetSourceFile() != NULL)
     {
-      int CMId = this->blackBox->GetSourceFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetSourceFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -337,8 +337,7 @@ void wxCDMBlackBoxDescriptionPanel::OnBtnOpenHxx(wxCommandEvent& event)
 
   if(this->blackBox->GetHeaderFile() != NULL)
     {
-      int CMId = this->blackBox->GetHeaderFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetHeaderFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -359,8 +358,7 @@ void wxCDMBlackBoxDescriptionPanel::OnCxxMouseEnter(wxMouseEvent& event)
 
   if(this->blackBox->GetSourceFile() != NULL)
     {
-      int CMId = this->blackBox->GetSourceFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetSourceFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -373,8 +371,7 @@ void wxCDMBlackBoxDescriptionPanel::OnCxxMouseExit(wxMouseEvent& event)
 
   if(this->blackBox->GetSourceFile() != NULL)
     {
-      int CMId = this->blackBox->GetSourceFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetSourceFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -387,8 +384,7 @@ void wxCDMBlackBoxDescriptionPanel::OnHxxMouseEnter(wxMouseEvent& event)
 
   if(this->blackBox->GetHeaderFile() != NULL)
     {
-      int CMId = this->blackBox->GetHeaderFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetHeaderFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }
@@ -401,8 +397,7 @@ void wxCDMBlackBoxDescriptionPanel::OnHxxMouseExit(wxMouseEvent& event)
 
   if(this->blackBox->GetHeaderFile() != NULL)
     {
-      int CMId = this->blackBox->GetHeaderFile()->GetId();
-      newEvent->SetInt(CMId);
+      newEvent->SetClientData(this->blackBox->GetHeaderFile());
       newEvent->SetId(0);
       wxPostEvent(this->GetParent(), *newEvent);
     }