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

diff --git a/src/views.h b/src/views.h
index 94b41fe..5f82149 100644
--- 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.34 2001/01/27 02:01:41 kevin Exp $
+**  $Id: views.h,v 1.37 2001/01/28 19:10:18 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
@@ -45,7 +45,7 @@ private:
   wxMemoryDC m_memoryDC;
   wxBitmap m_bitmap;
   
-  ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  ImageFileCanvas *CreateCanvas (wxFrame* parent);
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
   wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
@@ -66,7 +66,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -130,8 +130,11 @@ public:
   void OnCompareRow (wxCommandEvent& event);
   void OnCompareCol (wxCommandEvent& event);
   
-  wxFrame* getFrame()
-  { return m_pFrame; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
   
   ImageFileDocument* GetDocument() 
   { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
@@ -173,7 +176,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);
@@ -204,7 +207,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -225,8 +228,13 @@ public:
   void OnConvertPolar (wxCommandEvent& event);
   void OnConvertFFTPolar (wxCommandEvent& event);
   
-  wxFrame* getFrame ()   { return m_pFrame; }
-  
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
+  ProjectionFileCanvas* getCanvas() { return m_pCanvas; }
+
   wxMenu* getFileMenu()  { return m_pFileMenu; }
 
   ProjectionFileDocument* GetDocument() 
@@ -257,7 +265,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);
@@ -284,7 +292,7 @@ private:
 
   wxWindow* getFrameForChild() 
 #if CTSIM_MDI
-  { return theApp->getMainFrame()->GetClientWindow(); }
+  { return theApp->getMainFrame(); }
 #else
   { return m_pFrame; }
 #endif
@@ -307,7 +315,11 @@ public:
   { return dynamic_cast<PhantomFileDocument*>(wxView::GetDocument()); }
   
   wxMenu* getFileMenu() { return m_pFileMenu; }
-  wxFrame* getFrame() { return m_pFrame; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
 };
 
 class PhantomCanvas: public wxScrolledWindow
@@ -348,10 +360,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
@@ -372,8 +384,11 @@ public:
   void OnScaleAuto (wxCommandEvent& event);
   void OnScaleFull (wxCommandEvent& event);
   
-  wxFrame* getFrame ()
-  { return m_pFrame; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
   
   wxMenu* getFileMenu() { return m_pFileMenu; }
   PlotFileDocument* GetDocument() 
@@ -428,8 +443,12 @@ public:
     bool OnClose (bool deleteWindow = TRUE);
 
     TextFileCanvas* getTextCtrl() { return m_pCanvas; }
-    wxFrame* getFrame() { return m_pFrame; }
     wxMenu* getFileMenu() { return m_pFileMenu; }
+#if CTSIM_MDI
+  wxDocMDIChildFrame* getFrame() { return m_pFrame; }
+#else
+  wxDocChildFrame* getFrame() { return m_pFrame; }
+#endif
 };
 
 class TextFileCanvas: public wxTextCtrl