r2103: Committing for 3.5.4

[ctsim.git] / src / graph3dview.h

diff --git a/src/graph3dview.h b/src/graph3dview.h
index bcd40ca3580a1201c32d77249a37feda130826a9..ec53d03a469e81f5f7c8d987fff736362efc15d3 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.10 2002/06/02 19:01:58 kevin Exp $
+**  $Id: graph3dview.h,v 1.11 2002/06/03 16:57:22 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
@@ -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