Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / dlgezplot.h

diff --git a/src/dlgezplot.h b/src/dlgezplot.h
index 0ab8806cd0743c9e3a7af3dcc4c43d8bf7d5ade1..d47df3933257f301cdd90bdba3020174eb32263b 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
-**  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$
 **
 **  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_
 
-#ifdef __GNUG__
-#pragma interface "dlgezplot.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/dialog.h"
 #include "wx/dcmemory.h"
@@ -44,7 +40,7 @@ class EZPlot;
 
 class EZPlotControl : public wxPanel
 {
-private:  
+private:
   DECLARE_DYNAMIC_CLASS (EZPlotControl)
   DECLARE_EVENT_TABLE ()
   EZPlot* m_pEZPlot;
@@ -61,32 +57,44 @@ public:
                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;
 
-  EZPlot* getEZPlot() 
+  EZPlot* getEZPlot()
   { return m_pEZPlot; }
 
   void OnPaint(wxPaintEvent& event);
 };
 
 
-class EZPlotDialog : public wxDialog
+class wxEZPlotDialog : public wxDialog
 {
 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();
+   ~wxEZPlotDialog();
 
    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