Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / threadraster.h

diff --git a/src/threadraster.h b/src/threadraster.h
index 2644a45840cdb9fe72e6ebb254ea295755040764..0b637b127e9ffb4cfd3bb50bfaf68576f31a4420 100644 (file)
--- a/src/threadraster.h
+++ b/src/threadraster.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadraster.h,v 1.2 2001/03/02 21:11: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
@@ -50,13 +50,12 @@ 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();
 };
 
@@ -65,20 +64,20 @@ public:
 class RasterizerSupervisor : public BackgroundSupervisor {
 private:
 
+  PhantomFileView* m_pPhantomView;
   std::vector<ImageFile*> m_vecpChildImageFiles;
   PhantomFileDocument* m_pPhantomDoc;
-  PhantomFileView* m_pPhantomView;
-  
+
   const int m_iNX;
   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);
+   RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNX, int iNY,
+   int iNSample, double dViewRatio, wxChar const* pszLabel);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
@@ -104,11 +103,11 @@ private:
 
 
 public:
-  RasterizerWorker (RasterizerSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) 
+  RasterizerWorker (RasterizerSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews)
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
-  
-  void SetParameters (PhantomFileView* pPhantomFile, ImageFile* pImageFile, int iNX, int iY, 
+
+  void SetParameters (PhantomFileView* pPhantomFile, ImageFile* pImageFile, int iNX, int iY,
    int iNSample, double dViewRatio);
 
   virtual wxThread::ExitCode Entry();      // thread execution starts here
@@ -118,4 +117,4 @@ public:
 
 #endif // HAVE_WXTHREADS
 #endif // _THREADRASTER_H_
-  
+