X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.cpp;h=bd4e404416579ccc1cf924b4d3150ca16b8f6979;hb=999a754d1519a49ca062ee87b22bf601c1ee9f21;hp=337d6737e5086c95aafb4bdbd920fd3df5e1ce52;hpb=cd93aebb4dec4e0ae88d53f131c2320ae92d0cab;p=ctsim.git diff --git a/src/docs.cpp b/src/docs.cpp index 337d673..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.31 2001/03/04 22:30:19 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,27 +130,20 @@ ImageFileDocument::Revert () IMPLEMENT_DYNAMIC_CLASS(BackgroundProcessingDocument, wxDocument) BEGIN_EVENT_TABLE(BackgroundProcessingDocument, wxDocument) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_ADD, BackgroundProcessingDocument::OnAddBackground) -EVT_MENU(BackgroundSupervisor::MSG_BACKGROUND_SUPERVISOR_REMOVE, BackgroundProcessingDocument::OnRemoveBackground) END_EVENT_TABLE() +#ifdef HAVE_WXTHREADS void -BackgroundProcessingDocument::OnAddBackground (wxCommandEvent& event) +BackgroundProcessingDocument::addBackgroundSupervisor (BackgroundSupervisor* pSupervisor) { - BackgroundSupervisor* pSupervisor = reinterpret_cast(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(event.GetClientData()); - wxASSERT (pSupervisor != NULL); - m_criticalSection.Enter(); bool bFound = false; for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); @@ -165,13 +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 HAVE_WXTHREADS m_criticalSection.Enter(); for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin(); i != m_vecpBackgroundSupervisors.end(); i++) @@ -182,6 +175,7 @@ BackgroundProcessingDocument::cancelRunningTasks() ::wxYield(); ::wxUsleep(50); } +#endif }