From 728d5bf2094ca2919b3ee586912558cd78267298 Mon Sep 17 00:00:00 2001
From: joye <joye>
Date: Thu, 20 Mar 2014 17:07:21 +0000
Subject: *** empty log message ***

---
 bltGrMarkerBitmap.h      | 26 ++++++++++++++------------
 src/bltGrMarker.C        |  2 +-
 src/bltGrMarker.h        | 10 ++++++----
 src/bltGrMarkerLine.h    | 26 ++++++++++++++------------
 src/bltGrMarkerPolygon.h | 32 +++++++++++++++++---------------
 src/bltGrMarkerText.h    | 20 +++++++++++---------
 src/bltGraph.h           |  1 -
 7 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/bltGrMarkerBitmap.h b/bltGrMarkerBitmap.h
index 14ff730..01e005b 100644
--- a/bltGrMarkerBitmap.h
+++ b/bltGrMarkerBitmap.h
@@ -39,30 +39,32 @@ class BitmapMarker {
   Tk_OptionTable optionTable;
   Tcl_HashEntry *hashPtr;
   Blt_ChainLink link;
+  int clipped;
+  unsigned int flags;		
+
+  Coords* worldPts;
   const char* elemName;
   Axis2d axes;
-  int drawUnder;
-  int clipped;
   int hide;
-  unsigned int flags;		
+  int state;
+  int drawUnder;
   int xOffset;
   int yOffset;
-  int state;
-  Coords* worldPts;
 
   // Fields specific to bitmap
 
-  Pixmap bitmap;
-  Tk_Anchor anchor;
-  Point2d anchorPt;
-  XColor* outlineColor;
-  XColor* fillColor;
   GC gc;
   GC fillGC;
-  int width;
-  int height;
   Point2d outline[MAX_OUTLINE_POINTS];
   int nOutlinePts;
+  int width;
+  int height;
+
+  Tk_Anchor anchor;
+  Pixmap bitmap;
+  Point2d anchorPt;
+  XColor* fillColor;
+  XColor* outlineColor;
 };
 
 #endif
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index ef8e676..626766b 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -676,7 +676,7 @@ static int IsElementHidden(Marker *markerPtr)
     hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, markerPtr->elemName);
     if (hPtr) {
       Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
-      if ((elemPtr->link == NULL) || (elemPtr->flags & HIDE))
+      if (!elemPtr->link || elemPtr->hide)
 	return TRUE;
     }
   }
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index 63fe568..8fc2f02 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -63,15 +63,17 @@ struct _Marker {
   Tk_OptionTable optionTable;
   Tcl_HashEntry *hashPtr;
   Blt_ChainLink link;
+  int clipped;
+  unsigned int flags;		
+
+  Coords* worldPts;
   const char* elemName;
   Axis2d axes;
-  int drawUnder;
-  int clipped;
   int hide;
-  unsigned int flags;		
+  int state;
+  int drawUnder;
   int xOffset;
   int yOffset;
-  int state;
 };
 
 Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr);
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index 36a1837..94c1303 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -39,30 +39,32 @@ class LineMarker {
   Tk_OptionTable optionTable;
   Tcl_HashEntry *hashPtr;
   Blt_ChainLink link;
+  int clipped;
+  unsigned int flags;		
+
+  Coords* worldPts;
   const char* elemName;
   Axis2d axes;
-  int drawUnder;
-  int clipped;
   int hide;
-  unsigned int flags;		
+  int state;
+  int drawUnder;
   int xOffset;
   int yOffset;
-  int state;
-  Coords* worldPts;
 
   // Fields specific to line
 
-  XColor* fillColor;
-  XColor* outlineColor;
-  int lineWidth;
-  int capStyle;
-  int joinStyle;
-  Blt_Dashes dashes;
   GC gc;
   Segment2d *segments;
   int nSegments;
-  int xorr;
   int xorState;
+
+  int capStyle;
+  Blt_Dashes dashes;
+  XColor* fillColor;
+  int joinStyle;
+  int lineWidth;
+  XColor* outlineColor;
+  int xorr;
 };
 
 #endif
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 559c5a9..0838604 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -39,37 +39,39 @@ class PolygonMarker {
   Tk_OptionTable optionTable;
   Tcl_HashEntry *hashPtr;
   Blt_ChainLink link;
+  int clipped;
+  unsigned int flags;		
+
+  Coords* worldPts;
   const char* elemName;
   Axis2d axes;
-  int drawUnder;
-  int clipped;
   int hide;
-  unsigned int flags;		
+  int state;
+  int drawUnder;
   int xOffset;
   int yOffset;
-  int state;
-  Coords* worldPts;
 
   // Fields specific to polygon
 
   Point2d *screenPts;
-  XColor* outline;
-  XColor* outlineBg;
-  XColor* fill;
-  XColor* fillBg;
-  Pixmap stipple;
-  int lineWidth;
-  int capStyle;
-  int joinStyle;
-  Blt_Dashes dashes;
   GC outlineGC;
   GC fillGC;
   Point2d *fillPts;
   int nFillPts;
   Segment2d *outlinePts;
   int nOutlinePts;
-  int xorr;
   int xorState;
+
+  int capStyle;
+  Blt_Dashes dashes;
+  XColor* fill;
+  XColor* fillBg;
+  int joinStyle;
+  int lineWidth;
+  XColor* outline;
+  XColor* outlineBg;
+  Pixmap stipple;
+  int xorr;
 };
 
 #endif
diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h
index 1a33519..c5db678 100644
--- a/src/bltGrMarkerText.h
+++ b/src/bltGrMarkerText.h
@@ -39,28 +39,30 @@ class TextMarker {
   Tk_OptionTable optionTable;
   Tcl_HashEntry *hashPtr;
   Blt_ChainLink link;
+  int clipped;
+  unsigned int flags;		
+
+  Coords* worldPts;
   const char* elemName;
   Axis2d axes;
-  int drawUnder;
-  int clipped;
   int hide;
-  unsigned int flags;		
+  int state;
+  int drawUnder;
   int xOffset;
   int yOffset;
-  int state;
-  Coords* worldPts;
 
   // Fields specific to text
 
-  const char* string;
-  Tk_Anchor anchor;
   Point2d anchorPt;
   int width;
   int height;
-  TextStyle style;
+  GC fillGC;
   Point2d outline[5];
+
+  Tk_Anchor anchor;
   XColor* fillColor;
-  GC fillGC;
+  TextStyle style;
+  const char* string;
 };
 
 #endif
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 558e810..389910a 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -367,7 +367,6 @@ struct _Graph {
  *	GRAPH_FOCUS	
  */
 
-#define HIDE			(1<<0) /* 0x0001 */
 #define DELETE_PENDING		(1<<1) /* 0x0002 */
 #define REDRAW_PENDING		(1<<2) /* 0x0004 */
 #define	ACTIVE_PENDING		(1<<3) /* 0x0008 */
-- 
cgit v0.12