r11859: Canonicalize whitespace

[ctsim.git] / src / threadraster.h

diff --git a/src/threadraster.h b/src/threadraster.h
index b161c03abb84dfe57279e279af6e8f932e424eb7..d875913c9aca506b78d7dbb68404caa67cb58bc0 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.1 2001/02/27 03:59:30 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
@@ -28,6 +28,8 @@
 #ifndef _THREADRASTER_H
 #define _THREADRASTER_H
 
+#ifdef HAVE_WXTHREADS
+
 #include <vector>
 #include <wx/thread.h>
 #include <wx/progdlg.h>
@@ -54,7 +56,6 @@ public:
   RasterizerSupervisorThread(PhantomFileView* pProjView, int iNX, int iNY, int iNSample, double dViewRatio, const char* const pszLabel);
 
   virtual wxThread::ExitCode Entry();
-
   virtual void OnExit();
 };
 
@@ -63,10 +64,10 @@ 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;
@@ -75,7 +76,7 @@ private:
 
 
 public:
-   RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNX, int iNY, 
+   RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNX, int iNY,
    int iNSample, double dViewRatio, const char* const pszLabel);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
@@ -102,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
@@ -114,6 +115,6 @@ public:
   virtual void OnExit();
 };
 
+#endif // HAVE_WXTHREADS
+#endif // _THREADRASTER_H_
 
-#endif
-