*** empty log message ***

10 files changed, 30 insertions, 30 deletions

diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 105f243..152e58f 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -266,8 +266,8 @@ Axis::~Axis()
 {
   AxisOptions* ops = (AxisOptions*)ops_;
 
-  if (graphPtr_->bindTable)
-    Blt_DeleteBindings(graphPtr_->bindTable, this);
+  if (graphPtr_->bindTable_)
+    Blt_DeleteBindings(graphPtr_->bindTable_, this);
 
   if (link)
     Blt_Chain_DeleteLink(chain, link);
diff --git a/src/bltGrAxisOp.C b/src/bltGrAxisOp.C
index 4d6845c..bff30ce 100644
--- a/src/bltGrAxisOp.C
+++ b/src/bltGrAxisOp.C
@@ -637,7 +637,7 @@ void Blt_DestroyAxes(Graph* graphPtr)
   Tcl_DeleteHashTable(&graphPtr->axes_.table);
 
   for (int ii=0; ii<4; ii++)
-    Blt_Chain_Destroy(graphPtr->axisChain[ii]);
+    Blt_Chain_Destroy(graphPtr->axisChain_[ii]);
 
   Tcl_DeleteHashTable(&graphPtr->axes_.tagTable);
   Blt_Chain_Destroy(graphPtr->axes_.displayList);
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 28c98de..1a294a8 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -147,7 +147,7 @@ static void DestroyElement(Element* elemPtr)
 {
   Graph* graphPtr = elemPtr->graphPtr();
 
-  Blt_DeleteBindings(graphPtr->bindTable, elemPtr);
+  Blt_DeleteBindings(graphPtr->bindTable_, elemPtr);
   graphPtr->legend_->removeElement(elemPtr);
 
   if (elemPtr->link)
@@ -269,7 +269,7 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
     return TCL_OK;
   }
 
-  return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable, Blt_MakeElementTag(graphPtr, Tcl_GetString(objv[3])), objc - 4, objv + 4);
+  return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable_, Blt_MakeElementTag(graphPtr, Tcl_GetString(objv[3])), objc - 4, objv + 4);
 }
 
 static int ClosestOp(Graph* graphPtr, Tcl_Interp* interp,
@@ -407,7 +407,7 @@ static int GetOp(Graph* graphPtr, Tcl_Interp* interp,
 {
   char *string = Tcl_GetString(objv[3]);
   if ((string[0] == 'c') && (strcmp(string, "current") == 0)) {
-    Element* elemPtr = (Element*)Blt_GetCurrentItem(graphPtr->bindTable);
+    Element* elemPtr = (Element*)Blt_GetCurrentItem(graphPtr->bindTable_);
     if ((elemPtr) && ((elemPtr->flags & DELETE_PENDING) == 0))
 	Tcl_SetStringObj(Tcl_GetObjResult(interp), elemPtr->name(),-1);
   }
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 599aed4..523a6dd 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -48,7 +48,7 @@ Marker::Marker(Graph* gPtr, const char* nPtr, Tcl_HashEntry* hPtr)
 
 Marker::~Marker()
 {
-  Blt_DeleteBindings(graphPtr_->bindTable, this);
+  Blt_DeleteBindings(graphPtr_->bindTable_, this);
 
   if (name_)
     delete [] name_;
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index e80a788..7db4a7c 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -215,7 +215,7 @@ static int BindOp(Graph* graphPtr, Tcl_Interp* interp,
   }
 
   ClientData rr = Blt::MakeMarkerTag(graphPtr, Tcl_GetString(objv[3]));
-  return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable, rr, 
+  return Blt_ConfigureBindingsFromObj(interp, graphPtr->bindTable_, rr, 
 				      objc - 4, objv + 4);
 }
 
@@ -330,7 +330,7 @@ static int GetOp(Graph* graphPtr, Tcl_Interp* interp,
 {
   const char* string = Tcl_GetString(objv[3]);
   if (!strcmp(string, "current")) {
-    Marker* markerPtr = (Marker*)Blt_GetCurrentItem(graphPtr->bindTable);
+    Marker* markerPtr = (Marker*)Blt_GetCurrentItem(graphPtr->bindTable_);
 
     if (markerPtr == NULL)
       return TCL_OK;
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index 6fc0b3e..630f529 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -87,7 +87,7 @@ int Blt_CreatePen(Graph* graphPtr, Tcl_Interp* interp,
 {
   int isNew;
   Tcl_HashEntry *hPtr = 
-    Tcl_CreateHashEntry(&graphPtr->penTable, penName, &isNew);
+    Tcl_CreateHashEntry(&graphPtr->penTable_, penName, &isNew);
   if (!isNew) {
     Tcl_AppendResult(interp, "pen \"", penName, 
 		     "\" already exists in \"", Tk_PathName(graphPtr->tkwin_),
@@ -208,7 +208,7 @@ static int NamesOp(Tcl_Interp* interp, Graph* graphPtr,
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (objc == 3) {
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable, &iter);
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable_, &iter);
 	 hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       Pen* penPtr = (Pen*)Tcl_GetHashValue(hPtr);
       if ((penPtr->flags & DELETE_PENDING) == 0)
@@ -218,7 +218,7 @@ static int NamesOp(Tcl_Interp* interp, Graph* graphPtr,
   } 
   else {
     Tcl_HashSearch iter;
-    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable, &iter);
+    for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable_, &iter);
 	 hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
       Pen* penPtr = (Pen*)Tcl_GetHashValue(hPtr);
       if ((penPtr->flags & DELETE_PENDING) == 0) {
@@ -277,12 +277,12 @@ int Blt_PenOp(Graph* graphPtr, Tcl_Interp* interp,
 void Blt_DestroyPens(Graph* graphPtr)
 {
   Tcl_HashSearch iter;
-  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable, &iter);
+  for (Tcl_HashEntry *hPtr = Tcl_FirstHashEntry(&graphPtr->penTable_, &iter);
        hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
     Pen* penPtr = (Pen*)Tcl_GetHashValue(hPtr);
     delete penPtr;
   }
-  Tcl_DeleteHashTable(&graphPtr->penTable);
+  Tcl_DeleteHashTable(&graphPtr->penTable_);
 }
 
 void Blt_FreePen(Pen* penPtr)
@@ -299,7 +299,7 @@ int Blt_GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr,
 {
   Pen* penPtr = NULL;
   const char *name = Tcl_GetString(objPtr);
-  Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&graphPtr->penTable, name);
+  Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&graphPtr->penTable_, name);
   if (hPtr != NULL) {
     penPtr = (Pen*)Tcl_GetHashValue(hPtr);
     if (penPtr->flags & DELETE_PENDING)
@@ -332,7 +332,7 @@ static int GetPenFromObj(Tcl_Interp* interp, Graph* graphPtr, Tcl_Obj *objPtr,
 {
   Pen* penPtr = NULL;
   const char *name = Tcl_GetString(objPtr);
-  Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&graphPtr->penTable, name);
+  Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&graphPtr->penTable_, name);
   if (hPtr != NULL) {
     penPtr = (Pen*)Tcl_GetHashValue(hPtr);
     if (penPtr->flags & DELETE_PENDING)
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index 0ef8d84..e3f2c24 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -87,7 +87,7 @@ int Blt_CreateAxes(Graph* graphPtr)
     if ((axisPtr->margin_ == MARGIN_RIGHT) || (axisPtr->margin_ == MARGIN_TOP))
       ops->hide = 1;
 
-    graphPtr->axisChain[ii] = chain;
+    graphPtr->axisChain_[ii] = chain;
     axisPtr->link = Blt_Chain_Append(chain, axisPtr);
     axisPtr->chain = chain;
   }
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 5cb48f8..da8bf30 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -529,16 +529,16 @@ static void AdjustAxisPointers(Graph* graphPtr)
 {
   GraphOptions* ops = (GraphOptions*)graphPtr->ops_;
   if (ops->inverted) {
-    ops->leftMargin.axes   = graphPtr->axisChain[0];
-    ops->bottomMargin.axes = graphPtr->axisChain[1];
-    ops->rightMargin.axes  = graphPtr->axisChain[2];
-    ops->topMargin.axes    = graphPtr->axisChain[3];
+    ops->leftMargin.axes   = graphPtr->axisChain_[0];
+    ops->bottomMargin.axes = graphPtr->axisChain_[1];
+    ops->rightMargin.axes  = graphPtr->axisChain_[2];
+    ops->topMargin.axes    = graphPtr->axisChain_[3];
   }
   else {
-    ops->leftMargin.axes   = graphPtr->axisChain[1];
-    ops->bottomMargin.axes = graphPtr->axisChain[0];
-    ops->rightMargin.axes  = graphPtr->axisChain[3];
-    ops->topMargin.axes    = graphPtr->axisChain[2];
+    ops->leftMargin.axes   = graphPtr->axisChain_[1];
+    ops->bottomMargin.axes = graphPtr->axisChain_[0];
+    ops->rightMargin.axes  = graphPtr->axisChain_[3];
+    ops->topMargin.axes    = graphPtr->axisChain_[2];
   }
 }
 
diff --git a/src/bltGraph.h b/src/bltGraph.h
index 0acf384..fcfd6f4 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -157,7 +157,7 @@ class Graph {
   Component markers_;
   Tcl_HashTable penTable_;
   Blt_BindTable bindTable_;
-  Blt_Chain axisChain[4];
+  Blt_Chain axisChain_[4];
 
   Legend* legend_;
   Crosshairs* crosshairs_;
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 8242c6d..3b43db6 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -355,8 +355,8 @@ static int InvtransformOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
 
   /*  Pick the first pair of axes */
   Axis2d axes;
-  axes.x = Blt_GetFirstAxis(graphPtr->axisChain[0]);
-  axes.y = Blt_GetFirstAxis(graphPtr->axisChain[1]);
+  axes.x = Blt_GetFirstAxis(graphPtr->axisChain_[0]);
+  axes.y = Blt_GetFirstAxis(graphPtr->axisChain_[1]);
   Point2d point = Blt_InvMap2D(graphPtr, x, y, &axes);
 
   Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
@@ -384,8 +384,8 @@ static int TransformOp(Graph* graphPtr, Tcl_Interp* interp, int objc,
    * not be the what the user wants).
    */
   Axis2d axes;
-  axes.x = Blt_GetFirstAxis(graphPtr->axisChain[0]);
-  axes.y = Blt_GetFirstAxis(graphPtr->axisChain[1]);
+  axes.x = Blt_GetFirstAxis(graphPtr->axisChain_[0]);
+  axes.y = Blt_GetFirstAxis(graphPtr->axisChain_[1]);
 
   Point2d point = Blt_Map2D(graphPtr, x, y, &axes);