Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / threadraster.h

diff --git a/src/threadraster.h b/src/threadraster.h
index d875913c9aca506b78d7dbb68404caa67cb58bc0..0b637b127e9ffb4cfd3bb50bfaf68576f31a4420 100644 (file)
--- a/src/threadraster.h
+++ b/src/threadraster.h
@@ -50,10 +50,10 @@ private:
   const int m_iNY;
   const int m_iNSample;
   const double m_dViewRatio;
-  const std::string m_strLabel;
+  const wxString m_strLabel;
 
 public:
-  RasterizerSupervisorThread(PhantomFileView* pProjView, int iNX, int iNY, int iNSample, double dViewRatio, const char* const pszLabel);
+  RasterizerSupervisorThread(PhantomFileView* pProjView, int iNX, int iNY, int iNSample, double dViewRatio, wxChar const* strLabel);
 
   virtual wxThread::ExitCode Entry();
   virtual void OnExit();
@@ -72,12 +72,12 @@ private:
   const int m_iNY;
   const int m_iNSample;
   const double m_dViewRatio;
-  const char* const m_pszLabel;
+  const wxString m_strLabel;
 
 
 public:
    RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNX, int iNY,
-   int iNSample, double dViewRatio, const char* const pszLabel);
+   int iNSample, double dViewRatio, wxChar const* pszLabel);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);