X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickReaderDialog.cpp;h=4823d40bf665627e8743053dd0dc17850e6ef0c6;hb=a00e6172593c713640aaa9bf1e61db6200231a0f;hp=c68efc1ac7adca92d33ac01cc9e4a9819060e2ba;hpb=84809cf9be33368b919f46650048516db850aac0;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index c68efc1..4823d40 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -4,7 +4,6 @@
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
-
 namespace creaImageIO
 {
   // CTor
@@ -31,16 +30,16 @@ namespace creaImageIO
 		  wxMINIMIZE_BOX  | 
 		  wxCAPTION  
 	       ),
-  //  mGimmick(0),
+ //   mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
 			<<std::endl);
-    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+    mtopsizer = new wxBoxSizer(wxVERTICAL);
 
     try {
 
-      mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+	  mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
       mGimmick->Initialize(i_namedescp,i_namedb);
 
       mView = new WxGimmickView(mGimmick,
@@ -62,17 +61,19 @@ namespace creaImageIO
       return;
     }
 
-    topsizer->Add( mView,1,wxGROW,0);
+    mtopsizer->Add( mView,1,wxGROW,0);
 
-    wxSizer* bsizer = CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-    mOkButton     = (wxButton*)FindWindowById(GetAffirmativeId(), this);
+    wxSizer* bsizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+	/*mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50));
+	mCancelButton = new wxButton(this, wxID_CANCEL, _T("CANCEL"), wxPoint(210,50));
+	*/	mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this);
     mCancelButton = (wxButton*)FindWindowById(GetEscapeId(),      this);
 
     mOkButton->Enable(false);
+    mtopsizer->Add ( bsizer, 0, wxGROW );
 
-    topsizer->Add ( bsizer, 0, wxGROW );
-
-    SetSizer( topsizer );     
+    SetSizer( mtopsizer );     
+ 
     Layout(); 
   }
 
@@ -87,9 +88,9 @@ namespace creaImageIO
       }
     if (mGimmick) 
       {
-	mGimmick->Finalize();
-	//delete mGimmick;
+		mGimmick->Finalize();
       }
+
   }
 
   ///Callback method on a selection