namespace creaImageIO
{
// CTor
- WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent,
+ WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent,
wxWindowID id,
const std::string i_namedescp,
const std::string i_namedb,
int max_dim,
int output_dim, // never used ?!? // JPR
int threads)
- : wxDialog( parent,
+ : wxDialog( parent,
id,
title,
pos,
wxCAPTION
),
// mGimmick(0),
- mView(0)
+ mView(NULL)
{
GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
<<std::endl);
try {
- mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
- mGimmick->Initialize(i_namedescp,i_namedb);
+ mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+ mGimmick->Initialize(i_namedescp,i_namedb);
- mView = new WxGimmickView(mGimmick,
+ mView = new WxGimmickView(mGimmick,
this,
TVID,
wxDefaultPosition,
min_dim,
max_dim,
threads);
- mView->Initialize();
+ //EED 2021-12-17
+ mView->Initialize();
// Connect the AddProgress callback
- mView->ConnectValidationObserver
- ( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
- }
- catch (crea::Exception e)
- {
- e.Print();
- return;
+ mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
+ } catch (crea::Exception e) {
+ e.Print();
+ return;
}
mtopsizer->Add( mView,1,wxGROW,0);
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);
+ //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 );
SetSizer( mtopsizer );
+
Layout();
}