Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / dlgezplot.cpp

diff --git a/src/dlgezplot.cpp b/src/dlgezplot.cpp
index 82f566afae212f50e1297173f6094a2850f646a8..a54d18edf0898a1f377e765d53a0d812b195070e 100644 (file)
--- a/src/dlgezplot.cpp
+++ b/src/dlgezplot.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dlgezplot.cpp,v 1.4 2001/03/29 21:25:50 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
@@ -31,17 +31,9 @@
 
 #ifdef HAVE_WXWINDOWS
 
-#ifdef __GNUG__
-#pragma implementation "dlgezplot.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/frame.h"
@@ -70,7 +62,7 @@ END_EVENT_TABLE()
 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)
 {
@@ -88,7 +80,7 @@ EZPlotControl::GetBestSize () const
 }
 
 EZPlotControl::~EZPlotControl()
-{    
+{
   delete m_pEZPlot;
   delete m_pSGP;
   delete m_pSGPDriver;
@@ -112,7 +104,7 @@ EZPlotControl::OnPaint (wxPaintEvent& event)
 
 
 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)
@@ -121,20 +113,20 @@ wxEZPlotDialog::wxEZPlotDialog (wxWindow *parent, bool bCancelButton)
   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* 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) {
-    wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, "Cancel");
+    wxButton* pButtonCancel = new wxButton (this, wxID_CANCEL, _T("Cancel"));
     pButtonSizer->Add (pButtonCancel, 0, wxEXPAND | wxALL, 10);
-  }  
+  }
   pTopSizer->Add (pButtonSizer, 0, wxALIGN_CENTER);
-  
+
   SetAutoLayout (true);
   SetSizer (pTopSizer);
   pTopSizer->Fit (this);