Bug Modal window

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 21c95b7f865320f0220271d3edf1515ad1669fcf..b12662acffb5244bcda6c4bcc01c31bfe079fff6 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -586,7 +586,7 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
-                              wxPD_CAN_ABORT );
+                              wxPD_CAN_ABORT  | wxSTAY_ON_TOP | wxPD_APP_MODAL );
 
        // TO DO : select the current tree handler
        mGimmick->AddFiles(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),filenames);
@@ -625,22 +625,19 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
        }
 
                wxBusyCursor busy;
-               wxString title(_T("Adding directory"));
-               if (recurse) 
-               title = _T("Adding directory (recursive)");
-               mProgressDialog = 
+//             wxString title(_T("xAdding directory"));
+//             if (recurse)            title = _T("Adding directory (recursive)");
+               mProgressDialog =
                new wxProgressDialog(_T("Adding directory"),
                                        _T(""),
                                        NumberFilesToAdd(dirname,recurse),
-
-//EED                                  this,
+//                                     this,
                                        NULL,
-
                                        wxPD_ELAPSED_TIME | 
                                        wxPD_SMOOTH |
                                        // wxPD_ESTIMATED_TIME |
                                        // wxPD_REMAINING_TIME |
-                                       wxPD_CAN_ABORT );
+                                       wxPD_CAN_ABORT | wxSTAY_ON_TOP | wxPD_APP_MODAL);
 
                mCurrentDirectory = FD->GetPath();  
                mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirname,recurse);
@@ -910,7 +907,7 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
 //EED                                          this,
                                                NULL,
        
-                                               wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+                                               wxPD_ELAPSED_TIME |wxPD_CAN_ABORT  | wxSTAY_ON_TOP | wxPD_APP_MODAL );
      mCurrentDirectory = crea::std2wx(dirName);
      mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirName,true);
      mProgressDialog->Pulse(_T("Updating view..."));
@@ -1056,8 +1053,8 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
 //EED                                                                                  this,
                                                                                        NULL,
 
-                                                                                       wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
-       std::cout <<"after new wxProgressDialog" << std::endl;                                          
+                                                                                       wxPD_ELAPSED_TIME |wxPD_CAN_ABORT   | wxSTAY_ON_TOP | wxPD_APP_MODAL );
+       std::cout <<"after new wxProgressDialog" << std::endl;
                                                mCurrentDirectory = gimmickTools->getOutputDir();
        std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;                                               
                                                mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
@@ -1185,7 +1182,7 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
                                        wxPD_ELAPSED_TIME |
                                        //                             wxPD_ESTIMATED_TIME | 
                                        //                             wxPD_REMAINING_TIME |
-                                       wxPD_CAN_ABORT );
+                                       wxPD_CAN_ABORT   | wxSTAY_ON_TOP | wxPD_APP_MODAL );
                mCurrentDirectory = crea::std2wx(drive);
                mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),drive,true);
                mProgressDialog->Pulse(_T("Updating view..."));
@@ -1262,7 +1259,7 @@ void WxGimmickView::AddBtnTool(wxPanel *panel, wxBoxSizer *sizerH, int id, wxStr
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
-                              wxPD_CAN_ABORT );
+                              wxPD_CAN_ABORT  | wxSTAY_ON_TOP | wxPD_APP_MODAL );
                mGimmick->AddFiles(storage,i_filenames);
                mProgressDialog->Pulse(_T("Updating view..."));
                UpdateTreeViewLevel(storage,1);