From d650256e38052b06baf671b027b855a1ad27f578 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Wed, 8 Apr 2009 10:32:27 +0000
Subject: [PATCH] *** empty log message ***

---
 src2/creaImageIOTreeHandlerImageAdder.cpp | 55 +----------------------
 src2/creaImageIOWxTreeView.cpp            |  2 +-
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index d2431aa..c4337bc 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -1,8 +1,5 @@
 #include <creaImageIOTreeHandlerImageAdder.h>
 #include <creaImageIOSystem.h>
-//#include <wx/dir.h>
-//#include <wx/filename.h>
-
 #include "boost/filesystem.hpp"
 
 namespace fs = boost::filesystem;
@@ -115,63 +112,13 @@ namespace creaImageIO
 	    mProgressSignal(mProgress);
 	    if (mProgress.GetStop()) 
 		{
-			itr = end_itr;
+			itr = end_itr
 //			break;
 		}
 		}
       }
 	 
   }
-
-    /*
-
-    std::string fileName;
-    std::string dirName = dirpath;
-
-    wxDir dir( std2wx(dirpath) );
-
-    if ( !dir.IsOpened() )
-      {
-        // deal with the error here - wxDir would already log an error message
-        // explaining the exact reason of the failure
-        return;
-      }
-
-    wxString filename;
-
-    bool cont = dir.GetFirst(&filename, wxEmptyString, 
-			     wxDIR_FILES | wxDIR_HIDDEN );
-    while ( cont )
-      {
-	mProgress.IncNumberScannedFiles();
-
-	wxFileName wxffn(dir.GetName(),filename);
-	std::string ffn = wx2std(wxffn.GetFullPath());
-	if (IsHandledFile(ffn)) 
-	  {
-	    mProgress.IncNumberHandledFiles();
-	    AddFile( ffn );
-	  }
-	mProgressSignal(mProgress);
-	cont = ( dir.GetNext(&filename) && (!mProgress.GetStop()) );
-      }
-    
-    // Recurse into subdirs
-    if ( recursive )
-      {
-	cont = dir.GetFirst(&filename, wxEmptyString, 
-			    wxDIR_DIRS | wxDIR_HIDDEN );
-	while ( cont )
-	  {
-	    wxFileName wxffn(dir.GetName(),filename);
-	    std::string ffn = wx2std(wxffn.GetFullPath());
-	    AddDirectoryRecursor( ffn, recursive);
-	    cont = dir.GetNext(&filename);
-	  }
-      }
-  
-  */
-  
   //=======================================================================
 
 
diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index 9884cb0..e7a0042 100644
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -267,7 +267,7 @@ namespace creaImageIO
 	  {
       out<<" "<<GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?";
 	  }
-	  if (wxMessageBox(_T(out.str()),
+	  if (wxMessageBox(crea::std2wx(out.str()),
 			 _T("Remove Files"),
 			 wxYES_NO,this ) == wxYES)
 	  {
-- 
2.45.1