*** empty log message ***

20 files changed, 143 insertions, 152 deletions

diff --git a/src/bltChain.C b/src/bltChain.C
index df686e8..d629d57 100644
--- a/src/bltChain.C
+++ b/src/bltChain.C
@@ -38,9 +38,7 @@ using namespace Blt;
   (((size_t)a + (sizeof(double) - 1)) & (~(sizeof(double) - 1)))
 #endif
 
-typedef int (QSortCompareProc) (const void *, const void *);
-
-typedef struct _Blt_ChainLink ChainLink;
+//typedef struct _Blt_ChainLink ChainLink;
 typedef struct _Blt_Chain Chain;
 
 Blt_Chain Blt::Chain_Create(void)
@@ -52,10 +50,10 @@ Blt_Chain Blt::Chain_Create(void)
   return chainPtr;
 }
 
-Blt_ChainLink Blt::Chain_AllocLink(size_t extraSize)
+ChainLink Blt::Chain_AllocLink(size_t extraSize)
 {
-  size_t linkSize = ALIGN(sizeof(ChainLink));
-  ChainLink* linkPtr = (ChainLink*)calloc(1, linkSize + extraSize);
+  size_t linkSize = ALIGN(sizeof(_ChainLink));
+  ChainLink linkPtr = (ChainLink)calloc(1, linkSize + extraSize);
   if (extraSize > 0) {
     // Point clientData at the memory beyond the normal structure
     linkPtr->clientData = (ClientData)((char *)linkPtr + linkSize);
@@ -63,15 +61,15 @@ Blt_ChainLink Blt::Chain_AllocLink(size_t extraSize)
   return linkPtr;
 }
 
-void Blt::Chain_InitLink(ChainLink* linkPtr)
+void Blt::Chain_InitLink(ChainLink linkPtr)
 {
   linkPtr->clientData = NULL;
   linkPtr->next = linkPtr->prev = NULL;
 }
 
-Blt_ChainLink Blt::Chain_NewLink(void)
+ChainLink Blt::Chain_NewLink(void)
 {
-  ChainLink* linkPtr = (ChainLink*)malloc(sizeof(ChainLink));
+  ChainLink linkPtr = (ChainLink)malloc(sizeof(_ChainLink));
   linkPtr->clientData = NULL;
   linkPtr->next = linkPtr->prev = NULL;
   return linkPtr;
@@ -80,8 +78,8 @@ Blt_ChainLink Blt::Chain_NewLink(void)
 void Blt::Chain_Reset(Chain* chainPtr)
 {
   if (chainPtr) {
-    ChainLink* oldPtr;
-    ChainLink* linkPtr = chainPtr->head;
+    ChainLink oldPtr;
+    ChainLink linkPtr = chainPtr->head;
 
     while (linkPtr) {
       oldPtr = linkPtr;
@@ -107,8 +105,8 @@ void Blt::Chain_Init(Chain* chainPtr)
   chainPtr->head = chainPtr->tail = NULL;
 }
 
-void Blt::Chain_LinkAfter(Chain* chainPtr, ChainLink* linkPtr, 
-			 ChainLink* afterPtr)
+void Blt::Chain_LinkAfter(Chain* chainPtr, ChainLink linkPtr, 
+			 ChainLink afterPtr)
 {
   if (chainPtr->head == NULL)
     chainPtr->tail = chainPtr->head = linkPtr;
@@ -133,8 +131,8 @@ void Blt::Chain_LinkAfter(Chain* chainPtr, ChainLink* linkPtr,
   chainPtr->nLinks++;
 }
 
-void Blt::Chain_LinkBefore(Chain* chainPtr, ChainLink* linkPtr, 
-			  ChainLink* beforePtr)
+void Blt::Chain_LinkBefore(Chain* chainPtr, ChainLink linkPtr, 
+			  ChainLink beforePtr)
 {
   if (chainPtr->head == NULL)
     chainPtr->tail = chainPtr->head = linkPtr;
@@ -159,7 +157,7 @@ void Blt::Chain_LinkBefore(Chain* chainPtr, ChainLink* linkPtr,
   chainPtr->nLinks++;
 }
 
-void Blt::Chain_UnlinkLink(Chain* chainPtr, ChainLink* linkPtr)
+void Blt::Chain_UnlinkLink(Chain* chainPtr, ChainLink linkPtr)
 {
   // Indicates if the link is actually remove from the chain
   int unlinked;
@@ -187,36 +185,32 @@ void Blt::Chain_UnlinkLink(Chain* chainPtr, ChainLink* linkPtr)
   linkPtr->prev = linkPtr->next = NULL;
 }
 
-void Blt::Chain_DeleteLink(Blt_Chain chain, Blt_ChainLink link)
+void Blt::Chain_DeleteLink(Blt_Chain chain, ChainLink link)
 {
   Chain_UnlinkLink(chain, link);
   free(link);
   link = NULL;
 }
 
-Blt_ChainLink Blt::Chain_Append(Blt_Chain chain, ClientData clientData)
+ChainLink Blt::Chain_Append(Blt_Chain chain, ClientData clientData)
 {
-  Blt_ChainLink link;
-
-  link = Chain_NewLink();
-  Chain_LinkAfter(chain, link, (Blt_ChainLink)NULL);
+  ChainLink link = Chain_NewLink();
+  Chain_LinkAfter(chain, link, (ChainLink)NULL);
   Chain_SetValue(link, clientData);
   return link;
 }
 
-Blt_ChainLink Blt::Chain_Prepend(Blt_Chain chain, ClientData clientData)
+ChainLink Blt::Chain_Prepend(Blt_Chain chain, ClientData clientData)
 {
-  Blt_ChainLink link;
-
-  link = Chain_NewLink();
-  Chain_LinkBefore(chain, link, (Blt_ChainLink)NULL);
+  ChainLink link = Chain_NewLink();
+  Chain_LinkBefore(chain, link, (ChainLink)NULL);
   Chain_SetValue(link, clientData);
   return link;
 }
 
-int Blt::Chain_IsBefore(ChainLink* firstPtr, ChainLink* lastPtr)
+int Blt::Chain_IsBefore(ChainLink firstPtr, ChainLink lastPtr)
 {
-  for (ChainLink* linkPtr = firstPtr; linkPtr; linkPtr = linkPtr->next) {
+  for (ChainLink linkPtr = firstPtr; linkPtr; linkPtr = linkPtr->next) {
     if (linkPtr == lastPtr)
       return 1;
   }
diff --git a/src/bltChain.h b/src/bltChain.h
index 64dab62..90631e2 100644
--- a/src/bltChain.h
+++ b/src/bltChain.h
@@ -42,39 +42,39 @@
 #define Chain_GetValue(l) ((l)->clientData)
 #define Chain_FirstValue(c) (((c)->head == NULL) ? NULL : (c)->head->clientData)
 #define Chain_SetValue(l, v) ((l)->clientData = (ClientData)(v))
-#define Chain_AppendLink(c, l) (Chain_LinkAfter((c), (l), (Blt_ChainLink)NULL))
-#define Chain_PrependLink(c, l) (Chain_LinkBefore((c), (l), (Blt_ChainLink)NULL))
+#define Chain_AppendLink(c, l) (Chain_LinkAfter((c), (l), (ChainLink)NULL))
+#define Chain_PrependLink(c, l) (Chain_LinkBefore((c), (l), (ChainLink)NULL))
 
 namespace Blt {
 
   typedef struct _Blt_Chain *Blt_Chain;
-  typedef struct _Blt_ChainLink *Blt_ChainLink;
+  typedef struct _ChainLink *ChainLink;
 
-  struct _Blt_ChainLink {
-    Blt_ChainLink prev;		/* Link to the previous link */
-    Blt_ChainLink next;		/* Link to the next link */
+  struct _ChainLink {
+    ChainLink prev;		/* Link to the previous link */
+    ChainLink next;		/* Link to the next link */
     ClientData clientData;	/* Pointer to the data object */
   };
 
   struct _Blt_Chain {
-    Blt_ChainLink head;		/* Pointer to first element in chain */
-    Blt_ChainLink tail;		/* Pointer to last element in chain */
+    ChainLink head;		/* Pointer to first element in chain */
+    ChainLink tail;		/* Pointer to last element in chain */
     long nLinks;		/* Number of elements in chain */
   };
 
   extern Blt_Chain Chain_Create(void);
-  extern Blt_ChainLink Chain_AllocLink(size_t size);
-  extern void Chain_InitLink(Blt_ChainLink link);
+  extern ChainLink Chain_AllocLink(size_t size);
+  extern void Chain_InitLink(ChainLink link);
   extern void Chain_Init(Blt_Chain chain);
-  extern Blt_ChainLink Chain_NewLink(void);
+  extern ChainLink Chain_NewLink(void);
   extern void Chain_Reset(Blt_Chain chain);
   extern void Chain_Destroy(Blt_Chain chain);
-  extern void Chain_LinkAfter(Blt_Chain chain, Blt_ChainLink link, Blt_ChainLink after);
-  extern void Chain_LinkBefore(Blt_Chain chain, Blt_ChainLink link, Blt_ChainLink before);
-  extern void Chain_UnlinkLink(Blt_Chain chain, Blt_ChainLink link);
-  extern void Chain_DeleteLink(Blt_Chain chain, Blt_ChainLink link);
-  extern Blt_ChainLink Chain_Append(Blt_Chain chain, ClientData clientData);
-  extern Blt_ChainLink Chain_Prepend(Blt_Chain chain, ClientData clientData);
-  extern int Chain_IsBefore(Blt_ChainLink first, Blt_ChainLink last);
+  extern void Chain_LinkAfter(Blt_Chain chain, ChainLink link, ChainLink after);
+  extern void Chain_LinkBefore(Blt_Chain chain, ChainLink link, ChainLink before);
+  extern void Chain_UnlinkLink(Blt_Chain chain, ChainLink link);
+  extern void Chain_DeleteLink(Blt_Chain chain, ChainLink link);
+  extern ChainLink Chain_Append(Blt_Chain chain, ClientData clientData);
+  extern ChainLink Chain_Prepend(Blt_Chain chain, ClientData clientData);
+  extern int Chain_IsBefore(ChainLink first, ChainLink last);
 };
 #endif /* _BLT_CHAIN_H */
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 6ca648d..8eeebd7 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -622,7 +622,7 @@ void Axis::draw(Drawable drawable)
     ts.xPad_ = 2;
     ts.yPad_ = 0;
 
-    for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link;
+    for (ChainLink link=Chain_FirstLink(tickLabels_); link;
 	 link = Chain_NextLink(link)) {	
       TickLabel* labelPtr = (TickLabel*)Chain_GetValue(link);
       ts.drawText(drawable, labelPtr->string, labelPtr->anchorPos.x, 
@@ -1028,7 +1028,7 @@ int Axis::isHorizontal()
 void Axis::freeTickLabels()
 {
   Blt_Chain chain = tickLabels_;
-  for (Blt_ChainLink link=Chain_FirstLink(chain); link;
+  for (ChainLink link=Chain_FirstLink(chain); link;
        link = Chain_NextLink(link)) {
     TickLabel* labelPtr = (TickLabel*)Chain_GetValue(link);
     delete labelPtr;
@@ -1597,7 +1597,7 @@ void Axis::makeSegments(AxisInfo *infoPtr)
       sp++;
     }
 
-    Blt_ChainLink link = Chain_FirstLink(tickLabels_);
+    ChainLink link = Chain_FirstLink(tickLabels_);
     double labelPos = (double)infoPtr->label;
 
     for (int ii=0; ii< nMajorTicks; ii++) {
@@ -1731,7 +1731,7 @@ void Axis::print(PSOutput* psPtr)
     ts.xPad_ = 2;
     ts.yPad_ = 0;
 
-    for (Blt_ChainLink link=Chain_FirstLink(tickLabels_); link; 
+    for (ChainLink link=Chain_FirstLink(tickLabels_); link; 
 	 link = Chain_NextLink(link)) {
       TickLabel *labelPtr = (TickLabel*)Chain_GetValue(link);
       ts.printText(psPtr, labelPtr->string, labelPtr->anchorPos.x, 
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index 75b0b92..e452bfb 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -171,7 +171,7 @@ namespace Blt {
     int use_;
     int active_;		
 
-    Blt_ChainLink link;
+    ChainLink link;
     Blt_Chain chain;
 
     Point2d titlePos_;
diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index 7050057..70fd22d 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -237,7 +237,7 @@ PenStyle** Element::StyleMap()
   int nPoints = NUMBEROFPOINTS(ops);
   int nWeights = MIN(ops->w ? ops->w->nValues() : 0, nPoints);
   double* w = ops->w ? ops->w->values_ : NULL;
-  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
+  ChainLink link = Chain_FirstLink(ops->stylePalette);
   PenStyle* stylePtr = (PenStyle*)Chain_GetValue(link);
 
   // Create a style mapping array (data point index to style), 
@@ -268,9 +268,9 @@ PenStyle** Element::StyleMap()
 void Element::freeStylePalette(Blt_Chain stylePalette)
 {
   // Skip the first slot. It contains the built-in "normal" pen of the element
-  Blt_ChainLink link = Chain_FirstLink(stylePalette);
+  ChainLink link = Chain_FirstLink(stylePalette);
   if (link) {
-    Blt_ChainLink next;
+    ChainLink next;
     for (link=Chain_NextLink(link); link; link=next) {
       next = Chain_NextLink(link);
       PenStyle *stylePtr = (PenStyle*)Chain_GetValue(link);
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index f909227..b828f6d 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -164,7 +164,7 @@ namespace Blt {
     int active_;		
     int labelActive_;
 
-    Blt_ChainLink link;
+    ChainLink link;
 
   protected:
     double FindElemValuesMinimum(ElemValues*, double);
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index bdea07a..f2fe6d2 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -234,7 +234,7 @@ int BarElement::configure()
     return TCL_ERROR;
 
   // Point to the static normal pen if no external pens have been selected.
-  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
+  ChainLink link = Chain_FirstLink(ops->stylePalette);
   if (!link) {
     link = Chain_AllocLink(sizeof(BarStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
@@ -446,7 +446,7 @@ void BarElement::map()
     size = bars->width;
 
   // Set the symbol size of all the pen styles
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
     BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     BarPen* penPtr = stylePtr->penPtr;
@@ -669,7 +669,7 @@ void BarElement::draw(Drawable drawable)
     return;
 
   int count = 0;
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
 
     BarStyle* stylePtr = (BarStyle*)Chain_GetValue(link);
@@ -753,7 +753,7 @@ void BarElement::print(PSOutput* psPtr)
   psPtr->format("\n%% Element \"%s\"\n\n", name_);
 
   int count = 0;
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
 
     BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
@@ -840,7 +840,7 @@ void BarElement::printSymbol(PSOutput* psPtr, double x, double y, int size)
 
 void BarElement::ResetStylePalette(Blt_Chain stylePalette)
 {
-  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); link; 
+  for (ChainLink link = Chain_FirstLink(stylePalette); link; 
        link = Chain_NextLink(link)) {
     BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     stylePtr->xeb.length = 0;
@@ -882,7 +882,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
   BarElementOptions* ops = (BarElementOptions*)ops_;
 
   if (Chain_GetLength(ops->stylePalette) < 2) {
-    Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
+    ChainLink link = Chain_FirstLink(ops->stylePalette);
     BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
     stylePtr->nBars = nBars_;
     stylePtr->bars = bars_;
@@ -900,7 +900,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     int* barToData = new int[nBars_];
     XRectangle* bp = bars;
     int* ip = barToData;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
 	 link = Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->symbolSize = bp->width / 2;
@@ -925,7 +925,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     Segment2d *sp = bars;
     int* map = new int[xeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
@@ -949,7 +949,7 @@ void BarElement::mergePens(BarStyle** dataToStyle)
     Segment2d* sp = bars;
     int* map = new int[yeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); link; 
 	 link = Chain_NextLink(link)) {
       BarStyle *stylePtr = (BarStyle*)Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index f65a574..15fd8d1 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -288,7 +288,7 @@ int LineElement::configure()
 
   // Point to the static normal/active pens if no external pens have been
   // selected.
-  Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
+  ChainLink link = Chain_FirstLink(ops->stylePalette);
   if (!link) {
     link = Chain_AllocLink(sizeof(LineStyle));
     Chain_LinkAfter(ops->stylePalette, link, NULL);
@@ -361,7 +361,7 @@ void LineElement::map()
   delete [] mi.map;
 
   // Set the symbol size of all the pen styles
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
     LineStyle* stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -545,7 +545,7 @@ void LineElement::draw(Drawable drawable)
   // Symbols, error bars, values
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
-    for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
+    for (ChainLink link=Chain_FirstLink(ops->stylePalette); link;
 	 link=Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
@@ -555,7 +555,7 @@ void LineElement::draw(Drawable drawable)
   }
 
   unsigned int count =0;
-  for (Blt_ChainLink link=Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link=Chain_FirstLink(ops->stylePalette); link;
        link=Chain_NextLink(link)) {
     LineStyle* stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -674,7 +674,7 @@ void LineElement::print(PSOutput* psPtr)
   // Symbols, error bars, values
   if (ops->reqMaxSymbols > 0) {
     int total = 0;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       total += stylePtr->symbolPts.length;
@@ -684,7 +684,7 @@ void LineElement::print(PSOutput* psPtr)
   }
 
   unsigned int count =0;
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
     LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     LinePen* penPtr = (LinePen *)stylePtr->penPtr;
@@ -1358,7 +1358,7 @@ void LineElement::mergePens(LineStyle **styleMap)
   LineElementOptions* ops = (LineElementOptions*)ops_;
 
   if (Chain_GetLength(ops->stylePalette) < 2) {
-    Blt_ChainLink link = Chain_FirstLink(ops->stylePalette);
+    ChainLink link = Chain_FirstLink(ops->stylePalette);
     LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     stylePtr->symbolPts.length = symbolPts_.length;
     stylePtr->symbolPts.points = symbolPts_.points;
@@ -1374,7 +1374,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     int* map = new int[symbolPts_.length];
     Point2d *pp = points;
     int* ip = map;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->symbolPts.points = pp;
@@ -1398,7 +1398,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     Segment2d *sp = segments;
     int* map = new int[xeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->xeb.segments = sp;
@@ -1422,7 +1422,7 @@ void LineElement::mergePens(LineStyle **styleMap)
     Segment2d* sp = segments;
     int* map = new int [yeb_.length];
     int* ip = map;
-    for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); 
+    for (ChainLink link = Chain_FirstLink(ops->stylePalette); 
 	 link; link = Chain_NextLink(link)) {
       LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
       stylePtr->yeb.segments = sp;
@@ -1540,7 +1540,7 @@ void LineElement::saveTrace(int start, int length, MapInfo* mapPtr)
 
 void LineElement::freeTraces()
 {
-  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
+  for (ChainLink link = Chain_FirstLink(traces_); link;
        link = Chain_NextLink(link)) {
     bltTrace* tracePtr = (bltTrace*)Chain_GetValue(link);
     delete [] tracePtr->screenPts.map;
@@ -1684,7 +1684,7 @@ void LineElement::reset()
 
   freeTraces();
 
-  for (Blt_ChainLink link = Chain_FirstLink(ops->stylePalette); link;
+  for (ChainLink link = Chain_FirstLink(ops->stylePalette); link;
        link = Chain_NextLink(link)) {
     LineStyle *stylePtr = (LineStyle*)Chain_GetValue(link);
     stylePtr->symbolPts.length = 0;
@@ -1877,7 +1877,7 @@ int LineElement::closestTrace()
   GraphOptions* gops = (GraphOptions*)graphPtr_->ops_;
   ClosestSearch* searchPtr = &gops->search;
 
-  Blt_ChainLink link;
+  ChainLink link;
   Point2d closest;
   double dMin;
   int iClose;
@@ -2341,7 +2341,7 @@ void LineElement::drawSymbols(Drawable drawable, LinePen* penPtr, int size,
 
 void LineElement::drawTraces(Drawable drawable, LinePen* penPtr)
 {
-  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
+  for (ChainLink link = Chain_FirstLink(traces_); link;
        link = Chain_NextLink(link)) {
     bltTrace* tracePtr = (bltTrace*)Chain_GetValue(link);
 
@@ -2495,8 +2495,8 @@ void LineElement::setLineAttributes(PSOutput* psPtr, LinePen* penPtr)
 void LineElement::printTraces(PSOutput* psPtr, LinePen* penPtr)
 {
   setLineAttributes(psPtr, penPtr);
-  for (Blt_ChainLink link = Chain_FirstLink(traces_); link;
-       link = Chain_NextLink(link)) {
+  for (ChainLink link=Chain_FirstLink(traces_); link; 
+       link=Chain_NextLink(link)) {
     bltTrace *tracePtr = (bltTrace*)Chain_GetValue(link);
     if (tracePtr->screenPts.length > 0) {
       psPtr->append("% start trace\n");
diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index ee3cc78..7da85aa 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -251,7 +251,7 @@ static int ClosestOp(ClientData clientData, Tcl_Interp* interp,
     // searching the display list from back to front.  That way if
     // the points from two different elements overlay each other
     // exactly, the last one picked will be the topmost.  
-    for (Blt_ChainLink link=Chain_LastLink(graphPtr->elements_.displayList);
+    for (ChainLink link=Chain_LastLink(graphPtr->elements_.displayList);
 	 link; link = Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       ElementOptions* eops = (ElementOptions*)elemPtr->ops();
@@ -368,7 +368,7 @@ static int LowerOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   // Append the links to end of the display list
-  Blt_ChainLink link, next;
+  ChainLink link, next;
   for (link = Chain_FirstLink(chain); link; link = next) {
     next = Chain_NextLink(link);
     Chain_UnlinkLink(chain, link); 
@@ -433,7 +433,7 @@ static int RaiseOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   // Prepend the links to beginning of the display list in reverse order
-  Blt_ChainLink link, prev;
+  ChainLink link, prev;
   for (link = Chain_LastLink(chain); link; link = prev) {
     prev = Chain_PrevLink(link);
     Chain_UnlinkLink(chain, link); 
@@ -473,7 +473,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   // Clear the links from the currently displayed elements
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
+  for (ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->link = NULL;
@@ -482,7 +482,7 @@ static int ShowOp(ClientData clientData, Tcl_Interp* interp,
   graphPtr->elements_.displayList = chain;
 
   // Set links on all the displayed elements
-  for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
+  for (ChainLink link = Chain_FirstLink(chain); link; 
        link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->link = link;
@@ -534,7 +534,7 @@ static Tcl_Obj *DisplayListObj(Graph* graphPtr)
 {
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
 
-  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+  for (ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
     Tcl_ListObjAppendElement(graphPtr->interp_, listObjPtr, objPtr);
diff --git a/src/bltGrElemOption.C b/src/bltGrElemOption.C
index 47f2421..c5dbeb5 100644
--- a/src/bltGrElemOption.C
+++ b/src/bltGrElemOption.C
@@ -240,7 +240,7 @@ int StyleSetProc(ClientData clientData, Tcl_Interp* interp,
 
   // Reserve the first entry for the "normal" pen. We'll set the style later
   elemPtr->freeStylePalette(stylePalette);
-  Blt_ChainLink link = Chain_FirstLink(stylePalette);
+  ChainLink link = Chain_FirstLink(stylePalette);
   if (!link) {
     link = Chain_AllocLink(size);
     Chain_LinkAfter(stylePalette, link, NULL);
@@ -273,14 +273,14 @@ Tcl_Obj* StyleGetProc(ClientData clientData, Tk_Window tkwin,
 
   // count how many
   int cnt =0;
-  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
+  for (ChainLink link = Chain_FirstLink(stylePalette); !link; 
        link = Chain_NextLink(link), cnt++) {}
   if (!cnt)
     return Tcl_NewListObj(0, (Tcl_Obj**)NULL);
 
   Tcl_Obj** ll = new Tcl_Obj*[3*cnt];
   int ii=0;
-  for (Blt_ChainLink link = Chain_FirstLink(stylePalette); !link; 
+  for (ChainLink link = Chain_FirstLink(stylePalette); !link; 
        link = Chain_NextLink(link)) {
     PenStyle *stylePtr = (PenStyle*)Chain_GetValue(link);
     ll[ii++] = Tcl_NewStringObj(stylePtr->penPtr->name_, -1);
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 0914fe8..646fd9c 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -266,7 +266,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int maxWidth =0;
   int maxHeight =0;
   TextStyle ts(graphPtr_, &ops->style);
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -374,7 +374,7 @@ void Legend::map(int plotWidth, int plotHeight)
   int row =0;
   int col =0;
   int count =0;
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     count++;
@@ -454,7 +454,7 @@ void Legend::draw(Drawable drawable)
   int yStart = y;
   TextStyle ts(graphPtr_, &ops->style);
 
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
+  for (ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -574,7 +574,7 @@ void Legend::print(PSOutput* psPtr)
   double yStart = y;
   TextStyle ts(graphPtr_, &ops->style);
 
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
+  for (ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList); 
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -762,7 +762,7 @@ void Legend::selectElement(Element* elemPtr)
   int isNew;
   Tcl_HashEntry* hPtr = Tcl_CreateHashEntry(&selectTable_, elemPtr, &isNew);
   if (isNew) {
-    Blt_ChainLink link = Chain_Append(selected_, elemPtr);
+    ChainLink link = Chain_Append(selected_, elemPtr);
     Tcl_SetHashValue(hPtr, link);
   }
 }
@@ -771,7 +771,7 @@ void Legend::deselectElement(Element* elemPtr)
 {
   Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&selectTable_, elemPtr);
   if (hPtr) {
-    Blt_ChainLink link = (Blt_ChainLink)Tcl_GetHashValue(hPtr);
+    ChainLink link = (ChainLink)Tcl_GetHashValue(hPtr);
     Chain_DeleteLink(selected_, link);
     Tcl_DeleteHashEntry(hPtr);
   }
@@ -781,7 +781,7 @@ void Legend::deselectElement(Element* elemPtr)
 int Legend::selectRange(Element *fromPtr, Element *toPtr)
 {
   if (Chain_IsBefore(fromPtr->link, toPtr->link)) {
-    for (Blt_ChainLink link=fromPtr->link; link; 
+    for (ChainLink link=fromPtr->link; link; 
 	 link=Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       selectEntry(elemPtr);
@@ -790,7 +790,7 @@ int Legend::selectRange(Element *fromPtr, Element *toPtr)
     }
   } 
   else {
-    for (Blt_ChainLink link=fromPtr->link; link;
+    for (ChainLink link=fromPtr->link; link;
 	 link=Chain_PrevLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       selectEntry(elemPtr);
@@ -875,7 +875,7 @@ Element* Legend::getNextRow(Element* focusPtr)
 {
   int col = focusPtr->col_;
   int row = focusPtr->row_ + 1;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
+  for (ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -892,7 +892,7 @@ Element* Legend::getNextColumn(Element* focusPtr)
 {
   int col = focusPtr->col_ + 1;
   int row = focusPtr->row_;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
+  for (ChainLink link=focusPtr->link; link; link=Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -909,7 +909,7 @@ Element* Legend::getPreviousRow(Element* focusPtr)
 {
   int col = focusPtr->col_;
   int row = focusPtr->row_ - 1;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
+  for (ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -926,7 +926,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 {
   int col = focusPtr->col_ - 1;
   int row = focusPtr->row_;
-  for (Blt_ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
+  for (ChainLink link=focusPtr->link; link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 
@@ -941,7 +941,7 @@ Element* Legend::getPreviousColumn(Element* focusPtr)
 
 Element* Legend::getFirstElement()
 {
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
+  for (ChainLink link=Chain_FirstLink(graphPtr_->elements_.displayList);
        link; link=Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -953,7 +953,7 @@ Element* Legend::getFirstElement()
 
 Element* Legend::getLastElement()
 {
-  for (Blt_ChainLink link=Chain_LastLink(graphPtr_->elements_.displayList); 
+  for (ChainLink link=Chain_LastLink(graphPtr_->elements_.displayList); 
        link; link=Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
@@ -987,7 +987,7 @@ ClientData Legend::pickEntry(int xx, int yy, ClassId* classIdPtr)
     // Legend entries are stored in bottom-to-top
     if (nn < nEntries_) {
       int count = 0;
-      for (Blt_ChainLink link = Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Chain_NextLink(link)) {
+      for (ChainLink link = Chain_FirstLink(graphPtr_->elements_.displayList); link; link = Chain_NextLink(link)) {
 	Element* elemPtr = (Element*)Chain_GetValue(link);
 	ElementOptions* elemOps = (ElementOptions*)elemPtr->ops();
 	if (elemOps->label) {
@@ -1020,7 +1020,7 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
   Tcl_DString dString;
   Tcl_DStringInit(&dString);
   if (legendPtr->flags & SELECT_SORTED) {
-    for (Blt_ChainLink link=Chain_FirstLink(legendPtr->selected_); 
+    for (ChainLink link=Chain_FirstLink(legendPtr->selected_); 
 	 link; link = Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       Tcl_DStringAppend(&dString, elemPtr->name_, -1);
@@ -1028,7 +1028,7 @@ static int SelectionProc(ClientData clientData, int offset, char *buffer,
     }
   }
   else {
-    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
+    for (ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList);
 	 link; link = Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       if (legendPtr->entryIsSelected(elemPtr)) {
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 30e0999..f3208c6 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -138,7 +138,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
   for (int ii=3; ii<objc; ii++) {
     
     const char* pattern = Tcl_GetString(objv[ii]);
-    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+    for (ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
       if (Tcl_StringMatch(elemPtr->name_, pattern)) {
 	if (active) {
@@ -164,7 +164,7 @@ static int ActivateOp(ClientData clientData, Tcl_Interp* interp,
 
   // List active elements in stacking order
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-  for (Blt_ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+  for (ChainLink link=Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     if (elemPtr->labelActive_) {
       Tcl_Obj *objPtr = Tcl_NewStringObj(elemPtr->name_, -1);
@@ -205,7 +205,7 @@ static int CurselectionOp(ClientData clientData, Tcl_Interp* interp,
   Legend* legendPtr = graphPtr->legend_;
   Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (legendPtr->flags & SELECT_SORTED) {
-    Blt_ChainLink link;
+    ChainLink link;
 
     for (link = Chain_FirstLink(legendPtr->selected_); link;
 	 link = Chain_NextLink(link)) {
@@ -216,7 +216,7 @@ static int CurselectionOp(ClientData clientData, Tcl_Interp* interp,
   }
   else {
     // List of selected entries is in stacking order
-    for (Blt_ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
+    for (ChainLink link = Chain_FirstLink(graphPtr->elements_.displayList); link; link = Chain_NextLink(link)) {
       Element* elemPtr = (Element*)Chain_GetValue(link);
 
       if (legendPtr->entryIsSelected(elemPtr)) {
@@ -363,7 +363,7 @@ static int SelectionMarkOp(ClientData clientData, Tcl_Interp* interp,
 
   if (legendPtr->selMarkPtr_ != elemPtr) {
     // Deselect entry from the list all the way back to the anchor
-    Blt_ChainLink link, next;
+    ChainLink link, next;
     for (link = Chain_LastLink(legendPtr->selected_); link; link = next) {
       next = Chain_PrevLink(link);
       Element *selectPtr = (Element*)Chain_GetValue(link);
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index 0522cf8..545a86d 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -68,7 +68,7 @@ namespace Blt {
     Graph* graphPtr_;
     const char *name_;
     Tcl_HashEntry* hashPtr_;
-    Blt_ChainLink link;
+    ChainLink link;
     unsigned int flags;		
     int clipped_;
 
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index e0c5462..0439094 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -321,7 +321,7 @@ static int FindOp(ClientData clientData, Tcl_Interp* interp,
   }
 
   int enclosed = (mode == FIND_ENCLOSED);
-  for (Blt_ChainLink link = Chain_FirstLink(graphPtr->markers_.displayList);
+  for (ChainLink link = Chain_FirstLink(graphPtr->markers_.displayList);
        link; link = Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops();
@@ -348,7 +348,7 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp,
   Graph* graphPtr = (Graph*)clientData;
   Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
   if (objc == 3) {
-    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
+    for (ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
 	 link; link = Chain_NextLink(link)) {
       Marker* markerPtr = (Marker*)Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -356,7 +356,7 @@ static int NamesOp(ClientData clientData, Tcl_Interp* interp,
     }
   } 
   else {
-    for (Blt_ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
+    for (ChainLink link=Chain_FirstLink(graphPtr->markers_.displayList); 
 	 link; link = Chain_NextLink(link)) {
       Marker* markerPtr = (Marker*)Chain_GetValue(link);
       for (int ii = 3; ii<objc; ii++) {
@@ -390,10 +390,10 @@ static int RelinkOp(ClientData clientData, Tcl_Interp* interp,
     if (GetMarkerFromObj(interp, graphPtr, objv[4], &placePtr) != TCL_OK)
       return TCL_ERROR;
 
-  Blt_ChainLink link = markerPtr->link;
+  ChainLink link = markerPtr->link;
   Chain_UnlinkLink(graphPtr->markers_.displayList, markerPtr->link);
 
-  Blt_ChainLink place = placePtr ? placePtr->link : NULL;
+  ChainLink place = placePtr ? placePtr->link : NULL;
 
   const char* string = Tcl_GetString(objv[2]);
   if (string[0] == 'l')
diff --git a/src/bltGrXAxisOp.C b/src/bltGrXAxisOp.C
index c440ec7..8de1fdb 100644
--- a/src/bltGrXAxisOp.C
+++ b/src/bltGrXAxisOp.C
@@ -55,7 +55,7 @@ static Axis* GetAxisFromCmd(ClientData clientData, Tcl_Obj* obj)
   else
     return NULL;
 
-  Blt_ChainLink link = Chain_FirstLink(ops->margins[margin].axes);
+  ChainLink link = Chain_FirstLink(ops->margins[margin].axes);
   return (Axis*)Chain_GetValue(link);
 }
 
@@ -141,7 +141,7 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
 
   if (objc == 3) {
     Tcl_Obj* listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
-    for (Blt_ChainLink link = Chain_FirstLink(chain); link;
+    for (ChainLink link = Chain_FirstLink(chain); link;
 	 link = Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
@@ -156,11 +156,8 @@ static int UseOp(ClientData clientData, Tcl_Interp* interp,
   if (Tcl_ListObjGetElements(interp, objv[3], &axisObjc, &axisObjv) != TCL_OK)
     return TCL_ERROR;
 
-  for (Blt_ChainLink link = Chain_FirstLink(chain); link; 
-       link = Chain_NextLink(link)) {
-    Axis* axisPtr;
-
-    axisPtr = (Axis*)Chain_GetValue(link);
+  for (ChainLink link=Chain_FirstLink(chain); link; link=Chain_NextLink(link)) {
+    Axis* axisPtr = (Axis*)Chain_GetValue(link);
     axisPtr->link = NULL;
     axisPtr->use_ =0;
     // Clear the axis type if it's not currently used
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 551fd97..ba70588 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -661,7 +661,7 @@ void Graph::destroyElements()
 
 void Graph::configureElements()
 {
-  for (Blt_ChainLink link=Chain_FirstLink(elements_.displayList); 
+  for (ChainLink link=Chain_FirstLink(elements_.displayList); 
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->configure();
@@ -670,7 +670,7 @@ void Graph::configureElements()
 
 void Graph::mapElements()
 {
-  for (Blt_ChainLink link =Chain_FirstLink(elements_.displayList); 
+  for (ChainLink link =Chain_FirstLink(elements_.displayList); 
        link; link = Chain_NextLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->map();
@@ -680,7 +680,7 @@ void Graph::mapElements()
 void Graph::drawElements(Drawable drawable)
 {
   // Draw with respect to the stacking order
-  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+  for (ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->draw(drawable);
@@ -689,7 +689,7 @@ void Graph::drawElements(Drawable drawable)
 
 void Graph::drawActiveElements(Drawable drawable)
 {
-  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+  for (ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->drawActive(drawable);
@@ -698,7 +698,7 @@ void Graph::drawActiveElements(Drawable drawable)
 
 void Graph::printElements(PSOutput* psPtr)
 {
-  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+  for (ChainLink link=Chain_LastLink(elements_.displayList); 
        link != NULL; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->print(psPtr);
@@ -707,7 +707,7 @@ void Graph::printElements(PSOutput* psPtr)
 
 void Graph::printActiveElements(PSOutput* psPtr)
 {
-  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); 
+  for (ChainLink link=Chain_LastLink(elements_.displayList); 
        link; link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     elemPtr->printActive(psPtr);
@@ -758,7 +758,7 @@ void Graph::destroyMarkers()
 
 void Graph::configureMarkers()
 {
-  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
+  for (ChainLink link = Chain_FirstLink(markers_.displayList); 
        link; link = Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     markerPtr->configure();
@@ -767,7 +767,7 @@ void Graph::configureMarkers()
 
 void Graph::mapMarkers()
 {
-  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList); 
+  for (ChainLink link = Chain_FirstLink(markers_.displayList); 
        link; link = Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -786,7 +786,7 @@ void Graph::mapMarkers()
 
 void Graph::drawMarkers(Drawable drawable, int under)
 {
-  for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
+  for (ChainLink link = Chain_LastLink(markers_.displayList); 
        link; link = Chain_PrevLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -803,7 +803,7 @@ void Graph::drawMarkers(Drawable drawable, int under)
 
 void Graph::printMarkers(PSOutput* psPtr, int under)
 {
-  for (Blt_ChainLink link = Chain_LastLink(markers_.displayList); 
+  for (ChainLink link = Chain_LastLink(markers_.displayList); 
        link; link = Chain_PrevLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -834,7 +834,7 @@ Marker* Graph::nearestMarker(int x, int y, int under)
   Point2d point;
   point.x = (double)x;
   point.y = (double)y;
-  for (Blt_ChainLink link = Chain_FirstLink(markers_.displayList);
+  for (ChainLink link = Chain_FirstLink(markers_.displayList);
        link; link = Chain_NextLink(link)) {
     Marker* markerPtr = (Marker*)Chain_GetValue(link);
     MarkerOptions* mops = (MarkerOptions*)markerPtr->ops();
@@ -974,7 +974,7 @@ void Graph::mapAxes()
     int offset =0;
 
     Blt_Chain chain = ops->margins[ii].axes;
-    for (Blt_ChainLink link=Chain_FirstLink(chain); link; 
+    for (ChainLink link=Chain_FirstLink(chain); link; 
 	 link = Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* aops = (AxisOptions*)axisPtr->ops();
@@ -1003,7 +1003,7 @@ void Graph::drawAxes(Drawable drawable)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link = Chain_LastLink(ops->margins[ii].axes); 
+    for (ChainLink link = Chain_LastLink(ops->margins[ii].axes); 
 	 link; link = Chain_PrevLink(link)) {
       Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->draw(drawable);
@@ -1026,7 +1026,7 @@ void Graph::drawAxesGrids(Drawable drawable)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link = Chain_FirstLink(ops->margins[ii].axes);
+    for (ChainLink link = Chain_FirstLink(ops->margins[ii].axes);
 	 link; link = Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->drawGrids(drawable);
@@ -1040,7 +1040,7 @@ void Graph::printAxes(PSOutput* psPtr)
 
   Margin *mp, *mend;
   for (mp = ops->margins, mend = mp + 4; mp < mend; mp++) {
-    for (Blt_ChainLink link=Chain_FirstLink(mp->axes); link; 
+    for (ChainLink link=Chain_FirstLink(mp->axes); link; 
 	 link = Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->print(psPtr);
@@ -1053,7 +1053,7 @@ void Graph::printAxesGrids(PSOutput* psPtr)
   GraphOptions* ops = (GraphOptions*)ops_;
 
   for (int ii=0; ii<4; ii++) {
-    for (Blt_ChainLink link=Chain_FirstLink(ops->margins[ii].axes);
+    for (ChainLink link=Chain_FirstLink(ops->margins[ii].axes);
 	 link; link = Chain_NextLink(link)) {
       Axis *axisPtr = (Axis*)Chain_GetValue(link);
       axisPtr->printGrids(psPtr);
@@ -1162,7 +1162,7 @@ void Graph::resetAxes()
   // and largest data values mapped to each X and Y-axis.  This
   // will be the axis limits if the user doesn't override them 
   // with -min and -max options.
-  for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
+  for (ChainLink link = Chain_FirstLink(elements_.displayList);
        link; link = Chain_NextLink(link)) {
     Region2d exts;
 
@@ -1207,7 +1207,7 @@ Axis* Graph::nearestAxis(int x, int y)
       continue;
 
     if (ops->showTicks) {
-      for (Blt_ChainLink link=Chain_FirstLink(axisPtr->tickLabels_);
+      for (ChainLink link=Chain_FirstLink(axisPtr->tickLabels_);
 	   link; link = Chain_NextLink(link)) {	
 	TickLabel *labelPtr = (TickLabel*)Chain_GetValue(link);
 	double rw, rh;
@@ -1370,7 +1370,7 @@ ClientData Graph::pickEntry(int xx, int yy, ClassId* classIdPtr)
   searchPtr->y = yy;
   searchPtr->dist = (double)(searchPtr->halo + 1);
 	
-  for (Blt_ChainLink link=Chain_LastLink(elements_.displayList); link;
+  for (ChainLink link=Chain_LastLink(elements_.displayList); link;
        link = Chain_PrevLink(link)) {
     Element* elemPtr = (Element*)Chain_GetValue(link);
     ElementOptions* eops = (ElementOptions*)elemPtr->ops();
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index 7fb7216..63380e1 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -325,7 +325,7 @@ void BarGraph::initBarSets()
   Tcl_InitHashTable(&setTable, sizeof(BarSetKey)/sizeof(int));
   int nSegs =0;
 
-  for (Blt_ChainLink link = Chain_FirstLink(elements_.displayList);
+  for (ChainLink link = Chain_FirstLink(elements_.displayList);
        link; link = Chain_NextLink(link)) {
     BarElement* bePtr = (BarElement*)Chain_GetValue(link);
     BarElementOptions* ops = (BarElementOptions*)bePtr->ops();
@@ -450,7 +450,7 @@ void BarGraph::computeBarStacks()
 {
   BarGraphOptions* ops = (BarGraphOptions*)ops_;
 
-  Blt_ChainLink link;
+  ChainLink link;
   if (((BarMode)ops->barMode != STACKED) || (nBarGroups_ == 0))
     return;
 
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index bef0f45..6a81724 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -328,7 +328,7 @@ static const Ensemble graphEnsemble[] = {
 
 static Axis* GetFirstAxis(Blt_Chain chain)
 {
-  Blt_ChainLink link = Chain_FirstLink(chain);
+  ChainLink link = Chain_FirstLink(chain);
   if (!link)
     return NULL;
 
diff --git a/src/bltGraphSup.C b/src/bltGraphSup.C
index 46f9012..28fbab6 100644
--- a/src/bltGraphSup.C
+++ b/src/bltGraphSup.C
@@ -395,7 +395,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
   marginPtr->maxTickHeight =0;
 
   if (ops->stackAxes) {
-    for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
+    for (ChainLink link = Chain_FirstLink(marginPtr->axes);
 	 link; link = Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
@@ -420,7 +420,7 @@ int Graph::getMarginGeometry(Margin *marginPtr)
     }
   }
   else {
-    for (Blt_ChainLink link = Chain_FirstLink(marginPtr->axes);
+    for (ChainLink link = Chain_FirstLink(marginPtr->axes);
 	 link; link = Chain_NextLink(link)) {
       Axis* axisPtr = (Axis*)Chain_GetValue(link);
       AxisOptions* ops = (AxisOptions*)axisPtr->ops();
diff --git a/src/bltVector.C b/src/bltVector.C
index 96f6ba9..9d9afea 100644
--- a/src/bltVector.C
+++ b/src/bltVector.C
@@ -85,7 +85,7 @@ typedef struct {
 			       * vector change or the vector is deleted. */
   ClientData clientData;	/* Data passed whenever the vector change
 				 * procedure is called. */
-  Blt_ChainLink link;		/* Used to quickly remove this entry from its
+  ChainLink link;		/* Used to quickly remove this entry from its
 				 * server's client chain. */
 } VectorClient;
 
@@ -372,7 +372,7 @@ Vector* Blt::Vec_ParseElement(Tcl_Interp* interp, VectorInterpData *dataPtr,
 void Blt_Vec_NotifyClients(ClientData clientData)
 {
   Vector* vPtr = (Vector*)clientData;
-  Blt_ChainLink link, next;
+  ChainLink link, next;
   Blt_VectorNotify notify;
 
   notify = (vPtr->notifyFlags & NOTIFY_DESTROYED)
@@ -772,7 +772,7 @@ Vector* Blt::Vec_New(VectorInterpData *dataPtr)
 
 void Blt::Vec_Free(Vector* vPtr)
 {
-  Blt_ChainLink link;
+  ChainLink link;
 
   if (vPtr->cmdToken != 0) {
     DeleteCommand(vPtr);