X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdlgezplot.cpp;fp=src%2Fdlgezplot.cpp;h=2bf14f0091d2d736faedc6a0050407e3ed25ab26;hp=880e89763ad9fad11b8cd288f5bfdfdb4f7751dc;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=c8b19dfaffba9f06d8b6c40cb1bb83a8964867f7 diff --git a/src/dlgezplot.cpp b/src/dlgezplot.cpp index 880e897..2bf14f0 100644 --- a/src/dlgezplot.cpp +++ b/src/dlgezplot.cpp @@ -62,7 +62,7 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(EZPlotControl, wxPanel) -EZPlotControl::EZPlotControl (wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, +EZPlotControl::EZPlotControl (wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) : m_pEZPlot(0), m_pSGPDriver(0), m_pSGP(0), m_pDC(0) { @@ -80,7 +80,7 @@ EZPlotControl::GetBestSize () const } EZPlotControl::~EZPlotControl() -{ +{ delete m_pEZPlot; delete m_pSGP; delete m_pSGPDriver; @@ -113,20 +113,20 @@ wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton) m_parentTop = parent; while ( m_parentTop && m_parentTop->GetParent() ) m_parentTop = m_parentTop->GetParent(); - + wxBoxSizer* pTopSizer = new wxBoxSizer (wxVERTICAL); pTopSizer->Add (m_pEZPlotCtrl = new EZPlotControl (this), 0, wxALIGN_CENTER | wxALL, 5); - + wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL); wxButton* pButtonOk = new wxButton (this, wxID_OK, "Ok"); pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10); if (bCancelButton) { wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel"); pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10); - } + } pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER); - + SetAutoLayout (true); SetSizer (pTopSizer); pTopSizer->Fit (this);