#define new DEBUG_NEW
#endif
+#ifdef _RELWITHDEBINFO
+#define new DEBUG_NEW
+#endif
+
namespace creaImageIO
{
// CTor
int max_dim,
int output_dim, // never used ?!? // JPR
int threads)
- : wxDialog( parent,
+ : wxDialog( parent,
id,
title,
pos,
wxMINIMIZE_BOX |
wxCAPTION
),
- // mGimmick(0),
+ // mGimmick(0),
mView(0)
{
GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
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,
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();
}
}
if (mGimmick)
{
- mGimmick->Finalize();
- //delete mGimmick;
+ mGimmick->Finalize();
}
}