r598: no message

[ctsim.git] / src / backgroundsupr.h

diff --git a/src/backgroundsupr.h b/src/backgroundsupr.h
index 9058c597f6efb1bf8bcbc5d6171e6f2e98683b89..3e170b740d4e99f034a9019334da01c4617dcc4f 100644 (file)
--- a/src/backgroundsupr.h
+++ b/src/backgroundsupr.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: backgroundsupr.h,v 1.2 2001/02/25 08:00:57 kevin Exp $
+**  $Id: backgroundsupr.h,v 1.6 2001/03/02 21:11:50 kevin Exp $
 **
 **  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
@@ -53,14 +53,12 @@ class BackgroundWorkerThread;
 class BackgroundSupervisor : public wxEvtHandler {
 private:
   DECLARE_DYNAMIC_CLASS(BackgroundSupervisor)
-
-  typedef std::vector<BackgroundWorkerThread*> ThreadContainer;
-  ThreadContainer m_vecpThreads;
+      
+  SupervisorThread* m_pMyThread;
   wxFrame* m_pParentFrame;
   wxDocument* m_pDocument;
   const std::string m_strProcessTitle;
-  wxProgressDialog* m_pDialogProgress;
-
+  
   volatile bool m_bFail;
   std::string m_strFailMessage;
   int m_iNumThreads;
@@ -71,6 +69,12 @@ private:
   bool m_bDone;
   Timer* m_pTimer;
   bool m_bBackgroundTaskAdded;
+  bool m_bWorkersDeleted;
+
+  typedef std::vector<BackgroundWorkerThread*> ThreadContainer;
+  ThreadContainer m_vecpThreads;
+  wxCriticalSection m_critsectThreads;
+
 
 public:
   enum {
@@ -85,7 +89,7 @@ public:
     MSG_WORKER_THREAD_FAIL = 7507,   // sent by workers when they fail
   };
 
-  BackgroundSupervisor (wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, 
+  BackgroundSupervisor (SupervisorThread* pMyThread, wxFrame* pParentFrame, wxDocument* pDocument, const char* const pszProcessTitle, 
     int iTotalUnits);
 
   BackgroundSupervisor ()
@@ -106,7 +110,8 @@ public:
   virtual void OnCancel(wxCommandEvent& event);
   virtual void OnAckDocumentRemove(wxCommandEvent& event);
 
-  bool anyWorkersRunning() const { return m_iRunning > 0 ? true : false; }
+  void deleteWorkers();
+  bool workersDeleted() const { return m_bWorkersDeleted; }
   bool isDone() const {return m_bDone;}
   void setDone() { m_bDone = true; }
   bool fail() const {return m_bFail;}
@@ -135,4 +140,4 @@ public:
   {}
 };
 
-#endif  // _BACKGROUNDSUPR_H_
\ No newline at end of file
+#endif  // _BACKGROUNDSUPR_H_