X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.h;h=90b6d44191f1df25788af53b65c1e2f666a8997e;hb=67e0b59f7b40b2c2f1d0587b24b4ecf4881b3824;hp=702309e19edbe9c31365e1c2571800d423ee7833;hpb=1f72f3289ee6be64ec607ea93b4fcfe8b5dff3eb;p=ctsim.git

diff --git a/src/graph3dview.h b/src/graph3dview.h
index 702309e..90b6d44 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.5 2001/02/04 21:28:19 kevin Exp $
+**  $Id: graph3dview.h,v 1.9 2002/05/28 18:43: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
@@ -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
@@ -135,7 +136,7 @@ private:
 
 public:
    Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
-      const wxSize& size = wxDefaultSize, long style = 0, int* gl_attrib = NULL);
+      const wxSize& size = wxDefaultSize, long style = 0);
    virtual ~Graph3dFileCanvas();
 
    virtual void OnDraw(wxDC& dc);