corrections on wxRedaerDialogBox

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 1b96fc94b1d2552f1865c081ab59500a6834358f..8a965f549b7d1448e9a456c4b26c9ad115f5484c 100644 (file)
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -142,7 +142,7 @@ namespace creaImageIO
                         //(*i)->Delete();
                  }
       }
- //  mThreadedImageReaderList.clear();
+   mThreadedImageReaderList.clear();
     // Wait a little to be sure that all threads have stopped
     // A better way to do this ?
     //    wxMilliSleep(1000);

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index baac5a555f2e38d5dc8eed77e292670ef690eb5e..4823d40bf665627e8743053dd0dc17850e6ef0c6 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -1,6 +1,9 @@
 #include <creaImageIOWxGimmickReaderDialog.h>
 #include <creaImageIOSystem.h>
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
   // CTor
@@ -32,7 +35,7 @@ namespace creaImageIO
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
                        <<std::endl);
-    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+    mtopsizer = new wxBoxSizer(wxVERTICAL);
 
     try {
 
@@ -58,7 +61,7 @@ namespace creaImageIO
       return;
     }
 
-    topsizer->Add( mView,1,wxGROW,0);
+    mtopsizer->Add( mView,1,wxGROW,0);
 
     wxSizer* bsizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
        /*mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50));
@@ -67,12 +70,9 @@ namespace creaImageIO
     mCancelButton = (wxButton*)FindWindowById(GetEscapeId(),      this);
 
     mOkButton->Enable(false);
+    mtopsizer->Add ( bsizer, 0, wxGROW );
 
-topsizer->Add(mOkButton, 0, wxGROW);
-topsizer->Add(mCancelButton, 0, wxGROW);
-   topsizer->Add ( bsizer, 0, wxGROW );
-
-    SetSizer( topsizer );     
+    SetSizer( mtopsizer );     
  
     Layout(); 
   }
@@ -90,6 +90,7 @@ topsizer->Add(mCancelButton, 0, wxGROW);
       {
                mGimmick->Finalize();
       }
+
   }
 
   ///Callback method on a selection

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 069b6a09eb911fa57600f4b51011af191554b27a..94b29b2379cd7377901eb0754391987370ab5d73 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -6,16 +6,17 @@
 #include <creaImageIOWxGimmickView.h>
 #include <creaWx.h>
 #include "wx/wx.h"
-
-
-
 namespace creaImageIO
 {
-    //=====================================================================
+  /**
+   * \ingroup GUI
+   */
+
+  //=====================================================================
  //=====================================================================
   class CREAIMAGEIO_EXPORT  WxGimmickReaderDialog : public wxDialog
   {
-  public:      
+  public:
     WxGimmickReaderDialog();
     WxGimmickReaderDialog(wxWindow *parent,
                          const wxWindowID id,
@@ -63,6 +64,7 @@ namespace creaImageIO
 
     wxButton* mOkButton;
     wxButton* mCancelButton;
+       wxBoxSizer *mtopsizer;
 
     enum 
       {