X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.h;h=bcd40ca3580a1201c32d77249a37feda130826a9;hb=fa1246da51720a6cd7fe4879a0a25795b13b2455;hp=f5ae3e4afc19f78ecb175cb2ef0b384c2897269b;hpb=0cc4ade2e5b8981c7923a1b37acfdc5efe2d03f6;p=ctsim.git

diff --git a/src/graph3dview.h b/src/graph3dview.h
index f5ae3e4..bcd40ca 100644
--- 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.6 2001/02/04 22:58:41 kevin Exp $
+**  $Id: graph3dview.h,v 1.10 2002/06/02 19:01: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
@@ -39,7 +39,7 @@
 class Graph3dFileCanvas;
 class Graph3dFileView : public wxView 
 {
-  friend Graph3dFileCanvas;
+  friend class Graph3dFileCanvas;
 
 private:
   DECLARE_DYNAMIC_CLASS(Graph3dFileView)   
@@ -56,10 +56,11 @@ private:
   bool m_bDoubleBuffer;
   bool m_bSmooth;
   bool m_bLighting;
-  bool m_bSurface;
+  bool m_bWireframe;
   bool m_bColor;
   enum {
-    DISPLAYLIST_SURFACE = 1,
+    DISPLAYLIST_COLOR = 1,
+    DISPLAYLIST_NO_COLOR = 2,
   };
 
   double m_dGraphMin;
@@ -107,13 +108,13 @@ public:
   bool OnClose (bool deleteWindow = true);
   void OnProperties (wxCommandEvent& event);
   void OnLighting (wxCommandEvent& event);
-  void OnSurface (wxCommandEvent& event);
+  void OnWireframe (wxCommandEvent& event);
   void OnColor (wxCommandEvent& event);
   void OnSmooth (wxCommandEvent& event);
   void OnScaleSet (wxCommandEvent& event);
   void OnScaleAuto (wxCommandEvent& event);
   void OnScaleFull (wxCommandEvent& event);
-
+  
 #if CTSIM_MDI
   wxDocMDIChildFrame* getFrame() { return m_pFrame; }
 #else
@@ -139,6 +140,7 @@ public:
    virtual ~Graph3dFileCanvas();
 
    virtual void OnDraw(wxDC& dc);
+   virtual wxSize GetBestSize() const;
    void OnSize(wxSizeEvent& event);
    void OnEraseBackground(wxEraseEvent& event);
    void OnChar(wxKeyEvent& event);