Fixed add files problem and Mac compatibility

diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx
index 94838a8..19afb05 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/main.cxx
+++ b/appli/TestWxGimmickReaderDialog/main.cxx
@@ -61,9 +61,9 @@ bool myApp::OnInit( )
 
           //Puts images
        std::vector<vtkImageData*> images;
-       w.GetSelectedImages(images,output_dim);
-          
-       crea::VtkBasicSlicer(images.front());
+          w.GetSelectedImages(images,output_dim);
+
+          crea::VtkBasicSlicer(images.front());
        images.front()->Delete();
           w.OnExit();
 

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 8243867..1e39a55 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -36,19 +36,19 @@ namespace creaImageIO
 
   //================================================================
   // 
-  const int icon_number = 8;
+  const int icon_number = 9;
   // Icon ids
   typedef enum
     {
+         Icon_create_database,
       Icon_accept,
       Icon_add,
       Icon_folder_down,
       Icon_page_down,
+         Icon_database_add,
       Icon_remove,
-      Icon_database_add,
-      Icon_help,
          Icon_synchronize,
-         Icon_create_database
+      Icon_help
     }
     icon_id;
   //================================================================
@@ -780,7 +780,6 @@ namespace creaImageIO
    //=================================================
   BEGIN_EVENT_TABLE(WxGimmickView, wxPanel)
     EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB)
-       EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnCreateDB)
     EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles)
     EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir)
        EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB)

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index e644d5e..9746016 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -583,7 +583,7 @@ namespace creaImageIO
     // Validate selected images if the selection is at image level
     if (level==(mLevelList.size()-1)) //&&mProcess) 
       {
-       if(event.GetEventType()==10145)
+       if(event.GetEventType()==wxEVT_COMMAND_LIST_ITEM_SELECTED)
          {
            ValidateSelectedImages (true);
          }