]> Creatis software - creaImageIO.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 28 Jan 2011 15:25:00 +0000 (15:25 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 28 Jan 2011 15:25:00 +0000 (15:25 +0000)
src/creaImageIOWxGimmickView.cpp

index fc748e0aa2ebd31f5b5bd8599d286ba40ddbb898..b5e7e1938580db7f0f399e87b58534bea7d56c2d 100644 (file)
@@ -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))