Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / threadproj.h

diff --git a/src/threadproj.h b/src/threadproj.h
index f5c565b3c035d0283225f369533c4d62621d8c2d..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:
 
 public:

-  ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView, 
+  ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView,

    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
    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();
 


@@ -77,7 +77,7 @@ private:
   PhantomFileView* m_pPhantomView;
   PhantomFileDocument* m_pPhantomDoc;
   Scanner* m_pScanner;
   PhantomFileView* m_pPhantomView;
   PhantomFileDocument* m_pPhantomDoc;
   Scanner* m_pScanner;

-  
+

   const int m_iNDet;
   const int m_iNView;
   const int m_iOffsetView;
   const int m_iNDet;
   const int m_iNView;
   const int m_iOffsetView;


@@ -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);
 


@@ -127,11 +127,11 @@ private:
 
 
 public:
 
 
 public:

-  ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) 
+  ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews)

     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}

-  
-  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner, 
+
+  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner,

    int iNDet, int iView, int iOffsetView,
    const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
    double dViewRatio, double dScanRatio);
    int iNDet, int iView, int iOffsetView,
    const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
    double dViewRatio, double dScanRatio);


@@ -144,4 +144,4 @@ public:
 
 #endif // HAVE_WXTHREADS
 #endif // _THREADPROJ_H_
 
 #endif // HAVE_WXTHREADS
 #endif // _THREADPROJ_H_

-  
+