wx2.8 compatibility changes

[ctsim.git] / src / graph3dview.h

diff --git a/src/graph3dview.h b/src/graph3dview.h
index eeade71763c32e72796c12f12ece2ac9ef958745..b21072fe45f9a65ae7c28037c5ebedc4bedf4326 100644 (file)
--- a/src/graph3dview.h
+++ b/src/graph3dview.h
@@ -56,7 +56,6 @@ private:
   bool m_bWireframe;
   bool m_bLighting;
   bool m_bColor;
-  bool m_bUseVertexArrays;
   bool m_bColorScaleMinSet;
   bool m_bColorScaleMaxSet;
   enum {
@@ -68,14 +67,7 @@ private:
   double m_dGraphMax;
   double m_dColorScaleMin;
   double m_dColorScaleMax;
-
-  void Draw();
-  void DrawSurface();
-  void CreateDisplayList();
-  void InitMaterials();
-  void InitGL();
-
-  Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
+  wxGLContext *m_pGLContext;
 
 #if CTSIM_MDI
   wxDocMDIChildFrame* m_pFrame;
@@ -85,6 +77,14 @@ private:
   wxDocChildFrame* CreateChildFrame(wxDocument *doc, wxView *view);
 #endif
 
+  void Draw();
+  void DrawSurface();
+  void CreateDisplayList();
+  void InitMaterials();
+  void InitGL();
+
+  Graph3dFileCanvas *CreateCanvas (wxFrame* parent);
+
   wxWindow* getFrameForChild()
 #if CTSIM_MDI
   { return theApp->getMainFrame(); }
@@ -135,8 +135,10 @@ private:
   Graph3dFileView* m_pView;
 
 public:
-   Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos = wxDefaultPosition,
-      const wxSize& size = wxDefaultSize, long style = 0);
+   Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent,
+                      int* attribList,
+                      const wxPoint& pos = wxDefaultPosition,
+                      const wxSize& size = wxDefaultSize, long style = 0);
    virtual ~Graph3dFileCanvas();
 
    void OnPaint(wxPaintEvent& event);