*** empty log message ***

9 files changed, 80 insertions, 80 deletions

diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index bb581d9..1ac6dbb 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -349,7 +349,7 @@ static int CreateAxis(Tcl_Interp* interp, Graph* graphPtr,
 
   int isNew;
   Tcl_HashEntry* hPtr = 
-    Tcl_CreateHashEntry(&graphPtr->axes.table, string, &isNew);
+    Tcl_CreateHashEntry(&graphPtr->axes_.table, string, &isNew);
   if (!isNew) {
     Tcl_AppendResult(interp, "axis \"", string,
 		     "\" already exists in \"", Tcl_GetString(objv[0]),
@@ -407,9 +407,9 @@ static int BindOp(Tcl_Interp* interp, Graph* graphPtr, int objc,
   if (objc == 3) {
     Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
     Tcl_HashSearch cursor;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes.tagTable, &cursor); hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.tagTable, &cursor); hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
       const char *tagName = (const char*)
-	Tcl_GetHashKey(&graphPtr->axes.tagTable, hPtr);
+	Tcl_GetHashKey(&graphPtr->axes_.tagTable, hPtr);
       Tcl_Obj *objPtr = Tcl_NewStringObj(tagName, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
@@ -532,7 +532,7 @@ static int NamesOp(Tcl_Interp* interp, Graph* graphPtr,
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (objc == 3) {
     Tcl_HashSearch cursor;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor); hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor); hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
       Axis* axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
       if (axisPtr->flags & DELETE_PENDING)
 	continue;
@@ -542,7 +542,7 @@ static int NamesOp(Tcl_Interp* interp, Graph* graphPtr,
   } 
   else {
     Tcl_HashSearch cursor;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor); hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor); hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
       Axis* axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
       for (int ii=3; ii<objc; ii++) {
 	const char *pattern = (const char*)Tcl_GetString(objv[ii]);
@@ -629,18 +629,18 @@ int Blt_AxisOp(Graph* graphPtr, Tcl_Interp* interp,
 void Blt_DestroyAxes(Graph* graphPtr)
 {
   Tcl_HashSearch cursor;
-  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor); hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
+  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor); hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     axisPtr->hashPtr_ = NULL;
     delete axisPtr;
   }
-  Tcl_DeleteHashTable(&graphPtr->axes.table);
+  Tcl_DeleteHashTable(&graphPtr->axes_.table);
 
   for (int ii=0; ii<4; ii++)
     Blt_Chain_Destroy(graphPtr->axisChain[ii]);
 
-  Tcl_DeleteHashTable(&graphPtr->axes.tagTable);
-  Blt_Chain_Destroy(graphPtr->axes.displayList);
+  Tcl_DeleteHashTable(&graphPtr->axes_.tagTable);
+  Blt_Chain_Destroy(graphPtr->axes_.displayList);
 }
 
 int GetAxisFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr, 
@@ -651,7 +651,7 @@ int GetAxisFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr,
 
   *axisPtrPtr = NULL;
   name = Tcl_GetString(objPtr);
-  hPtr = Tcl_FindHashEntry(&graphPtr->axes.table, name);
+  hPtr = Tcl_FindHashEntry(&graphPtr->axes_.table, name);
   if (hPtr) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     if ((axisPtr->flags & DELETE_PENDING) == 0) {
@@ -690,7 +690,7 @@ void Blt_ResetAxes(Graph* graphPtr)
    *		impossible values.
    */
   Tcl_HashSearch cursor;
-  for (Tcl_HashEntry* hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor);
+  for (Tcl_HashEntry* hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor);
        hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     axisPtr->min_ = axisPtr->valueRange_.min = DBL_MAX;
@@ -703,7 +703,7 @@ void Blt_ResetAxes(Graph* graphPtr)
    *		will be the axis limits if the user doesn't override them 
    *		with -min and -max options.
    */
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements.displayList);
+  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Region2d exts;
 
@@ -717,7 +717,7 @@ void Blt_ResetAxes(Graph* graphPtr)
    * Step 3:  Now that we know the range of data values for each axis,
    *		set axis limits and compute a sweep to generate tick values.
    */
-  for (Tcl_HashEntry* hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor);
+  for (Tcl_HashEntry* hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor);
        hPtr; hPtr = Tcl_NextHashEntry(&cursor)) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     AxisOptions* ops = (AxisOptions*)axisPtr->ops();
@@ -842,7 +842,7 @@ void Blt_DrawAxisLimits(Graph* graphPtr, Drawable drawable)
   vMin = vMax = graphPtr->left_ + gops->xPad + 2;
   hMin = hMax = graphPtr->bottom_ - gops->yPad - 2;	/* Offsets */
 
-  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor);
+  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor);
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
     Dim2D textDim;
     const char *minFmt, *maxFmt;
