projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update debian configure options
[ctsim.git]
/
src
/
dlgezplot.h
diff --git
a/src/dlgezplot.h
b/src/dlgezplot.h
index 0ab8806cd0743c9e3a7af3dcc4c43d8bf7d5ade1..39c1aca932839d2638d93a392797bcda6965743e 100644
(file)
--- a/
src/dlgezplot.h
+++ b/
src/dlgezplot.h
@@
-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: dlgezplot.h,v 1.2 2001/01/12 21:53:27 kevin Exp $
+** 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
@@
-28,10
+26,6
@@
#ifndef __DLGEZPLOT_H_
#define __DLGEZPLOT_H_
#ifndef __DLGEZPLOT_H_
#define __DLGEZPLOT_H_
-#ifdef __GNUG__
-#pragma interface "dlgezplot.h"
-#endif
-
#include "wx/setup.h"
#include "wx/dialog.h"
#include "wx/dcmemory.h"
#include "wx/setup.h"
#include "wx/dialog.h"
#include "wx/dcmemory.h"
@@
-44,7
+38,7
@@
class EZPlot;
class EZPlotControl : public wxPanel
{
class EZPlotControl : public wxPanel
{
-private:
+private:
DECLARE_DYNAMIC_CLASS (EZPlotControl)
DECLARE_EVENT_TABLE ()
EZPlot* m_pEZPlot;
DECLARE_DYNAMIC_CLASS (EZPlotControl)
DECLARE_EVENT_TABLE ()
EZPlot* m_pEZPlot;
@@
-61,32
+55,44
@@
public:
const wxSize& size = wxDefaultSize,
long style = wxSTATIC_BORDER,
const wxValidator& validator = wxDefaultValidator,
const wxSize& size = wxDefaultSize,
long style = wxSTATIC_BORDER,
const wxValidator& validator = wxDefaultValidator,
-
const wxString& name = "EZPlotCtrl"
);
+
const wxString& name = _T("EZPlotCtrl")
);
virtual ~EZPlotControl();
virtual wxSize GetBestSize() const;
virtual ~EZPlotControl();
virtual wxSize GetBestSize() const;
- EZPlot* getEZPlot()
+ EZPlot* getEZPlot()
{ return m_pEZPlot; }
void OnPaint(wxPaintEvent& event);
};
{ return m_pEZPlot; }
void OnPaint(wxPaintEvent& event);
};
-class EZPlotDialog : public wxDialog
+class
wx
EZPlotDialog : public wxDialog
{
private:
wxWindow *m_parentTop; // parent top level window (may be NULL)
EZPlotControl* m_pEZPlotCtrl;
public:
{
private:
wxWindow *m_parentTop; // parent top level window (may be NULL)
EZPlotControl* m_pEZPlotCtrl;
public:
-
EZPlotDialog (wxWindow *parent = NULL
);
+
wxEZPlotDialog (wxWindow *parent = NULL, bool bCancelButton = false
);
- ~EZPlotDialog();
+ ~
wx
EZPlotDialog();
EZPlot* getEZPlot ()
{ if (m_pEZPlotCtrl) return m_pEZPlotCtrl->getEZPlot(); else return NULL; }
};
EZPlot* getEZPlot ()
{ if (m_pEZPlotCtrl) return m_pEZPlotCtrl->getEZPlot(); else return NULL; }
};
+
+class EZPlotDialog
+{
+private:
+ wxEZPlotDialog* m_pDialog;
+
+public:
+ EZPlotDialog (wxWindow *parent = NULL, bool bCancelButton = false);
+
+ EZPlot* getEZPlot ();
+ int ShowModal();
+};
#endif
#endif