r465: no message

[ctsim.git] / src / views.h

diff --git a/src/views.h b/src/views.h
index eca72d488c56603fdacdc54f9037037096876972..c36ad23f3eb58d71a90d762fef2a7d178a66f258 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -7,9 +7,9 @@
 **   Date Started:  July 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.35 2001/01/27 03:08:16 kevin Exp $
+**  $Id: views.h,v 1.38 2001/01/28 22:45:54 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
@@ -44,8 +44,9 @@ private:
     
   wxMemoryDC m_memoryDC;
   wxBitmap m_bitmap;
+  wxMenu* m_pMenuAnalyze;
   
-  ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  ImageFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -66,7 +67,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -135,7 +136,9 @@ public:
 #else
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
-  
+
+  wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; }
+
   ImageFileDocument* GetDocument() 
   { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
   
@@ -146,6 +149,7 @@ class ImageFileCanvas: public wxScrolledWindow
 {
 private:
   ImageFileView* m_pView;
+
   int m_xCursor;
   int m_yCursor;
   
@@ -176,7 +180,7 @@ class ProjectionFileView : public wxView
   wxBitmap m_bitmap;
   
 private:
-  ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  ProjectionFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -207,7 +211,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -233,6 +237,8 @@ public:
 #else
   wxDocChildFrame* getFrame() { return m_pFrame; }
 #endif
+  ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+
   wxMenu* getFileMenu()  { return m_pFileMenu; }
 
   ProjectionFileDocument* GetDocument() 
@@ -263,7 +269,7 @@ private:
   DECLARE_DYNAMIC_CLASS(PhantomFileView)
   DECLARE_EVENT_TABLE()
     
-  PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  PhantomCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -290,7 +296,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -358,10 +364,10 @@ private:
   double m_dMaxPixel;
   double m_dAutoScaleFactor;
   
-  PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  PlotFileCanvas *CreateCanvas (wxFrame* parent);
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif