X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickReaderDialog.cpp;h=82c728d8f15d596a812c086e3b217c0a411be1ec;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=c68efc1ac7adca92d33ac01cc9e4a9819060e2ba;hpb=84809cf9be33368b919f46650048516db850aac0;p=creaImageIO.git

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index c68efc1..82c728d 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -5,6 +5,10 @@
 #define new DEBUG_NEW
 #endif
 
+#ifdef _RELWITHDEBINFO
+#define new DEBUG_NEW
+#endif
+
 namespace creaImageIO
 {
   // CTor
@@ -19,7 +23,7 @@ namespace creaImageIO
 					       int max_dim,
 					       int output_dim,  // never used ?!? // JPR
 					       int threads)
- :   wxDialog( parent, 
+ : wxDialog( parent, 
 		  id, 
 		  title,
 		  pos,
@@ -31,7 +35,7 @@ namespace creaImageIO
 		  wxMINIMIZE_BOX  | 
 		  wxCAPTION  
 	       ),
-  //  mGimmick(0),
+ //   mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
@@ -40,7 +44,7 @@ namespace creaImageIO
 
     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,
@@ -64,15 +68,20 @@ namespace creaImageIO
 
     topsizer->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);
 
-    topsizer->Add ( bsizer, 0, wxGROW );
+topsizer->Add(mOkButton, 0, wxGROW);
+topsizer->Add(mCancelButton, 0, wxGROW);
+   topsizer->Add ( bsizer, 0, wxGROW );
 
     SetSizer( topsizer );     
+ 
     Layout(); 
   }
 
@@ -87,8 +96,7 @@ namespace creaImageIO
       }
     if (mGimmick) 
       {
-	mGimmick->Finalize();
-	//delete mGimmick;
+		mGimmick->Finalize();
       }
   }