From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 28 Jan 2011 15:25:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: Creatools2-0-3.creaImageIO0-2-5.17Feb2011~3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=34891dc6b110a21ed72b0ae24da3d5046724738a

*** empty log message ***
---

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index fc748e0..b5e7e19 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -502,7 +502,8 @@ namespace creaImageIO
 	  new wxProgressDialog(_T("Adding file(s)"),
 			       _T(""),
 			       1000,
-			       this,
+//			       this,
+			       NULL,
 			       wxPD_ELAPSED_TIME |
 			       // wxPD_ESTIMATED_TIME |
 			       // wxPD_REMAINING_TIME |
@@ -1199,6 +1200,14 @@ namespace creaImageIO
     //    std::cout << "OnAddProgress "<<mess<<std::endl;
     wxString s(wxString::From8BitData(mess));
     //  std::cout << "Pulse"<<std::endl;
+    if (mProgressDialog!=0) 
+    {
+	    if (!mProgressDialog->Pulse(s)) 
+	    	{
+			p.SetStop();
+	    	}
+    }
+
 	if(mProgressDialog != 0)
 	{
 		if (!mProgressDialog->Pulse(s))