X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxDumpPanel.cpp;h=7ee1f30ced5c124a246aba148b725ec565f801cf;hb=3579beef5bd466705bc0431d7347d1150cdffe97;hp=610456fd90a17e3654e5e08034decd6bfb6e71bb;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOWxDumpPanel.cpp b/src/creaImageIOWxDumpPanel.cpp
index 610456f..7ee1f30 100644
--- a/src/creaImageIOWxDumpPanel.cpp
+++ b/src/creaImageIOWxDumpPanel.cpp
@@ -27,7 +27,7 @@
 
 
 #include <creaImageIOWxDumpPanel.h>
-#include <creaImageIOSystem.h>
+
 #include <creaImageIOGimmick.h>
 #include <boost/algorithm/string.hpp>
 #if defined(USE_GDCM)
@@ -61,7 +61,14 @@ namespace creaImageIO
 	wxToolBar *mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize);
 	mToolBar->AddTool( DUMP_SAVE_ID,_T("Save"), mIcon->GetBitmap(0), _T("Save Dicom Tags in text file"));
 	mToolBar->Realize();
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH );
+#else
+	DumpText = new wxTextCtrl( this, wxID_ANY,_T(""), wxPoint(5,30), wxSize(520,510), wxTE_READONLY | wxTE_MULTILINE | wxTE_RICH );
+#endif
+
 	Layout(); 
 	Print();
 	}
@@ -199,13 +206,13 @@ namespace creaImageIO
 				   std::string resultat;
 
 				   tag = "(" + i_line.substr(0,9) + ")";
-				   line = i_line.substr(14,i_line.size()-10);
-				   int pos1 = line.find_first_of("[");
-				   int pos2 = line.find_first_of("]");
+				   line =  i_line.substr(14,i_line.size()-10);
+				   int pos1 = (int)line.find_first_of("[");
+				   int pos2 = (int)line.find_first_of("]");
 				   signification = line.substr(pos1+1, pos2-pos1-1);
 				   line = line.substr(pos2+1);
-				    pos1 = line.find_first_of("[");
-				    pos2 = line.find_first_of("]");
+				    pos1 = (int)line.find_first_of("[");
+				    pos2 = (int)line.find_first_of("]");
 				   value = line.substr(pos1+1, pos2-pos1-1);
 				   resultat = tag + " " + signification + ": " +value;
 				  return resultat;
@@ -221,8 +228,14 @@ namespace creaImageIO
 ///////////////////////////////////////////////////
 	void WxDumpPanel::SaveInfos(wxCommandEvent& event)
 	{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""),
 					       crea::std2wx("*.txt"), wxOPEN, wxDefaultPosition);
+#else
+	wxFileDialog* FD = new wxFileDialog( 0,_T("Select file"), _T(""), _T(""),
+					       crea::std2wx("*.txt"), wxFD_OPEN, wxDefaultPosition);
+#endif
         if (FD->ShowModal()==wxID_OK)
 		{
 			wxBusyCursor busy;