X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.h;h=2ec4c878ced13250cc2cacc82f2255022f2dd7e7;hb=58319f51aa5804c90fe5edd8e5f0386b7a297827;hp=058cb8bb7fbe94e25b08d0456135d139aced41b4;hpb=2ab93c569a4aa84314115e9a5543e8c6d2b43e2a;p=ctsim.git diff --git a/src/views.h b/src/views.h index 058cb8b..2ec4c87 100644 --- a/src/views.h +++ b/src/views.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.h,v 1.54 2001/03/30 19:31:17 kevin Exp $ +** $Id: views.h,v 1.59 2003/01/23 23:35:58 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 @@ -25,10 +25,6 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -#ifdef __GNUG__ -// #pragma interface -#endif - #ifndef __VIEWSH__ #define __VIEWSH__ @@ -115,7 +111,7 @@ public: void OnInverseFourier (wxCommandEvent& event); void OnShuffleNaturalToFourierOrder (wxCommandEvent& event); void OnShuffleFourierToNaturalOrder (wxCommandEvent& event); -#ifdef wxUSE_GLCANVAS +#if wxUSE_GLCANVAS void OnConvert3d (wxCommandEvent& event); #endif @@ -151,6 +147,7 @@ public: #else wxDocChildFrame* getFrame() { return m_pFrame; } #endif + void setInitialClientSize(); wxMenu* getMenuAnalyze() { return m_pMenuAnalyze; } @@ -262,6 +259,7 @@ public: wxDocChildFrame* getFrame() { return m_pFrame; } #endif ProjectionFileCanvas* getCanvas() { return m_pCanvas; } + void setInitialClientSize(); wxMenu* getFileMenu() { return m_pFileMenu; } @@ -307,6 +305,7 @@ private: int m_iDefaultNDet; int m_iDefaultNView; + int m_iDefaultOffsetView; int m_iDefaultNSample; int m_iDefaultGeometry; int m_iDefaultTrace; @@ -422,6 +421,7 @@ public: wxDocChildFrame* getFrame() { return m_pFrame; } #endif + void setInitialClientSize(); wxMenu* getFileMenu() { return m_pFileMenu; } PlotFileDocument* GetDocument() { return dynamic_cast(wxView::GetDocument()); } @@ -439,6 +439,7 @@ public: virtual ~PlotFileCanvas(); virtual void OnDraw(wxDC& dc); + virtual wxSize GetBestSize() const; void setView (PlotFileView* pView) { m_pView = pView; } @@ -493,6 +494,7 @@ class TextFileCanvas: public wxTextCtrl public: TextFileCanvas (TextFileView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style); ~TextFileCanvas (); + virtual wxSize GetBestSize() const; };