X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fviews.h;h=94b41fec60547e9285c10de55d8cb476ef64c185;hb=af2b058715fb690c708734708ac178490371b3ad;hp=81cf6a7ccc1b214fa3fb3a7dfd42089107308ac4;hpb=721df43ea05aa31241a6cc2a6fa980cec78cfd76;p=ctsim.git

diff --git a/src/views.h b/src/views.h
index 81cf6a7..94b41fe 100644
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.33 2001/01/27 01:51:47 kevin Exp $
+**  $Id: views.h,v 1.34 2001/01/27 02:01:41 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
@@ -53,9 +53,9 @@ private:
   wxDocChildFrame* m_pFrame;
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
-  wxMenu* m_pFileMenu;
   
-  ImageFileCanvas *m_canvas;
+  ImageFileCanvas *m_pCanvas;
+  wxMenu* m_pFileMenu;
   bool m_bMinSpecified;
   bool m_bMaxSpecified;
   double m_dMinPixel;
@@ -75,7 +75,7 @@ public:
   ImageFileView();
   virtual ~ImageFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
 
   wxMenu* getFileMenu()
   { return m_pFileMenu; }
@@ -182,7 +182,7 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  ProjectionFileCanvas *m_canvas;
+  ProjectionFileCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
   
   int m_iDefaultNX;
@@ -213,7 +213,7 @@ public:
   ProjectionFileView();
   virtual ~ProjectionFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC* dc);
@@ -266,7 +266,7 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  PhantomCanvas *m_canvas;
+  PhantomCanvas *m_pCanvas;
   wxMenu* m_pFileMenu;
   
   int m_iDefaultNDet;
@@ -293,7 +293,7 @@ public:
   PhantomFileView();
   virtual ~PhantomFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
@@ -330,7 +330,6 @@ class PlotFileView : public wxView
   DECLARE_DYNAMIC_CLASS(PlotFileView)
     
 private:
-  PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -339,9 +338,9 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
   
-  PlotFileCanvas *m_canvas;
-  wxMenu* m_pFileMenu;
+  PlotFileCanvas *m_pCanvas;
   EZPlot* m_pEZPlot;
+  wxMenu* m_pFileMenu;
   
   bool m_bMinSpecified;
   bool m_bMaxSpecified;
@@ -349,6 +348,7 @@ private:
   double m_dMaxPixel;
   double m_dAutoScaleFactor;
   
+  PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
   { return theApp->getMainFrame()->GetClientWindow(); }
@@ -360,7 +360,7 @@ public:
   PlotFileView();
   virtual ~PlotFileView();
   void canvasClosed()
-  { m_canvas = NULL; m_pFrame = NULL; }
+  { m_pCanvas = NULL; m_pFrame = NULL; }
   
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC* dc);