X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fdocs.h;h=a3f49cf59913ca41568c87ece177a1af36571d7f;hb=bcc0f3056ec84efcef9559f23b5513f7ed61f9c3;hp=5947b18490957931c9078f0fd22e0972034f74bc;hpb=acbdc3e0bc421e5df6fdcea262a66a189d65dad3;p=ctsim.git diff --git a/src/docs.h b/src/docs.h index 5947b18..a3f49cf 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.27 2001/03/05 15:10:58 kevin Exp $ +** $Id: docs.h,v 1.33 2002/06/06 22:50:24 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 @@ -48,6 +48,7 @@ class PlotFileView; class TextFileView; class Graph3dFileView; + class ImageFileDocument: public wxDocument { private: @@ -84,13 +85,14 @@ 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 CTSIM_THREADS +#ifdef HAVE_WXTHREADS typedef BackgroundSupervisor BackgroundObject; typedef std::vector BackgroundContainer; BackgroundContainer m_vecpBackgroundSupervisors; @@ -103,9 +105,9 @@ public: {} void cancelRunningTasks(); -#ifdef CTSIM_THREADS - void OnAddBackground (wxCommandEvent& event); - void OnRemoveBackground (wxCommandEvent& event); +#ifdef HAVE_WXTHREADS + void addBackgroundSupervisor (BackgroundSupervisor* pSupervisor); + void removeBackgroundSupervisor (BackgroundSupervisor* pSupervisor); #endif DECLARE_EVENT_TABLE() @@ -143,6 +145,7 @@ public: ProjectionFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -177,6 +180,7 @@ public: PhantomFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -212,6 +216,7 @@ public: PlotFileView* getView() const; bool getBadFileOpen() const { return m_bBadFileOpen; } void setBadFileOpen() { m_bBadFileOpen = true; } + void Activate(); }; @@ -248,7 +253,7 @@ typedef GLfloat glTripleFloat[3]; class Graph3dFileDocument: public wxDocument { - friend Graph3dFileView; + friend class Graph3dFileView; private: DECLARE_DYNAMIC_CLASS(Graph3dFileDocument) @@ -277,6 +282,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