X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fdocs.h;h=966cdddece2ea65592bad0f17b20452588fad1ef;hp=f841bcdfe51489dd296182f43dc78522ad254362;hb=c0f892798de8f89715266150f7d8e413f2cf29fe;hpb=df521cfe14a9e0b47bdcd98d1f67d03acf242162 diff --git a/src/docs.h b/src/docs.h index f841bcd..966cddd 100644 --- a/src/docs.h +++ b/src/docs.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: docs.h,v 1.25 2001/02/25 10:52:55 kevin Exp $ +** $Id: docs.h,v 1.31 2002/05/28 18:43:16 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 @@ -84,16 +84,19 @@ public: ImageFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; class BackgroundProcessingDocument : public wxDocument { private: DECLARE_DYNAMIC_CLASS(BackgroundProcessingDocument) +#ifdef HAVE_WXTHREADS typedef BackgroundSupervisor BackgroundObject; typedef std::vector BackgroundContainer; BackgroundContainer m_vecpBackgroundSupervisors; wxCriticalSection m_criticalSection; +#endif public: BackgroundProcessingDocument() @@ -101,8 +104,10 @@ public: {} void cancelRunningTasks(); - void OnAddBackground (wxCommandEvent& event); - void OnRemoveBackground (wxCommandEvent& event); +#ifdef HAVE_WXTHREADS + void addBackgroundSupervisor (BackgroundSupervisor* pSupervisor); + void removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor); +#endif DECLARE_EVENT_TABLE() }; @@ -139,6 +144,7 @@ public: ProjectionFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -156,8 +162,7 @@ public: : m_idPhantom(Phantom::PHM_INVALID), m_bBadFileOpen(false) {} - virtual ~PhantomFileDocument () - {} + virtual ~PhantomFileDocument (); const int getPhantomID () const { return m_idPhantom; } @@ -174,6 +179,7 @@ public: PhantomFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -209,6 +215,7 @@ public: PlotFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -245,7 +252,7 @@ typedef GLfloat glTripleFloat[3]; class Graph3dFileDocument: public wxDocument { - friend Graph3dFileView; + friend class Graph3dFileView; private: DECLARE_DYNAMIC_CLASS(Graph3dFileDocument) @@ -274,6 +281,7 @@ class Graph3dFileDocument: public wxDocument int ny() const { return m_ny; } ImageFileArray getArray() { return m_array; } ImageFileArrayConst getArray() const { return m_array; } + void Activate(); }; #endif // wxUSE_GLCANVAS