#3208 creaImageIO Feature New Normal - branch mingw64

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 0ee66e527742783db26a6974ce6f4980a4252c02..46e2507c5e5ce23992ebbd14f521ea7e9125119f 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -504,7 +504,15 @@ namespace creaImageIO
   void WxGimmickView::OnAddFiles(wxCommandEvent& event)
   {
     mViewer->StopPlayer();
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
     long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
+#else
+    long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE;
+#endif
+
+
     std::string wc("*");
     wxFileDialog* FD = new wxFileDialog( 0, 
                                         _T("Select file"),
@@ -700,7 +708,11 @@ namespace creaImageIO
       {
                  ClearSelection();
       }*/
-       ReadImageThreaded(sel);
+         
+  printf("EED Warnning WxGimmickView::OnSelectionChange ....... To avoid threads conflicts//ReadImageThreaded(sel)\n ");
+//EED1 ReadImageThreaded(sel);
+
+
    }
 
   //==================================================