X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=bd4e404416579ccc1cf924b4d3150ca16b8f6979;hb=de6d2bb3861af7568006e1a02d5dddc730644b01;hp=6ea75a0509aed50a7664d80c68c84d6e7ecf6629;hpb=acbdc3e0bc421e5df6fdcea262a66a189d65dad3;p=ctsim.git

diff --git a/src/docs.cpp b/src/docs.cpp
index 6ea75a0..bd4e404 100644
--- a/src/docs.cpp
+++ b/src/docs.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: docs.cpp,v 1.32 2001/03/05 15:10:58 kevin Exp $
+**  $Id: docs.cpp,v 1.33 2001/03/05 17:26:46 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
@@ -130,30 +130,20 @@ ImageFileDocument::Revert ()
 
 IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument)
 BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument)
-#ifdef CTSIM_THREADS
-EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundProcessingDocument::OnAddBackground)
-EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundProcessingDocument::OnRemoveBackground)
-#endif
 END_EVENT_TABLE()
 
-#ifdef CTSIM_TREADS
+#ifdef HAVE_WXTHREADS
 void
-BackgroundProcessingDocument::OnAddBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
 {
-  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
-  wxASSERT (pSupervisor != NULL);
-
   wxCriticalSectionLocker locker (m_criticalSection);
   if (pSupervisor)
     m_vecpBackgroundSupervisors.push_back (pSupervisor);
 }
 
 void
-BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
+BackgroundProcessingDocument::removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor)
 {
-  BackgroundSupervisor* pSupervisor = reinterpret_cast<BackgroundSupervisor*>(event.GetClientData());
-  wxASSERT (pSupervisor != NULL);
-
   m_criticalSection.Enter();
   bool bFound = false;
   for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); 
@@ -168,15 +158,13 @@ BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
 
   if (! bFound) 
      sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
-  
-  pSupervisor->onAckDocumentRemove();
 }
 #endif
 
 void
 BackgroundProcessingDocument::cancelRunningTasks()
 {
-#ifdef CTSIM_THREADS
+#ifdef HAVE_WXTHREADS
   m_criticalSection.Enter();
   for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); 
         i != m_vecpBackgroundSupervisors.end(); i++)