projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test script outputs in CSV
[ctsim.git]
/
src
/
dlgezplot.cpp
diff --git
a/src/dlgezplot.cpp
b/src/dlgezplot.cpp
index 880e89763ad9fad11b8cd288f5bfdfdb4f7751dc..17fe68f7101765619b2f8647f619d38867b9d574 100644
(file)
--- a/
src/dlgezplot.cpp
+++ b/
src/dlgezplot.cpp
@@
-7,9
+7,7
@@
** Date Started: Jan 2001
**
** This is part of the CTSim program
** Date Started: Jan 2001
**
** This is part of the CTSim program
-** Copyright (c) 1983-2001 Kevin Rosenberg
-**
-** $Id$
+** Copyright (c) 1983-2009 Kevin Rosenberg
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-62,7
+60,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
+78,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,8
+102,8
@@
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
),
- m_parentTop(0)
+
: wxDialog((parent ? parent : theApp->getMainFrame()), -1, _T("EZPlot")
),
+
m_parentTop(0)
{
if (! parent)
parent = theApp->getMainFrame();
{
if (! parent)
parent = theApp->getMainFrame();
@@
-113,20
+111,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);