@@ -929,7 +929,7 @@ void Blt_AxisLimitsToPostScript(Graph* graphPtr, Blt_Ps ps)
 #define SPACING 8
   vMin = vMax = graphPtr->left_ + gops->xPad + 2;
   hMin = hMax = graphPtr->bottom_ - gops->yPad - 2;	/* Offsets */
-  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor);
+  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor);
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
     const char *minFmt, *maxFmt;
     unsigned int textWidth, textHeight;
@@ -995,7 +995,7 @@ void Blt_AxisLimitsToPostScript(Graph* graphPtr, Blt_Ps ps)
 void Blt_ConfigureAxes(Graph* graphPtr)
 {
   Tcl_HashSearch cursor;
-  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor);
+  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor);
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     axisPtr->configure();
@@ -1094,7 +1094,7 @@ Axis *Blt_NearestAxis(Graph* graphPtr, int x, int y)
   Tcl_HashEntry *hPtr;
   Tcl_HashSearch cursor;
     
-  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes.table, &cursor); 
+  for (hPtr = Tcl_FirstHashEntry(&graphPtr->axes_.table, &cursor); 
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&cursor)) {
     Axis *axisPtr = (Axis*)Tcl_GetHashValue(hPtr);
     AxisOptions* ops = (AxisOptions*)axisPtr->ops();
@@ -1162,8 +1162,8 @@ ClientData Blt_MakeAxisTag(Graph* graphPtr, const char *tagName)
 {
   int isNew;
   Tcl_HashEntry *hPtr = 
-    Tcl_CreateHashEntry(&graphPtr->axes.tagTable, tagName, &isNew);
-  return Tcl_GetHashKey(&graphPtr->axes.tagTable, hPtr);
+    Tcl_CreateHashEntry(&graphPtr->axes_.tagTable, tagName, &isNew);
+  return Tcl_GetHashKey(&graphPtr->axes_.tagTable, hPtr);
 }
 
 /*
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index baa948b..e24191f 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -1443,7 +1443,7 @@ void Blt_InitBarSetTable(Graph* graphPtr)
    */
   Tcl_InitHashTable(&setTable, sizeof(BarSetKey) / sizeof(int));
   nSegs = nStacks = 0;
-  for (link = Blt_Chain_FirstLink(graphPtr->elements.displayList);
+  for (link = Blt_Chain_FirstLink(graphPtr->elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     double *x, *xend;
     int nPoints;
@@ -1563,7 +1563,7 @@ void Blt_ComputeBarStacks(Graph* graphPtr)
   /* Consider each bar x-y coordinate. Add the ordinates of duplicate
    * abscissas. */
 
-  for (link = Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+  for (link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     double *x, *y, *xend;
 
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index ac388a6..28c98de 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -109,7 +109,7 @@ static int CreateElement(Graph* graphPtr, Tcl_Interp* interp, int objc,
 
   int isNew;
   Tcl_HashEntry* hPtr = 
-    Tcl_CreateHashEntry(&graphPtr->elements.table, name, &isNew);
+    Tcl_CreateHashEntry(&graphPtr->elements_.table, name, &isNew);
   if (!isNew) {
     Tcl_AppendResult(interp, "element \"", name, 
 		     "\" already exists in \"", Tcl_GetString(objv[0]), 
@@ -138,7 +138,7 @@ static int CreateElement(Graph* graphPtr, Tcl_Interp* interp, int objc,
     return TCL_ERROR;
   }
 
-  elemPtr->link = Blt_Chain_Append(graphPtr->elements.displayList, elemPtr);
+  elemPtr->link = Blt_Chain_Append(graphPtr->elements_.displayList, elemPtr);
 
   return TCL_OK;
 }
@@ -151,7 +151,7 @@ static void DestroyElement(Element* elemPtr)
   graphPtr->legend_->removeElement(elemPtr);
 
   if (elemPtr->link)
-    Blt_Chain_DeleteLink(graphPtr->elements.displayList, elemPtr->link);
+    Blt_Chain_DeleteLink(graphPtr->elements_.displayList, elemPtr->link);
 
   delete elemPtr;
 }
@@ -213,7 +213,7 @@ static int ActivateOp(Graph* graphPtr, Tcl_Interp* interp,
     Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
       if (elemPtr->flags & ACTIVE)
 	Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -260,8 +260,8 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
     Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements.tagTable, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
-      char *tagName = (char*)Tcl_GetHashKey(&graphPtr->elements.tagTable, hPtr);
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
+      char *tagName = (char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
       Tcl_ListObjAppendElement(interp, listObjPtr, 
 			       Tcl_NewStringObj(tagName, -1));
     }
@@ -314,7 +314,7 @@ static int ClosestOp(Graph* graphPtr, Tcl_Interp* interp,
     // the points from two different elements overlay each other
     // exactly, the last one picked will be the topmost.  
 
-    for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr->elements.displayList); 
+    for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr->elements_.displayList); 
 	 link != NULL; link = Blt_Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (elemPtr && !elemPtr->hide() && 
@@ -397,7 +397,7 @@ static int ExistsOp(Graph* graphPtr, Tcl_Interp* interp,
 		    int objc, Tcl_Obj* const objv[])
 {
   Tcl_HashEntry *hPtr = 
-    Tcl_FindHashEntry(&graphPtr->elements.table, Tcl_GetString(objv[3]));
+    Tcl_FindHashEntry(&graphPtr->elements_.table, Tcl_GetString(objv[3]));
   Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (hPtr != NULL));
   return TCL_OK;
 }
@@ -425,7 +425,7 @@ static int LowerOp(Graph* graphPtr, Tcl_Interp* interp,
     Element* elemPtr;
     if (Blt_GetElement(interp, graphPtr, objv[ii], &elemPtr) != TCL_OK)
       return TCL_ERROR;
-    Blt_Chain_UnlinkLink(graphPtr->elements.displayList, elemPtr->link); 
+    Blt_Chain_UnlinkLink(graphPtr->elements_.displayList, elemPtr->link); 
     Blt_Chain_LinkAfter(chain, elemPtr->link, NULL); 
   }
 
@@ -434,7 +434,7 @@ static int LowerOp(Graph* graphPtr, Tcl_Interp* interp,
   for (link = Blt_Chain_FirstLink(chain); link != NULL; link = next) {
     next = Blt_Chain_NextLink(link);
     Blt_Chain_UnlinkLink(chain, link); 
-    Blt_Chain_LinkAfter(graphPtr->elements.displayList, link, NULL); 
+    Blt_Chain_LinkAfter(graphPtr->elements_.displayList, link, NULL); 
   }	
   Blt_Chain_Destroy(chain);
 
@@ -452,7 +452,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
 
   if (objc == 3) {
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name(), -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
@@ -460,7 +460,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
   }
   else {
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.table, &iter); hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
 
       for (int ii=3; ii<objc; ii++) {
@@ -487,7 +487,7 @@ static int RaiseOp(Graph* graphPtr, Tcl_Interp* interp,
     if (Blt_GetElement(interp, graphPtr, objv[ii], &elemPtr) != TCL_OK)
       return TCL_ERROR;
 
-    Blt_Chain_UnlinkLink(graphPtr->elements.displayList, elemPtr->link); 
+    Blt_Chain_UnlinkLink(graphPtr->elements_.displayList, elemPtr->link); 
     Blt_Chain_LinkAfter(chain, elemPtr->link, NULL); 
   }
 
@@ -496,7 +496,7 @@ static int RaiseOp(Graph* graphPtr, Tcl_Interp* interp,
   for (link = Blt_Chain_LastLink(chain); link != NULL; link = prev) {
     prev = Blt_Chain_PrevLink(link);
     Blt_Chain_UnlinkLink(chain, link); 
-    Blt_Chain_LinkBefore(graphPtr->elements.displayList, link, NULL); 
+    Blt_Chain_LinkBefore(graphPtr->elements_.displayList, link, NULL); 
   }	
   Blt_Chain_Destroy(chain);
 
@@ -527,12 +527,12 @@ static int ShowOp(Graph* graphPtr, Tcl_Interp* interp,
   }
 
   // Clear the links from the currently displayed elements
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
+  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->link = NULL;
   }
-  Blt_Chain_Destroy(graphPtr->elements.displayList);
-  graphPtr->elements.displayList = chain;
+  Blt_Chain_Destroy(graphPtr->elements_.displayList);
+  graphPtr->elements_.displayList = chain;
 
   // Set links on all the displayed elements
   for (Blt_ChainLink link = Blt_Chain_FirstLink(chain); link != NULL; 
@@ -603,7 +603,7 @@ static Tcl_Obj *DisplayListObj(Graph* graphPtr)
 {
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
-  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
+  for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name(), -1);
     Tcl_ListObjAppendElement(graphPtr->interp_, listObjPtr, objPtr);
@@ -641,7 +641,7 @@ int Blt_GetElement(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr,
   name = Tcl_GetString(objPtr);
   if (!name || !name[0])
     return TCL_ERROR;
-  hPtr = Tcl_FindHashEntry(&graphPtr->elements.table, name);
+  hPtr = Tcl_FindHashEntry(&graphPtr->elements_.table, name);
   if (!hPtr) {
     if (interp)
       Tcl_AppendResult(interp, "can't find element \"", name,
@@ -658,20 +658,20 @@ void Blt_DestroyElements(Graph* graphPtr)
   Tcl_HashEntry *hPtr;
   Tcl_HashSearch iter;
 
-  for (hPtr = Tcl_FirstHashEntry(&graphPtr->elements.table, &iter);
+  for (hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.table, &iter);
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
     Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
     if (elemPtr)
       DestroyElement(elemPtr);
   }
-  Tcl_DeleteHashTable(&graphPtr->elements.table);
-  Tcl_DeleteHashTable(&graphPtr->elements.tagTable);
-  Blt_Chain_Destroy(graphPtr->elements.displayList);
+  Tcl_DeleteHashTable(&graphPtr->elements_.table);
+  Tcl_DeleteHashTable(&graphPtr->elements_.tagTable);
+  Blt_Chain_Destroy(graphPtr->elements_.displayList);
 }
 
 void Blt_ConfigureElements(Graph* graphPtr)
 {
-  for (Blt_ChainLink link =Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+  for (Blt_ChainLink link =Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     elemPtr->configure();
@@ -684,7 +684,7 @@ void Blt_MapElements(Graph* graphPtr)
   if (gops->barMode != BARS_INFRONT)
     Blt_ResetBarGroups(graphPtr);
 
-  for (Blt_ChainLink link =Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+  for (Blt_ChainLink link =Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (!elemPtr->link || (elemPtr->flags & DELETE_PENDING))
@@ -702,7 +702,7 @@ void Blt_DrawElements(Graph* graphPtr, Drawable drawable)
   Blt_ChainLink link;
 
   /* Draw with respect to the stacking order. */
-  for (link = Blt_Chain_LastLink(graphPtr->elements.displayList); 
+  for (link = Blt_Chain_LastLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (!(elemPtr->flags & DELETE_PENDING) && !elemPtr->hide())
@@ -714,7 +714,7 @@ void Blt_DrawActiveElements(Graph* graphPtr, Drawable drawable)
 {
   Blt_ChainLink link;
 
-  for (link = Blt_Chain_LastLink(graphPtr->elements.displayList); 
+  for (link = Blt_Chain_LastLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (!(elemPtr->flags & DELETE_PENDING) && (elemPtr->flags & ACTIVE) && 
@@ -727,7 +727,7 @@ void Blt_ElementsToPostScript(Graph* graphPtr, Blt_Ps ps)
 {
   Blt_ChainLink link;
 
-  for (link = Blt_Chain_LastLink(graphPtr->elements.displayList); 
+  for (link = Blt_Chain_LastLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (!(elemPtr->flags & DELETE_PENDING) && !elemPtr->hide()) {
@@ -743,7 +743,7 @@ void Blt_ActiveElementsToPostScript(Graph* graphPtr, Blt_Ps ps)
 {
   Blt_ChainLink link;
 
-  for (link = Blt_Chain_LastLink(graphPtr->elements.displayList); 
+  for (link = Blt_Chain_LastLink(graphPtr->elements_.displayList); 
        link != NULL; link = Blt_Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (!(elemPtr->flags & DELETE_PENDING) && 
@@ -760,6 +760,6 @@ ClientData Blt_MakeElementTag(Graph* graphPtr, const char *tagName)
   Tcl_HashEntry *hPtr;
   int isNew;
 
-  hPtr = Tcl_CreateHashEntry(&graphPtr->elements.tagTable, tagName, &isNew);
-  return Tcl_GetHashKey(&graphPtr->elements.tagTable, hPtr);
+  hPtr = Tcl_CreateHashEntry(&graphPtr->elements_.tagTable, tagName, &isNew);
+  return Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
 }
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 2037630..9cdb855 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -254,7 +254,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int nEntries =0;
   int maxWidth =0;
   int maxHeight =0;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements.displayList); 
+  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -362,7 +362,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int row =0;
   int col =0;
   int count =0;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements.displayList); 
+  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     count++;
@@ -442,7 +442,7 @@ void Legend::draw(Drawable drawable)
 
   int count = 0;
   int yStart = y;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements.displayList);
+  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -582,7 +582,7 @@ void Legend::print(Blt_Ps ps)
 
   int count = 0;
   double yStart = y;
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements.displayList); 
+  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -959,7 +959,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 
 Element* Legend::getFirstElement()
 {
-  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements.displayList);
+  for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link=Blt_Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -971,7 +971,7 @@ Element* Legend::getFirstElement()
 
 Element* Legend::getLastElement()
 {
-  for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr_->elements.displayList); 
+  for (Blt_ChainLink link=Blt_Chain_LastLink(graphPtr_->elements_.displayList); 
        link; link=Blt_Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -1014,7 +1014,7 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
     }
   }
   else {
-    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements.displayList);
+    for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->elements_.displayList);
 	 link; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (legendPtr->entryIsSelected(elemPtr)) {
@@ -1075,7 +1075,7 @@ static ClientData PickEntryProc(ClientData clientData, int x, int y,
       // Legend entries are stored in bottom-to-top
       int count = 0;
       Blt_ChainLink link;
-      for (link=Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+      for (link=Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
 	   link; link = Blt_Chain_NextLink(link)) {
 	Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
 	ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 01aa256..a757e50 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -140,7 +140,7 @@ static int ActivateOp(Graph* graphPtr, Tcl_Interp* interp,
     const char *pattern;
 
     pattern = Tcl_GetString(objv[i]);
-    for (link = Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+    for (link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
 	 link != NULL; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (Tcl_StringMatch(elemPtr->name(), pattern)) {
@@ -182,7 +182,7 @@ static int ActivateOp(Graph* graphPtr, Tcl_Interp* interp,
 	
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
     /* List active elements in stacking order. */
-    for (link = Blt_Chain_FirstLink(graphPtr->elements.displayList); 
+    for (link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); 
 	 link != NULL; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
       if (elemPtr->flags & LABEL_ACTIVE) {
@@ -206,10 +206,10 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
     Tcl_Obj *listObjPtr;
 
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-    for (hPtr = Tcl_FirstHashEntry(&graphPtr->elements.tagTable, &iter);
+    for (hPtr = Tcl_FirstHashEntry(&graphPtr->elements_.tagTable, &iter);
 	 hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       const char *tagName = 
-	(const char*)Tcl_GetHashKey(&graphPtr->elements.tagTable, hPtr);
+	(const char*)Tcl_GetHashKey(&graphPtr->elements_.tagTable, hPtr);
       Tcl_Obj *objPtr = Tcl_NewStringObj(tagName, -1);
       Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
@@ -236,7 +236,7 @@ static int CurselectionOp(Graph* graphPtr, Tcl_Interp* interp,
   }
   else {
     // List of selected entries is in stacking order
-    for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
+    for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->elements_.displayList); link != NULL; link = Blt_Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Blt_Chain_GetValue(link);
 
       if (legendPtr->entryIsSelected(elemPtr)) {
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index d75a502..7ce5df0 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -451,7 +451,7 @@ static int IsElementHidden(Graph* graphPtr, Marker* markerPtr)
 
   if (ops->elemName) {
     Tcl_HashEntry *hPtr 
-      = Tcl_FindHashEntry(&graphPtr->elements.table, ops->elemName);
+      = Tcl_FindHashEntry(&graphPtr->elements_.table, ops->elemName);
     if (hPtr) {
       Element* elemPtr = (Element*)Tcl_GetHashValue(hPtr);
       if (!elemPtr->link || elemPtr->hide())
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 44ea6fb..1805bad 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -62,7 +62,7 @@ int Blt_CreateAxes(Graph* graphPtr)
   for (int ii=0; ii<4; ii++) {
     int isNew;
     Tcl_HashEntry* hPtr = 
-      Tcl_CreateHashEntry(&graphPtr->axes.table, axisNames[ii].name, &isNew);
+      Tcl_CreateHashEntry(&graphPtr->axes_.table, axisNames[ii].name, &isNew);
     Blt_Chain chain = Blt_Chain_Create();
 
     Axis* axisPtr = new Axis(graphPtr, axisNames[ii].name, ii, hPtr);
diff --git a/src/bltGraph.C b/src/bltGraph.C
index fcd9656..b0deea2 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -273,18 +273,18 @@ Graph::Graph(ClientData clientData, Tcl_Interp* interp,
   Blt_Ts_InitStyle(ops->titleTextStyle);
   ops->titleTextStyle.anchor = TK_ANCHOR_N;
 
-  Tcl_InitHashTable(&axes.table, TCL_STRING_KEYS);
-  Tcl_InitHashTable(&axes.tagTable, TCL_STRING_KEYS);
-  Tcl_InitHashTable(&elements.table, TCL_STRING_KEYS);
-  Tcl_InitHashTable(&elements.tagTable, TCL_STRING_KEYS);
-  Tcl_InitHashTable(&markers.table, TCL_STRING_KEYS);
-  Tcl_InitHashTable(&markers.tagTable, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&axes_.table, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&axes_.tagTable, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&elements_.table, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&elements_.tagTable, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&markers_.table, TCL_STRING_KEYS);
+  Tcl_InitHashTable(&markers_.tagTable, TCL_STRING_KEYS);
   Tcl_InitHashTable(&dataTables, TCL_STRING_KEYS);
   Tcl_InitHashTable(&penTable, TCL_STRING_KEYS);
   Tcl_InitHashTable(&setTable_, sizeof(BarSetKey) / sizeof(int));
-  elements.displayList = Blt_Chain_Create();
-  markers.displayList = Blt_Chain_Create();
-  axes.displayList = Blt_Chain_Create();
+  axes_.displayList = Blt_Chain_Create();
+  elements_.displayList = Blt_Chain_Create();
+  markers_.displayList = Blt_Chain_Create();
   bindTable = Blt_CreateBindingTable(interp_, tkwin_, this, 
 				     PickEntry, Blt_GraphTags);
 
@@ -862,7 +862,7 @@ static ClientData PickEntry(ClientData clientData, int x, int y,
 	
   Blt_ChainLink link;
   Element* elemPtr;
-  for (link = Blt_Chain_LastLink(graphPtr->elements.displayList);
+  for (link = Blt_Chain_LastLink(graphPtr->elements_.displayList);
        link != NULL; link = Blt_Chain_PrevLink(link)) {
     elemPtr = (Element*)Blt_Chain_GetValue(link);
     if (elemPtr->hide() || (elemPtr->flags & MAP_ITEM))
diff --git a/src/bltGraph.h b/src/bltGraph.h
index c943355..38c890d 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -152,9 +152,9 @@ class Graph {
   unsigned int flags;
   int nextMarkerId_;
 
-  Component axes;
-  Component elements;
-  Component markers;
+  Component axes_;
+  Component elements_;
+  Component markers_;
   Tcl_HashTable dataTables;
   Tcl_HashTable penTable;
   Blt_BindTable bindTable;