X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadraster.h;h=b2224456b7a72825ac7be1915e0b414170e196f8;hb=HEAD;hp=d875913c9aca506b78d7dbb68404caa67cb58bc0;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7;p=ctsim.git diff --git a/src/threadraster.h b/src/threadraster.h index d875913..b222445 100644 --- a/src/threadraster.h +++ b/src/threadraster.h @@ -7,9 +7,7 @@ ** Date Started: February 2001 ** ** This is part of the CTSim program -** Copyright (C) 1983-2001 Kevin Rosenberg -** -** $Id$ +** Copyright (C) 1983-2009 Kevin Rosenberg ** ** 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,10 +48,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 +70,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);