Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[creaImageIO.git] / src / creaImageIOWxAnySimpleDlg.cpp

diff --git a/src/creaImageIOWxAnySimpleDlg.cpp b/src/creaImageIOWxAnySimpleDlg.cpp
index 11d5fa92d60a79d6b4e5436c66ada2cd8deaeaa6..4a31cbe9de72e7d4cae819d5c03abaf8f7dc0afb 100644 (file)
--- a/src/creaImageIOWxAnySimpleDlg.cpp
+++ b/src/creaImageIOWxAnySimpleDlg.cpp
@@ -94,7 +94,12 @@ namespace creaImageIO
      void WxAnySimpleDlg::OnReadFile(wxCommandEvent& event)
       {
           int resultShowModal;
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
           wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#else
+          wxFileDialog* fileDlg = new wxFileDialog( 0,  _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxFD_OPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#endif
     
           resultShowModal = fileDlg->ShowModal();
           if ( resultShowModal==wxID_OK )
@@ -132,7 +137,6 @@ namespace creaImageIO
 //////////////////////////////////////////////////////////////////////
       void WxAnySimpleDlg::OnReadDirectory(wxCommandEvent &event)
       {
-printf("EED WxAnySimpleDlg::OnReadDirectory Start\n");
          int resultShowModal;
          bool bvalid = false;
          long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
@@ -142,7 +146,6 @@ printf("EED WxAnySimpleDlg::OnReadDirectory Start\n");
          if ( resultShowModal==wxID_OK )
          {  
             std::string path = crea::wx2std(dirDlg->GetPath());
-printf("EED WxAnySimpleDlg::OnReadDirectory path %s\n", path.c_str() );
 
 /*
             typedef boost::filesystem::directory_iterator dir_it;
@@ -182,8 +185,7 @@ printf("EED WxAnySimpleDlg::OnReadDirectory  Each file %s \n", itr->path().strin
                                for (vec::const_iterator it (v.begin()); it != v.end(); ++it)
                                {
                            readImg( it->string().c_str() );
-                                 cout << "   " << *it << '\n';
-                               }
+                               } // for
 
 
 
@@ -192,7 +194,6 @@ printf("EED WxAnySimpleDlg::OnReadDirectory  Each file %s \n", itr->path().strin
          SetReturnCode( resultShowModal );
 //         Close();
          EndModal( resultShowModal );
-printf("EED WxAnySimpleDlg::OnReadDirectory End\n");
 
       }
 
@@ -270,8 +271,6 @@ printf("EED WxAnySimpleDlg::OnReadDirectory End\n");
      {
           size_t dims = getNumberOfDimensions(i_name);
 
-printf("EED WxAnySimpleDlg::readImg dims=%d \n",dims);
-
           //const std::type_info  *type= &getType(i_name);
           switch(dims)
           {