*** empty log message ***

1 files changed, 29 insertions, 26 deletions

diff --git a/src/bltGraphBar.h b/src/bltGraphBar.h
index a8816da..5fade66 100644
--- a/src/bltGraphBar.h
+++ b/src/bltGraphBar.h
@@ -34,30 +34,6 @@
 
 #include "bltGraph.h"
 
-class BarGroup {
- public:
-  int nSegments;
-  Axis* xAxis;
-  Axis* yAxis;
-  float sum;
-  int count;
-  float lastY;
-  size_t index;
-
- public:
-  BarGroup();
-};
-
-typedef struct {
-  float value;
-  Axis* xAxis;
-  Axis* yAxis;
-} BarSetKey;
-
-typedef enum {
-  BARS_INFRONT, BARS_STACKED, BARS_ALIGNED, BARS_OVERLAP
-} BarMode;
-
 typedef struct {
   double aspect;
   Tk_3DBorder normalBg;
@@ -87,13 +63,41 @@ typedef struct {
   int reqPlotHeight;
 
   // bar graph
-  BarMode barMode;
+  int barMode;
   double barWidth;
   double baseline;
 } BarGraphOptions;
 
+class BarGroup {
+ public:
+  int nSegments;
+  Axis* xAxis;
+  Axis* yAxis;
+  float sum;
+  int count;
+  float lastY;
+  size_t index;
+
+ public:
+  BarGroup();
+};
+
+class BarSetKey {
+ public:
+  float value;
+  Axis* xAxis;
+  Axis* yAxis;
+
+ public:
+  BarSetKey();
+  BarSetKey(float, Axis*, Axis*);
+};
+
 class BarGraph : public Graph {
  public:
+  enum BarMode {INFRONT, STACKED, ALIGNED, OVERLAP};
+
+ public:
   BarGroup* barGroups_;
   int nBarGroups_;
   Tcl_HashTable setTable_;
@@ -114,7 +118,6 @@ class BarGraph : public Graph {
   void configure();
   int createPen(const char*, int, Tcl_Obj* const []);
   int createElement(int, Tcl_Obj* const []);
-
 };
 
 #endif