projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move autoconf generated files back into repository
[ctsim.git]
/
src
/
dlgezplot.cpp
diff --git
a/src/dlgezplot.cpp
b/src/dlgezplot.cpp
index 880e89763ad9fad11b8cd288f5bfdfdb4f7751dc..a54d18edf0898a1f377e765d53a0d812b195070e 100644
(file)
--- a/
src/dlgezplot.cpp
+++ b/
src/dlgezplot.cpp
@@
-62,7
+62,7
@@
END_EVENT_TABLE()
IMPLEMENT_CLASS(EZPlotControl, wxPanel)
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)
{
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()
}
EZPlotControl::~EZPlotControl()
-{
+{
delete m_pEZPlot;
delete m_pSGP;
delete m_pSGPDriver;
delete m_pEZPlot;
delete m_pSGP;
delete m_pSGPDriver;
@@
-104,7
+104,7
@@
EZPlotControl::OnPaint (wxPaintEvent& event)
wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton)
wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton)
-: wxDialog((parent ? parent : theApp->getMainFrame()), -1,
wxString
("EZPlot"), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL),
+: wxDialog((parent ? parent : theApp->getMainFrame()), -1,
_T
("EZPlot"), wxDefaultPosition, wxDefaultSize, wxDIALOG_MODAL),
m_parentTop(0)
{
if (! parent)
m_parentTop(0)
{
if (! parent)
@@
-113,20
+113,20
@@
wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton)
m_parentTop = parent;
while ( m_parentTop && m_parentTop->GetParent() )
m_parentTop = m_parentTop->GetParent();
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* pTopSizer = new wxBoxSizer (wxVERTICAL);
pTopSizer->Add (m_pEZPlotCtrl = new EZPlotControl (this), 0, wxALIGN_CENTER | wxALL, 5);
-
+
wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL);
wxBoxSizer* pButtonSizer = new wxBoxSizer (wxHORIZONTAL);
- wxButton* pButtonOk = new wxButton (this, wxID_OK,
"Ok"
);
+ wxButton* pButtonOk = new wxButton (this, wxID_OK,
_T("Ok")
);
pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10);
if (bCancelButton) {
pButtonSizer->Add (pButtonOk, 0, wxEXPAND | wxALL, 10);
if (bCancelButton) {
- wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL,
"Cancel"
);
+ wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL,
_T("Cancel")
);
pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10);
pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10);
- }
+ }
pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
-
+
SetAutoLayout (true);
SetSizer (pTopSizer);
pTopSizer->Fit (this);
SetAutoLayout (true);
SetSizer (pTopSizer);
pTopSizer->Fit (this);