Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / threadproj.h

diff --git a/src/threadproj.h b/src/threadproj.h
index 805718e49602a1336733bcaa37d8c41a4b13c51d..b3e048e0ac84682ad0dda77f275d64a7b4b55fb7 100644 (file)
--- a/src/threadproj.h
+++ b/src/threadproj.h
@@ -56,12 +56,12 @@ private:
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;

-  const std::string m_strLabel;
+  const wxString m_strLabel;

 
 public:
   ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
 
 public:
   ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,

-   double dViewRatio, double dScanRatio, const char* const pszLabel);
+   double dViewRatio, double dScanRatio, wxChar const* strLabel);

 
   virtual wxThread::ExitCode Entry();
 
 
   virtual wxThread::ExitCode Entry();
 


@@ -88,13 +88,13 @@ private:
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
   const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;

-  const char* const m_pszLabel;
+  const wxString m_strLabel;

 
 
 public:
    ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView,  int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
 
 
 public:
    ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView,  int iOffsetView,
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,

-   double dViewRatio, double dScanRatio, const char* const pszLabel);
+   double dViewRatio, double dScanRatio, wxChar const* pszLabel);

 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);