*** empty log message ***

20 files changed, 24 insertions, 29 deletions

diff --git a/src/bltConfig.C b/src/bltConfig.C
index f9e3c85..0e5d786 100644
--- a/src/bltConfig.C
+++ b/src/bltConfig.C
@@ -68,7 +68,7 @@ static int DashesSetProc(ClientData clientData, Tcl_Interp *interp,
 			 Tk_Window tkwin, Tcl_Obj** objPtr, char* widgRec,
 			 int offset, char* save, int flags)
 {
-  Blt_Dashes* dashesPtr = (Blt_Dashes*)(widgRec + offset);
+  Dashes* dashesPtr = (Dashes*)(widgRec + offset);
 
   int length;
   const char* string = Tcl_GetStringFromObj(*objPtr, &length);
@@ -141,7 +141,7 @@ static int DashesSetProc(ClientData clientData, Tcl_Interp *interp,
 static Tcl_Obj* DashesGetProc(ClientData clientData, Tk_Window tkwin, 
 			     char *widgRec, int offset)
 {
-  Blt_Dashes* dashesPtr = (Blt_Dashes*)(widgRec + offset);
+  Dashes* dashesPtr = (Dashes*)(widgRec + offset);
 
   // count how many
   int cnt =0;
diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index fefb643..b32061e 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -1713,7 +1713,7 @@ void Axis::print(Blt_Ps ps)
 
   if ((nSegments_ > 0) && (ops->lineWidth > 0)) {
     Blt_Ps_XSetLineAttributes(ps, ops->tickColor, ops->lineWidth, 
-			      (Blt_Dashes *)NULL, CapButt, JoinMiter);
+			      (Dashes*)NULL, CapButt, JoinMiter);
     graphPtr_->printSegments(ps, segments_, nSegments_);
   }
 }
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index e8c3371..99f3344 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -61,7 +61,7 @@ typedef struct {
 extern AxisName axisNames[];
 
 typedef struct {
-  Blt_Dashes dashes;
+  Dashes dashes;
   int lineWidth;
   XColor* color;
   GC gc;
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 7425f97..1f1372c 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -2644,7 +2644,7 @@ void LineElement::getSymbolPostScriptInfo(Blt_Ps ps, LinePen* penPtr, int size)
 			      &pops->traceDashes, CapButt, JoinMiter);
   else {
     Blt_Ps_XSetLineWidth(ps, pops->symbol.outlineWidth);
-    Blt_Ps_XSetDashes(ps, (Blt_Dashes *)NULL);
+    Blt_Ps_XSetDashes(ps, (Dashes *)NULL);
   }
 
   /*
@@ -2753,7 +2753,7 @@ void LineElement::setLineAttributes(Blt_Ps ps, LinePen* penPtr)
     Blt_Ps_Append(ps, "/DashesProc {\n  gsave\n    ");
     Blt_Ps_XSetBackground(ps, pops->traceOffColor);
     Blt_Ps_Append(ps, "    ");
-    Blt_Ps_XSetDashes(ps, (Blt_Dashes *)NULL);
+    Blt_Ps_XSetDashes(ps, (Dashes*)NULL);
     Blt_Ps_Append(ps, "stroke\n  grestore\n} def\n");
   } else {
     Blt_Ps_Append(ps, "/DashesProc {} def\n");
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index db8799a..8aee361 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -106,7 +106,7 @@ int Crosshairs::configure()
   }
   GC newGC = graphPtr_->getPrivateGC(gcMask, &gcValues);
   if (LineIsDashed(ops->dashes))
-    Blt_SetDashes(graphPtr_->display_, newGC, &ops->dashes);
+    graphPtr_->setDashes(newGC, &ops->dashes);
 
   if (gc_ != NULL)
     graphPtr_->freePrivateGC(gc_);
diff --git a/src/bltGrHairs.h b/src/bltGrHairs.h
index 970d3ac..63fa54b 100644
--- a/src/bltGrHairs.h
+++ b/src/bltGrHairs.h
@@ -41,7 +41,7 @@ class Graph;
 
 typedef struct {
   XColor* colorPtr;
-  Blt_Dashes dashes;
+  Dashes dashes;
   int hide;
   int lineWidth;
   int x;
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 73abd34..eb98218 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -235,7 +235,7 @@ int Legend::configure()
   GC newGC = graphPtr_->getPrivateGC(gcMask, &gcValues);
   if (LineIsDashed(ops->focusDashes)) {
     ops->focusDashes.offset = 2;
-    Blt_SetDashes(graphPtr_->display_, newGC, &ops->focusDashes);
+    graphPtr_->setDashes(newGC, &ops->focusDashes);
   }
   if (focusGC_)
     graphPtr_->freePrivateGC(focusGC_);
diff --git a/src/bltGrLegd.h b/src/bltGrLegd.h
index 30fc6a6..9dbda2a 100644
--- a/src/bltGrLegd.h
+++ b/src/bltGrLegd.h
@@ -75,7 +75,7 @@ typedef struct {
   int borderWidth;
   int reqColumns;
   int exportSelection;
-  Blt_Dashes focusDashes;
+  Dashes focusDashes;
   XColor* focusColor;
   TextStyleOptions style;
   int hide;
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index 732c1c4..82f88cb 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -314,7 +314,7 @@ void LineMarker::print(Blt_Ps ps)
       Blt_Ps_Append(ps, "/DashesProc {\n  gsave\n    ");
       Blt_Ps_XSetBackground(ps, ops->fillColor);
       Blt_Ps_Append(ps, "    ");
-      Blt_Ps_XSetDashes(ps, (Blt_Dashes*)NULL);
+      Blt_Ps_XSetDashes(ps, (Dashes*)NULL);
       Blt_Ps_VarAppend(ps, "stroke\n", "  grestore\n", "} def\n", (char*)NULL);
     } 
     else
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index 3cbab40..61c5ec6 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -47,7 +47,7 @@ namespace Blt {
     int yOffset;
 
     int capStyle;
-    Blt_Dashes dashes;
+    Dashes dashes;
     XColor* fillColor;
     int joinStyle;
     int lineWidth;
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index d7e0dc4..9cd51a5 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -353,7 +353,7 @@ void PolygonMarker::print(Blt_Ps ps)
       Blt_Ps_Append(ps, "/DashesProc {\ngsave\n    ");
       Blt_Ps_XSetBackground(ps, ops->outlineBg);
       Blt_Ps_Append(ps, "    ");
-      Blt_Ps_XSetDashes(ps, (Blt_Dashes *)NULL);
+      Blt_Ps_XSetDashes(ps, (Dashes*)NULL);
       Blt_Ps_Append(ps, "stroke\n  grestore\n} def\n");
     }
     else
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 2cae92b..a38a79f 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -47,7 +47,7 @@ namespace Blt {
     int yOffset;
 
     int capStyle;
-    Blt_Dashes dashes;
+    Dashes dashes;
     XColor* fill;
     XColor* fillBg;
     int joinStyle;
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index c59b9f3..22688cd 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -363,12 +363,6 @@ Point2d Blt_GetProjection(int x, int y, Point2d *p, Point2d *q)
   return t;
 }
 
-void Blt_SetDashes(Display *display, GC gc, Blt_Dashes *dashesPtr)
-{
-  XSetDashes(display, gc, dashesPtr->offset, (const char*)dashesPtr->values,
-	     (int)strlen((char*)dashesPtr->values));
-}
-
 long Blt_MaxRequestSize(Display *display, size_t elemSize) 
 {
   static long maxSizeBytes = 0L;
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index 2c21645..c959459 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -82,7 +82,7 @@ typedef enum {
 typedef struct {
   unsigned char values[12];
   int offset;
-} Blt_Dashes;
+} Dashes;
 
 #define LineIsDashed(d) ((d).values[0] != 0)
 
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index 4548a61..028c437 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -358,7 +358,7 @@ void Blt_Ps_XSetLineWidth(Blt_Ps ps, int lineWidth)
   Blt_Ps_Format(ps, "%d setlinewidth\n", lineWidth);
 }
 
-void Blt_Ps_XSetDashes(Blt_Ps ps, Blt_Dashes *dashesPtr)
+void Blt_Ps_XSetDashes(Blt_Ps ps, Dashes* dashesPtr)
 {
 
   Blt_Ps_Append(ps, "[ ");
@@ -376,7 +376,7 @@ void Blt_Ps_XSetLineAttributes(
 			       Blt_Ps ps,
 			       XColor* colorPtr,
 			       int lineWidth,
-			       Blt_Dashes *dashesPtr,
+			       Dashes* dashesPtr,
 			       int capStyle, 
 			       int joinStyle)
 {
diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h
index 156b14d..3f28039 100644
--- a/src/bltGrPSOutput.h
+++ b/src/bltGrPSOutput.h
@@ -84,10 +84,11 @@ extern void Blt_Ps_XSetForeground(Blt_Ps ps, XColor* colorPtr);
 
 extern void Blt_Ps_XSetFont(Blt_Ps ps, Tk_Font font);
 
-extern void Blt_Ps_XSetDashes(Blt_Ps ps, Blt_Dashes *dashesPtr);
+extern void Blt_Ps_XSetDashes(Blt_Ps ps, Dashes *dashesPtr);
 
 extern void Blt_Ps_XSetLineAttributes(Blt_Ps ps, XColor* colorPtr,
-				      int lineWidth, Blt_Dashes *dashesPtr, int capStyle, int joinStyle);
+				      int lineWidth, Dashes *dashesPtr,
+				      int capStyle, int joinStyle);
 
 extern void Blt_Ps_XSetStipple(Blt_Ps ps, Display *display, Pixmap bitmap);
 
diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C
index d0ddb8d..d0e1a61 100644
--- a/src/bltGrPenLine.C
+++ b/src/bltGrPenLine.C
@@ -377,7 +377,7 @@ int LinePen::configure()
 
     if (LineIsDashed(ops->traceDashes)) {
       ops->traceDashes.offset = ops->traceDashes.values[0] / 2;
-      Blt_SetDashes(graphPtr_->display_, newGC, &ops->traceDashes);
+      graphPtr_->setDashes(newGC, &ops->traceDashes);
     }
     traceGC_ = newGC;
   }
diff --git a/src/bltGrPenLine.h b/src/bltGrPenLine.h
index d2077ec..6d1738e 100644
--- a/src/bltGrPenLine.h
+++ b/src/bltGrPenLine.h
@@ -63,7 +63,7 @@ typedef struct {
 
   Symbol symbol;
   int traceWidth;
-  Blt_Dashes traceDashes;
+  Dashes traceDashes;
   XColor* traceColor;
   XColor* traceOffColor;
 } LinePenOptions;
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 8c1e00e..2d1f821 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -1482,7 +1482,7 @@ void Graph::freePrivateGC(GC gc)
   XFreeGC(display_, gc);
 }
 
-void Graph::setDashes(GC gc, Blt_Dashes *dashesPtr)
+void Graph::setDashes(GC gc, Dashes* dashesPtr)
 {
   XSetDashes(display_, gc, dashesPtr->offset, (const char*)dashesPtr->values,
 	     (int)strlen((char*)dashesPtr->values));
diff --git a/src/bltGraph.h b/src/bltGraph.h
index a7f0c78..c47e294 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -258,7 +258,7 @@ class Graph : public Pick {
   void printSegments(Blt_Ps, Segment2d*, int);
   void printPolyline(Blt_Ps, Point2d*, int);
   void printMaxPolyline(Blt_Ps, Point2d*, int);
-  void setDashes(GC, Blt_Dashes*);
+  void setDashes(GC, Dashes*);
 
   GC getPrivateGC(unsigned long, XGCValues*);
   void freePrivateGC(GC);