X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxDumpPanel.cpp;fp=src%2FcreaImageIOWxDumpPanel.cpp;h=7ee1f30ced5c124a246aba148b725ec565f801cf;hb=2281508661c7a5b0732eb6ec64cb97b753df5de0;hp=15e9966bd78c94949993e6feab431a68f3a5c68b;hpb=56e12662d134e9c80989719e6295d7c913cf7af0;p=creaImageIO.git diff --git a/src/creaImageIOWxDumpPanel.cpp b/src/creaImageIOWxDumpPanel.cpp index 15e9966..7ee1f30 100644 --- a/src/creaImageIOWxDumpPanel.cpp +++ b/src/creaImageIOWxDumpPanel.cpp @@ -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(); } @@ -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;