X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickReaderDialog.cpp;h=4823d40bf665627e8743053dd0dc17850e6ef0c6;hb=a00e6172593c713640aaa9bf1e61db6200231a0f;hp=82c728d8f15d596a812c086e3b217c0a411be1ec;hpb=011c2f926836abae60e9a525f819f9a66f03fac1;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp index 82c728d..4823d40 100644 --- a/src2/creaImageIOWxGimmickReaderDialog.cpp +++ b/src2/creaImageIOWxGimmickReaderDialog.cpp @@ -4,11 +4,6 @@ #ifdef _DEBUG #define new DEBUG_NEW #endif - -#ifdef _RELWITHDEBINFO -#define new DEBUG_NEW -#endif - namespace creaImageIO { // CTor @@ -23,7 +18,7 @@ namespace creaImageIO int max_dim, int output_dim, // never used ?!? // JPR int threads) - : wxDialog( parent, + : wxDialog( parent, id, title, pos, @@ -40,7 +35,7 @@ namespace creaImageIO { GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog" <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)); @@ -75,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(); } @@ -98,6 +90,7 @@ topsizer->Add(mCancelButton, 0, wxGROW); { mGimmick->Finalize(); } + } ///Callback method on a selection