X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fviews.h;h=eca72d488c56603fdacdc54f9037037096876972;hb=45397dc165b10a955712c851dba54da411f60dab;hp=6cab7ab8e274d4f3790e0344f8ff27f281ca1592;hpb=dfe03b8fc348b60a8f0b012f3f76c24ad29f21ce;p=ctsim.git diff --git a/src/views.h b/src/views.h index 6cab7ab..eca72d4 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.30 2001/01/26 05:37:24 kevin Exp $ +** $Id: views.h,v 1.35 2001/01/27 03:08: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 @@ -46,11 +46,16 @@ private: wxBitmap m_bitmap; ImageFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); - wxMenu* m_pFileMenu; +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - ImageFileCanvas *m_canvas; - wxFrame *m_frame; + ImageFileCanvas *m_pCanvas; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; double m_dMinPixel; @@ -63,14 +68,14 @@ private: #if CTSIM_MDI { return theApp->getMainFrame()->GetClientWindow(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: - ImageFileView(void); - virtual ~ImageFileView(void); + ImageFileView(); + virtual ~ImageFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } wxMenu* getFileMenu() { return m_pFileMenu; } @@ -125,10 +130,13 @@ public: void OnCompareRow (wxCommandEvent& event); void OnCompareCol (wxCommandEvent& event); - wxFrame* getFrame() - { return m_frame; } +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif - ImageFileDocument* GetDocument(void) + ImageFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() @@ -137,10 +145,9 @@ public: class ImageFileCanvas: public wxScrolledWindow { private: - + ImageFileView* m_pView; int m_xCursor; int m_yCursor; - ImageFileView* m_pView; public: ImageFileCanvas (ImageFileView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); @@ -170,10 +177,15 @@ class ProjectionFileView : public wxView private: ProjectionFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - ProjectionFileCanvas *m_canvas; - wxFrame *m_frame; + ProjectionFileCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNX; @@ -197,14 +209,14 @@ private: #if CTSIM_MDI { return theApp->getMainFrame()->GetClientWindow(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: - ProjectionFileView(void); - virtual ~ProjectionFileView(void); + ProjectionFileView(); + virtual ~ProjectionFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -216,11 +228,14 @@ public: void OnConvertPolar (wxCommandEvent& event); void OnConvertFFTPolar (wxCommandEvent& event); - wxFrame* getFrame () { return m_frame; } - +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif wxMenu* getFileMenu() { return m_pFileMenu; } - ProjectionFileDocument* GetDocument(void) + ProjectionFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() }; @@ -249,10 +264,15 @@ private: DECLARE_EVENT_TABLE() PhantomCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - PhantomCanvas *m_canvas; - wxFrame *m_frame; + PhantomCanvas *m_pCanvas; wxMenu* m_pFileMenu; int m_iDefaultNDet; @@ -272,14 +292,14 @@ private: #if CTSIM_MDI { return theApp->getMainFrame()->GetClientWindow(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: - PhantomFileView(void); - virtual ~PhantomFileView(void); + PhantomFileView(); + virtual ~PhantomFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnUpdate(wxView *sender, wxObject *hint = NULL); @@ -289,11 +309,15 @@ public: void OnRasterize (wxCommandEvent& event); void OnProjections (wxCommandEvent& event); - PhantomFileDocument* GetDocument(void) + PhantomFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } wxMenu* getFileMenu() { return m_pFileMenu; } - wxFrame* getFrame() { return m_frame; } +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif }; class PhantomCanvas: public wxScrolledWindow @@ -316,13 +340,17 @@ class PlotFileView : public wxView DECLARE_DYNAMIC_CLASS(PlotFileView) private: - PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif - PlotFileCanvas *m_canvas; - wxFrame *m_frame; - wxMenu* m_pFileMenu; + PlotFileCanvas *m_pCanvas; EZPlot* m_pEZPlot; + wxMenu* m_pFileMenu; bool m_bMinSpecified; bool m_bMaxSpecified; @@ -330,18 +358,19 @@ private: double m_dMaxPixel; double m_dAutoScaleFactor; + PlotFileCanvas *CreateCanvas(wxView *view, wxFrame *parent); wxWindow* getFrameForChild() #if CTSIM_MDI { return theApp->getMainFrame()->GetClientWindow(); } #else - { return m_frame; } + { return m_pFrame; } #endif public: - PlotFileView(void); - virtual ~PlotFileView(void); + PlotFileView(); + virtual ~PlotFileView(); void canvasClosed() - { m_canvas = NULL; m_frame = NULL; } + { m_pCanvas = NULL; m_pFrame = NULL; } bool OnCreate(wxDocument *doc, long flags); void OnDraw(wxDC* dc); @@ -353,11 +382,14 @@ public: void OnScaleAuto (wxCommandEvent& event); void OnScaleFull (wxCommandEvent& event); - wxFrame* getFrame () - { return m_frame; } +#if CTSIM_MDI + wxDocMDIChildFrame* getFrame() { return m_pFrame; } +#else + wxDocChildFrame* getFrame() { return m_pFrame; } +#endif wxMenu* getFileMenu() { return m_pFileMenu; } - PlotFileDocument* GetDocument(void) + PlotFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } DECLARE_EVENT_TABLE() @@ -385,7 +417,13 @@ class TextFileView: public wxView private: DECLARE_DYNAMIC_CLASS(TextFileView) - wxFrame *m_pFrame; +#if CTSIM_MDI + wxDocMDIChildFrame* m_pFrame; + wxDocMDIChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#else + wxDocChildFrame* m_pFrame; + wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view); +#endif wxMenu* m_pFileMenu; TextFileCanvas *m_pCanvas; @@ -397,16 +435,18 @@ public: void canvasClosed() { m_pFrame = NULL; } - wxFrame *CreateChildFrame(wxDocument *doc, wxView *view); - bool OnCreate (wxDocument *doc, long flags); void OnDraw (wxDC *dc); void OnUpdate (wxView *sender, wxObject *hint = (wxObject *) NULL); 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