projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3851: *** empty log message ***
[ctsim.git]
/
src
/
dlgezplot.h
diff --git
a/src/dlgezplot.h
b/src/dlgezplot.h
index 0ab8806cd0743c9e3a7af3dcc4c43d8bf7d5ade1..27308f1df7b860b579b93472aac43077299a78a9 100644
(file)
--- a/
src/dlgezplot.h
+++ b/
src/dlgezplot.h
@@
-7,9
+7,9
@@
** 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
+** Copyright (
c
) 1983-2001 Kevin Rosenberg
**
**
-** $Id: dlgezplot.h,v 1.
2 2001/01/12 21:53:27
kevin Exp $
+** $Id: dlgezplot.h,v 1.
5 2003/01/23 23:35:58
kevin Exp $
**
** 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
+28,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"
@@
-74,19
+70,31
@@
public:
};
};
-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