r7061: initial property settings

[ctsim.git] / src / graph3dview.h

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 7933f17b5853eae97a10b334092de0eceffcc012..2d2da5e2b2443a881a76c324af9500eaf8b28c15 100644 (file)
--- a/src/graph3dview.h
+++ b/src/graph3dview.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: graph3dview.h,v 1.8 2001/03/21 21:45:31 kevin Exp $
+**  $Id$
 **
 **  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
@@ -39,7 +39,7 @@
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {
-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;
 
 private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileView)   
@@ -49,15 +49,18 @@ private:
   wxMenu *m_pViewMenu;
   wxStatusBar* m_pStatusBar;
 
+  Graph3dFileCanvas* m_pCanvas;
   GLfloat m_dXRotate;
   GLfloat m_dYRotate;
   GLfloat m_dZRotate;
-  bool m_bUseVertexArrays;
   bool m_bDoubleBuffer;
   bool m_bSmooth;
-  bool m_bLighting;
   bool m_bWireframe;
+  bool m_bLighting;
   bool m_bColor;
+  bool m_bUseVertexArrays;
+  bool m_bColorScaleMinSet;
+  bool m_bColorScaleMaxSet;
   enum {
     DISPLAYLIST_COLOR = 1,
     DISPLAYLIST_NO_COLOR = 2,
@@ -67,8 +70,6 @@ private:
   double m_dGraphMax;
   double m_dColorScaleMin;
   double m_dColorScaleMax;
-  bool m_bColorScaleMinSet;
-  bool m_bColorScaleMaxSet;
 
   void Draw();
   void DrawSurface();
@@ -76,7 +77,6 @@ private:
   void InitMaterials();
   void InitGL();
 
-  Graph3dFileCanvas* m_pCanvas;
   Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
 
 #if CTSIM_MDI
@@ -115,6 +115,8 @@ public:
   void OnScaleAuto (wxCommandEvent& event);
   void OnScaleFull (wxCommandEvent& event);
   
+  void setInitialClientSize();
+
 #if CTSIM_MDI
   wxDocMDIChildFrame* getFrame() { return m_pFrame; }
 #else
@@ -139,7 +141,8 @@ public:
       const wxSize& size = wxDefaultSize, long style = 0);
    virtual ~Graph3dFileCanvas();
 
-   virtual void OnDraw(wxDC& dc);
+   void OnPaint(wxPaintEvent& event);
+   virtual wxSize GetBestSize() const;
    void OnSize(wxSizeEvent& event);
    void OnEraseBackground(wxEraseEvent& event);
    void OnChar(wxKeyEvent& event);