projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r622: *** empty log message ***
[ctsim.git]
/
src
/
docs.cpp
diff --git
a/src/docs.cpp
b/src/docs.cpp
index 99e6a56e9c9245d5cda5b1b88b8a840db209fdee..bd4e404416579ccc1cf924b4d3150ca16b8f6979 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: docs.cpp,v 1.
29 2001/02/25 10:52:55
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
**
** 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)
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()
END_EVENT_TABLE()
+#ifdef HAVE_WXTHREADS
void
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
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();
m_criticalSection.Enter();
bool bFound = false;
for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
@@
-165,24
+158,24
@@
BackgroundProcessingDocument::OnRemoveBackground (wxCommandEvent& event)
if (! bFound)
sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
if (! bFound)
sys_error (ERR_SEVERE, "Could not find background task [OnRemoveBackground]");
-
- wxCommandEvent ackEvent (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_DOCUMENT_ACK_REMOVE);
- wxPostEvent (pSupervisor, ackEvent);
}
}
+#endif
void
BackgroundProcessingDocument::cancelRunningTasks()
{
void
BackgroundProcessingDocument::cancelRunningTasks()
{
+#ifdef HAVE_WXTHREADS
m_criticalSection.Enter();
for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
i != m_vecpBackgroundSupervisors.end(); i++)
m_criticalSection.Enter();
for (BackgroundContainer::iterator i = m_vecpBackgroundSupervisors.begin();
i != m_vecpBackgroundSupervisors.end(); i++)
-
BackgroundSupervisor::cancelSupervisor(*i
);
+
(*i)->onCancel(
);
m_criticalSection.Leave();
while (m_vecpBackgroundSupervisors.size() > 0) {
m_criticalSection.Leave();
while (m_vecpBackgroundSupervisors.size() > 0) {
- ::wxUsleep(50);
::wxYield();
::wxYield();
+ ::wxUsleep(50);
}
}
+#endif
}
}
@@
-255,6
+248,11
@@
ProjectionFileDocument::getView() const
IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
IMPLEMENT_DYNAMIC_CLASS(PhantomFileDocument, BackgroundProcessingTask)
+PhantomFileDocument::~PhantomFileDocument()
+{
+ cancelRunningTasks();
+}
+
bool
PhantomFileDocument::OnOpenDocument(const wxString& filename)
{
bool
PhantomFileDocument::OnOpenDocument(const wxString& filename)
{