*** empty log message ***

11 files changed, 88 insertions, 88 deletions

diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C
index 370e5c8..6648aef 100644
--- a/bltGrMarkerBitmap.C
+++ b/bltGrMarkerBitmap.C
@@ -37,7 +37,7 @@ extern "C" {
 
 using namespace Blt;
 
-BitmapMarker::BitmapMarker() : BltMarker()
+BitmapMarker::BitmapMarker() : Marker()
 {
   anchorPt.x =0;
   anchorPt.y =0;
@@ -116,7 +116,7 @@ static MarkerClass bitmapMarkerClass = {
   BitmapToPostscriptProc,
 };
 
-BltMarker* Blt_CreateBitmapProc(Graph* graphPtr)
+Marker* Blt_CreateBitmapProc(Graph* graphPtr)
 {
   BitmapMarker* bmPtr = (BitmapMarker*)calloc(1, sizeof(BitmapMarker));
   bmPtr->classPtr = &bitmapMarkerClass;
@@ -124,10 +124,10 @@ BltMarker* Blt_CreateBitmapProc(Graph* graphPtr)
 
   bmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
-  return (BltMarker*)bmPtr;
+  return (Marker*)bmPtr;
 }
 
-static int ConfigureBitmapProc(BltMarker* markerPtr)
+static int ConfigureBitmapProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
@@ -175,7 +175,7 @@ static int ConfigureBitmapProc(BltMarker* markerPtr)
   return TCL_OK;
 }
 
-static void MapBitmapProc(BltMarker* markerPtr)
+static void MapBitmapProc(Marker* markerPtr)
 {
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
   BitmapMarkerOptions* ops = (BitmapMarkerOptions*)bmPtr->ops;
@@ -235,7 +235,7 @@ static void MapBitmapProc(BltMarker* markerPtr)
     bmPtr->nOutlinePts = nn;
 }
 
-static int PointInBitmapProc(BltMarker* markerPtr, Point2d *samplePtr)
+static int PointInBitmapProc(Marker* markerPtr, Point2d *samplePtr)
 {
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
   BitmapMarkerOptions* ops = (BitmapMarkerOptions*)bmPtr->ops;
@@ -249,7 +249,7 @@ static int PointInBitmapProc(BltMarker* markerPtr, Point2d *samplePtr)
 	  (samplePtr->y < (bmPtr->anchorPt.y + bmPtr->height)));
 }
 
-static int RegionInBitmapProc(BltMarker* markerPtr, Region2d *extsPtr, 
+static int RegionInBitmapProc(Marker* markerPtr, Region2d *extsPtr, 
 			      int enclosed)
 {
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
@@ -267,7 +267,7 @@ static int RegionInBitmapProc(BltMarker* markerPtr, Region2d *extsPtr,
 	   ((bmPtr->anchorPt.y + bmPtr->height) <= extsPtr->top));
 }
 
-static void DrawBitmapProc(BltMarker* markerPtr, Drawable drawable)
+static void DrawBitmapProc(Marker* markerPtr, Drawable drawable)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
@@ -290,7 +290,7 @@ static void DrawBitmapProc(BltMarker* markerPtr, Drawable drawable)
 	     bmPtr->anchorPt.y, 1);
 }
 
-static void BitmapToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
+static void BitmapToPostscriptProc(Marker* markerPtr, Blt_Ps ps)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
@@ -319,7 +319,7 @@ static void BitmapToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
 		   "grestore\n", (char*)NULL);
 }
 
-static void FreeBitmapProc(BltMarker* markerPtr)
+static void FreeBitmapProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   BitmapMarker* bmPtr = (BitmapMarker*)markerPtr;
diff --git a/bltGrMarkerBitmap.h b/bltGrMarkerBitmap.h
index 2341807..3daa94c 100644
--- a/bltGrMarkerBitmap.h
+++ b/bltGrMarkerBitmap.h
@@ -51,7 +51,7 @@ typedef struct {
   XColor* outlineColor;
 } BitmapMarkerOptions;
 
-class BitmapMarker : public BltMarker {
+class BitmapMarker : public Marker {
  public:
   Point2d anchorPt;
   GC gc;
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index dbe5529..ab2af75 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -49,7 +49,7 @@ extern MarkerCreateProc Blt_CreateWindowProc;
 
 #define NORMALIZE(A,x) 	(((x) - (A)->axisRange.min) * (A)->axisRange.scale)
 
-BltMarker::BltMarker()
+Marker::Marker()
 {
   /*
   obj.classId = CID_NONE;
@@ -67,7 +67,7 @@ BltMarker::BltMarker()
   */
 }
 
-Blt::BltMarker::~BltMarker()
+Marker::~Marker()
 {
 }
 
@@ -80,12 +80,12 @@ typedef int (GraphMarkerProc)(Graph* graphPtr, Tcl_Interp* interp, int objc,
 			      Tcl_Obj* const objv[]);
 
 static int MarkerObjConfigure( Tcl_Interp* interp, Graph* graphPtr,
-			       BltMarker* markerPtr,
+			       Marker* markerPtr,
 			       int objc, Tcl_Obj* const objv[]);
-static void DestroyMarker(BltMarker* markerPtr);
+static void DestroyMarker(Marker* markerPtr);
 static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr, 
-			    Tcl_Obj* objPtr, BltMarker** markerPtrPtr);
-static int IsElementHidden(BltMarker* markerPtr);
+			    Tcl_Obj* objPtr, Marker** markerPtrPtr);
+static int IsElementHidden(Marker* markerPtr);
 
 extern "C" {
   void Blt_DestroyMarkers(Graph* graphPtr);
@@ -276,7 +276,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
   }
 
   const char* type = Tcl_GetString(objv[3]);
-  Blt::BltMarker* markerPtr;
+  Marker* markerPtr;
   if (!strcmp(type, "text")) {
     markerPtr = Blt_CreateTextProc(graphPtr);
     Blt_GraphSetObjectClass(&markerPtr->obj, CID_MARKER_TEXT);
@@ -320,7 +320,7 @@ static int CreateMarker(Graph* graphPtr, Tcl_Interp* interp,
   return TCL_OK;
 }
 
-static void DestroyMarker(BltMarker* markerPtr)
+static void DestroyMarker(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
@@ -353,7 +353,7 @@ static void DestroyMarker(BltMarker* markerPtr)
 static int CgetOp(Graph* graphPtr, Tcl_Interp* interp, 
 		  int objc, Tcl_Obj* const objv[])
 {
-  BltMarker* markerPtr;
+  Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
 
@@ -370,7 +370,7 @@ static int CgetOp(Graph* graphPtr, Tcl_Interp* interp,
 static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp, 
 		       int objc, Tcl_Obj* const objv[])
 {
-  BltMarker* markerPtr;
+  Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
 
@@ -390,7 +390,7 @@ static int ConfigureOp(Graph* graphPtr, Tcl_Interp* interp,
 }
 
 static int MarkerObjConfigure( Tcl_Interp* interp, Graph* graphPtr,
-			       BltMarker* markerPtr,
+			       Marker* markerPtr,
 			       int objc, Tcl_Obj* const objv[])
 {
   Tk_SavedOptions savedOptions;
@@ -471,7 +471,7 @@ static int DeleteOp(Graph* graphPtr, Tcl_Interp* interp,
 		    int objc, Tcl_Obj* const objv[])
 {
   for (int ii=3; ii<objc; ii++) {
-    BltMarker* markerPtr;
+    Marker* markerPtr;
     if (GetMarkerFromObj(NULL, graphPtr, objv[ii], &markerPtr) != TCL_OK) {
       Tcl_AppendResult(interp, "can't find marker \"", 
 		       Tcl_GetString(objv[ii]), "\" in \"", 
@@ -543,7 +543,7 @@ static int FindOp(Graph* graphPtr, Tcl_Interp* interp,
   int enclosed = (mode == FIND_ENCLOSED);
   for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
        link; link = Blt_Chain_NextLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
     if ((markerPtr->flags & DELETE_PENDING) || ops->hide) {
       continue;
@@ -567,7 +567,7 @@ static int GetOp(Graph* graphPtr, Tcl_Interp* interp,
 {
   const char* string = Tcl_GetString(objv[3]);
   if (!strcmp(string, "current")) {
-    BltMarker* markerPtr = (BltMarker*)Blt_GetCurrentItem(graphPtr->bindTable);
+    Marker* markerPtr = (Marker*)Blt_GetCurrentItem(graphPtr->bindTable);
 
     if (markerPtr == NULL)
       return TCL_OK;
@@ -588,7 +588,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
   if (objc == 3) {
     for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList); 
 	 link; link = Blt_Chain_NextLink(link)) {
-      BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+      Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
       Tcl_ListObjAppendElement(interp, listObjPtr,
 			       Tcl_NewStringObj(markerPtr->obj.name, -1));
     }
@@ -596,7 +596,7 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
   else {
     for (Blt_ChainLink link=Blt_Chain_FirstLink(graphPtr->markers.displayList); 
 	 link; link = Blt_Chain_NextLink(link)) {
-      BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+      Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
       for (int ii = 3; ii<objc; ii++) {
 	const char* pattern = (const char*)Tcl_GetString(objv[ii]);
 	if (Tcl_StringMatch(markerPtr->obj.name, pattern)) {
@@ -615,12 +615,12 @@ static int NamesOp(Graph* graphPtr, Tcl_Interp* interp,
 static int RelinkOp(Graph* graphPtr, Tcl_Interp* interp, 
 		    int objc, Tcl_Obj* const objv[])
 {
-  BltMarker* markerPtr;
+  Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
   MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
 
-  BltMarker* placePtr =NULL;
+  Marker* placePtr =NULL;
   if (objc == 5)
     if (GetMarkerFromObj(interp, graphPtr, objv[4], &placePtr) != TCL_OK)
       return TCL_ERROR;
@@ -646,7 +646,7 @@ static int RelinkOp(Graph* graphPtr, Tcl_Interp* interp,
 static int TypeOp(Graph* graphPtr, Tcl_Interp* interp, 
 		  int objc, Tcl_Obj* const objv[])
 {
-  BltMarker* markerPtr;
+  Marker* markerPtr;
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
 
@@ -701,7 +701,7 @@ int Blt_MarkerOp(Graph* graphPtr, Tcl_Interp* interp,
 
 // Support
 
-static int IsElementHidden(BltMarker* markerPtr)
+static int IsElementHidden(Marker* markerPtr)
 {
   Tcl_HashEntry *hPtr;
   Graph* graphPtr = markerPtr->obj.graphPtr;
@@ -780,12 +780,12 @@ Point2d Blt_MapPoint(Point2d *pointPtr, Axis2d *axesPtr)
 }
 
 static int GetMarkerFromObj(Tcl_Interp* interp, Graph* graphPtr, 
-			    Tcl_Obj *objPtr, BltMarker** markerPtrPtr)
+			    Tcl_Obj *objPtr, Marker** markerPtrPtr)
 {
   const char* string = Tcl_GetString(objPtr);
   Tcl_HashEntry* hPtr = Tcl_FindHashEntry(&graphPtr->markers.table, string);
   if (hPtr) {
-    *markerPtrPtr = (BltMarker*)Tcl_GetHashValue(hPtr);
+    *markerPtrPtr = (Marker*)Tcl_GetHashValue(hPtr);
     return TCL_OK;
   }
   if (interp) {
@@ -800,7 +800,7 @@ void Blt_MarkersToPostScript(Graph* graphPtr, Blt_Ps ps, int under)
 {
   for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList); 
        link; link = Blt_Chain_PrevLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
     if (markerPtr->classPtr->postscriptProc == NULL)
       continue;
@@ -824,7 +824,7 @@ void Blt_DrawMarkers(Graph* graphPtr, Drawable drawable, int under)
 {
   for (Blt_ChainLink link = Blt_Chain_LastLink(graphPtr->markers.displayList); 
        link; link = Blt_Chain_PrevLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
 
     if ((ops->drawUnder != under) ||
@@ -844,7 +844,7 @@ void Blt_ConfigureMarkers(Graph* graphPtr)
 {
   for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     (*markerPtr->classPtr->configProc)(markerPtr);
   }
 }
@@ -853,7 +853,7 @@ void Blt_MapMarkers(Graph* graphPtr)
 {
   for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList); 
        link; link = Blt_Chain_NextLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
 
     if ((markerPtr->flags & DELETE_PENDING) || ops->hide)
@@ -871,7 +871,7 @@ void Blt_DestroyMarkers(Graph* graphPtr)
   Tcl_HashSearch iter;
   for (Tcl_HashEntry* hPtr=Tcl_FirstHashEntry(&graphPtr->markers.table, &iter); 
        hPtr; hPtr = Tcl_NextHashEntry(&iter)) {
-    BltMarker* markerPtr = (BltMarker*)Tcl_GetHashValue(hPtr);
+    Marker* markerPtr = (Marker*)Tcl_GetHashValue(hPtr);
 
     // Dereferencing the pointer to the hash table prevents the hash table
     // entry from being automatically deleted.
@@ -890,7 +890,7 @@ void* Blt_NearestMarker(Graph* graphPtr, int x, int y, int under)
   point.y = (double)y;
   for (Blt_ChainLink link = Blt_Chain_FirstLink(graphPtr->markers.displayList);
        link; link = Blt_Chain_NextLink(link)) {
-    BltMarker* markerPtr = (BltMarker*)Blt_Chain_GetValue(link);
+    Marker* markerPtr = (Marker*)Blt_Chain_GetValue(link);
     MarkerOptions* ops = (MarkerOptions*)markerPtr->ops;
 
     if ((markerPtr->flags & (DELETE_PENDING|MAP_ITEM)) || 
@@ -917,7 +917,7 @@ ClientData Blt_MakeMarkerTag(Graph* graphPtr, const char* tagName)
 
 void Blt_FreeMarker(char* dataPtr) 
 {
-  BltMarker* markerPtr = (BltMarker*)dataPtr;
+  Marker* markerPtr = (Marker*)dataPtr;
   DestroyMarker(markerPtr);
 }
 
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index 3304176..8a6e653 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -33,16 +33,16 @@
 #define MAX_OUTLINE_POINTS	12
 
 namespace Blt {
-  class BltMarker;
+  class Marker;
 
-typedef BltMarker* (MarkerCreateProc)(Graph*);
-typedef void (MarkerDrawProc)(BltMarker* markerPtr, Drawable drawable);
-typedef void (MarkerFreeProc)(BltMarker* markerPtr);
-typedef int (MarkerConfigProc)(BltMarker* markerPtr);
-typedef void (MarkerMapProc)(BltMarker* markerPtr);
-typedef void (MarkerPostscriptProc)(BltMarker* markerPtr, Blt_Ps ps);
-typedef int (MarkerPointProc)(BltMarker* markerPtr, Point2d *samplePtr);
-typedef int (MarkerRegionProc)(BltMarker* markerPtr, Region2d *extsPtr, int enclosed);
+typedef Marker* (MarkerCreateProc)(Graph*);
+typedef void (MarkerDrawProc)(Marker* markerPtr, Drawable drawable);
+typedef void (MarkerFreeProc)(Marker* markerPtr);
+typedef int (MarkerConfigProc)(Marker* markerPtr);
+typedef void (MarkerMapProc)(Marker* markerPtr);
+typedef void (MarkerPostscriptProc)(Marker* markerPtr, Blt_Ps ps);
+typedef int (MarkerPointProc)(Marker* markerPtr, Point2d *samplePtr);
+typedef int (MarkerRegionProc)(Marker* markerPtr, Region2d *extsPtr, int enclosed);
 
 typedef struct {
   Tk_OptionSpec *optionSpecs;
@@ -72,7 +72,7 @@ typedef struct {
   int yOffset;
 } MarkerOptions;
 
- class BltMarker {
+ class Marker {
  public:
    GraphObj obj;
    MarkerClass *classPtr;
@@ -85,8 +85,8 @@ typedef struct {
    void* ops;
 
  public:
-   BltMarker();
-   virtual ~BltMarker();
+   Marker();
+   virtual ~Marker();
  };
 
 };
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index 1cbfda5..1bfd652 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -37,7 +37,7 @@ extern "C" {
 
 using namespace Blt;
 
-LineMarker::LineMarker() : BltMarker()
+LineMarker::LineMarker() : Marker()
 {
   /*
   gc =NULL;
@@ -121,7 +121,7 @@ static MarkerClass lineMarkerClass = {
   LineToPostscriptProc,
 };
 
-BltMarker* Blt_CreateLineProc(Graph* graphPtr)
+Marker* Blt_CreateLineProc(Graph* graphPtr)
 {
   LineMarker* lmPtr = (LineMarker*)calloc(1, sizeof(LineMarker));
 
@@ -132,10 +132,10 @@ BltMarker* Blt_CreateLineProc(Graph* graphPtr)
   ops->xorr = FALSE;
   lmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
-  return (BltMarker*)lmPtr;
+  return (Marker*)lmPtr;
 }
 
-static int PointInLineProc(BltMarker* markerPtr, Point2d *samplePtr)
+static int PointInLineProc(Marker* markerPtr, Point2d *samplePtr)
 {
   LineMarker *lmPtr = (LineMarker*)markerPtr;
 
@@ -143,7 +143,7 @@ static int PointInLineProc(BltMarker* markerPtr, Point2d *samplePtr)
 			     (double)markerPtr->obj.graphPtr->search.halo);
 }
 
-static int RegionInLineProc(BltMarker* markerPtr, Region2d *extsPtr, int enclosed)
+static int RegionInLineProc(Marker* markerPtr, Region2d *extsPtr, int enclosed)
 {
   LineMarker *lmPtr = (LineMarker*)markerPtr;
   LineMarkerOptions* ops = (LineMarkerOptions*)lmPtr->ops;
@@ -179,7 +179,7 @@ static int RegionInLineProc(BltMarker* markerPtr, Region2d *extsPtr, int enclose
   }
 }
 
-static void DrawLineProc(BltMarker* markerPtr, Drawable drawable)
+static void DrawLineProc(Marker* markerPtr, Drawable drawable)
 {
   LineMarker *lmPtr = (LineMarker*)markerPtr;
   LineMarkerOptions* ops = (LineMarkerOptions*)lmPtr->ops;
@@ -194,7 +194,7 @@ static void DrawLineProc(BltMarker* markerPtr, Drawable drawable)
   }
 }
 
-static int ConfigureLineProc(BltMarker* markerPtr)
+static int ConfigureLineProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   LineMarker *lmPtr = (LineMarker*)markerPtr;
@@ -252,7 +252,7 @@ static int ConfigureLineProc(BltMarker* markerPtr)
   return TCL_OK;
 }
 
-static void LineToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
+static void LineToPostscriptProc(Marker* markerPtr, Blt_Ps ps)
 {
   LineMarker *lmPtr = (LineMarker*)markerPtr;
   LineMarkerOptions* ops = (LineMarkerOptions*)lmPtr->ops;
@@ -280,7 +280,7 @@ static void LineToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
   }
 }
 
-static void FreeLineProc(BltMarker* markerPtr)
+static void FreeLineProc(Marker* markerPtr)
 {
   LineMarker *lmPtr = (LineMarker*)markerPtr;
   Graph* graphPtr = markerPtr->obj.graphPtr;
@@ -296,7 +296,7 @@ static void FreeLineProc(BltMarker* markerPtr)
     free(ops);
 }
 
-static void MapLineProc(BltMarker* markerPtr)
+static void MapLineProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   LineMarker *lmPtr = (LineMarker*)markerPtr;
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index cfc3f35..1c0bfca 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -54,7 +54,7 @@ typedef struct {
   int xorr;
 } LineMarkerOptions;
 
-class LineMarker : public BltMarker {
+class LineMarker : public Marker {
  public:
   GC gc;
   Segment2d* segments;
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index 73a298f..316d1e9 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -37,7 +37,7 @@ extern "C" {
 
 using namespace Blt;
 
-PolygonMarker::PolygonMarker() : BltMarker()
+PolygonMarker::PolygonMarker() : Marker()
 {
   screenPts =NULL;
   outlineGC =NULL;
@@ -131,7 +131,7 @@ static MarkerClass polygonMarkerClass = {
   PolygonToPostscriptProc,
 };
 
-BltMarker* Blt_CreatePolygonProc(Graph* graphPtr)
+Marker* Blt_CreatePolygonProc(Graph* graphPtr)
 {
   PolygonMarker* pmPtr = (PolygonMarker*)calloc(1, sizeof(PolygonMarker));
   pmPtr->classPtr = &polygonMarkerClass;
@@ -139,10 +139,10 @@ BltMarker* Blt_CreatePolygonProc(Graph* graphPtr)
 
   pmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
-  return (BltMarker*)pmPtr;
+  return (Marker*)pmPtr;
 }
 
-static int PointInPolygonProc(BltMarker* markerPtr, Point2d *samplePtr)
+static int PointInPolygonProc(Marker* markerPtr, Point2d *samplePtr)
 {
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
   PolygonMarkerOptions* ops = (PolygonMarkerOptions*)pmPtr->ops;
@@ -156,7 +156,7 @@ static int PointInPolygonProc(BltMarker* markerPtr, Point2d *samplePtr)
   return FALSE;
 }
 
-static int RegionInPolygonProc(BltMarker* markerPtr, Region2d *extsPtr, 
+static int RegionInPolygonProc(Marker* markerPtr, Region2d *extsPtr, 
 			       int enclosed)
 {
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
@@ -171,7 +171,7 @@ static int RegionInPolygonProc(BltMarker* markerPtr, Region2d *extsPtr,
   return FALSE;
 }
 
-static void DrawPolygonProc(BltMarker* markerPtr, Drawable drawable)
+static void DrawPolygonProc(Marker* markerPtr, Drawable drawable)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
@@ -204,7 +204,7 @@ static void DrawPolygonProc(BltMarker* markerPtr, Drawable drawable)
   }
 }
 
-static void PolygonToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
+static void PolygonToPostscriptProc(Marker* markerPtr, Blt_Ps ps)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
@@ -268,7 +268,7 @@ static void PolygonToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
   }
 }
 
-static int ConfigurePolygonProc(BltMarker* markerPtr)
+static int ConfigurePolygonProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
@@ -354,7 +354,7 @@ static int ConfigurePolygonProc(BltMarker* markerPtr)
   return TCL_OK;
 }
 
-static void FreePolygonProc(BltMarker* markerPtr)
+static void FreePolygonProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
@@ -379,7 +379,7 @@ static void FreePolygonProc(BltMarker* markerPtr)
     free(ops);
 }
 
-static void MapPolygonProc(BltMarker* markerPtr)
+static void MapPolygonProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   PolygonMarker *pmPtr = (PolygonMarker *)markerPtr;
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 151e8b6..4eb5e29 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -57,7 +57,7 @@ typedef struct {
   int xorr;
 } PolygonMarkerOptions;
 
-class PolygonMarker : public BltMarker {
+class PolygonMarker : public Marker {
  public:
   Point2d *screenPts;
   GC outlineGC;
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index 676ea55..7532d5e 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -38,7 +38,7 @@ extern "C" {
 
 using namespace Blt;
 
-TextMarker::TextMarker() : BltMarker()
+TextMarker::TextMarker() : Marker()
 {
   anchorPt.x =0;
   anchorPt.y =0;
@@ -118,7 +118,7 @@ static MarkerClass textMarkerClass = {
   TextToPostscriptProc,
 };
 
-Blt::BltMarker* Blt_CreateTextProc(Graph* graphPtr)
+Blt::Marker* Blt_CreateTextProc(Graph* graphPtr)
 {
   TextMarker* tmPtr = (TextMarker*)calloc(1, sizeof(TextMarker));
   tmPtr->classPtr = &textMarkerClass;
@@ -128,10 +128,10 @@ Blt::BltMarker* Blt_CreateTextProc(Graph* graphPtr)
   Blt_Ts_InitStyle(ops->style);
   tmPtr->optionTable = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
-  return (Blt::BltMarker*)tmPtr;
+  return (Blt::Marker*)tmPtr;
 }
 
-static int ConfigureTextProc(BltMarker* markerPtr)
+static int ConfigureTextProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   TextMarker* tmPtr = (TextMarker*)markerPtr;
@@ -156,7 +156,7 @@ static int ConfigureTextProc(BltMarker* markerPtr)
   return TCL_OK;
 }
 
-static void MapTextProc(BltMarker* markerPtr)
+static void MapTextProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   TextMarker* tmPtr = (TextMarker*)markerPtr;
@@ -201,7 +201,7 @@ static void MapTextProc(BltMarker* markerPtr)
   tmPtr->anchorPt = anchorPt;
 }
 
-static int PointInTextProc(BltMarker* markerPtr, Point2d *samplePtr)
+static int PointInTextProc(Marker* markerPtr, Point2d *samplePtr)
 {
   TextMarker* tmPtr = (TextMarker*)markerPtr;
   TextMarkerOptions* ops = (TextMarkerOptions*)tmPtr->ops;
@@ -227,7 +227,7 @@ static int PointInTextProc(BltMarker* markerPtr, Point2d *samplePtr)
 	  (samplePtr->y < (tmPtr->anchorPt.y + tmPtr->height)));
 }
 
-static int RegionInTextProc(BltMarker* markerPtr, Region2d *extsPtr, int enclosed)
+static int RegionInTextProc(Marker* markerPtr, Region2d *extsPtr, int enclosed)
 {
   TextMarker* tmPtr = (TextMarker*)markerPtr;
   TextMarkerOptions* ops = (TextMarkerOptions*)tmPtr->ops;
@@ -255,7 +255,7 @@ static int RegionInTextProc(BltMarker* markerPtr, Region2d *extsPtr, int enclose
 	   ((tmPtr->anchorPt.y + tmPtr->height) <= extsPtr->top));
 }
 
-static void DrawTextProc(BltMarker* markerPtr, Drawable drawable) 
+static void DrawTextProc(Marker* markerPtr, Drawable drawable) 
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   TextMarker* tmPtr = (TextMarker*)markerPtr;
@@ -282,7 +282,7 @@ static void DrawTextProc(BltMarker* markerPtr, Drawable drawable)
 		  &ops->style, tmPtr->anchorPt.x, tmPtr->anchorPt.y);
 }
 
-static void TextToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
+static void TextToPostscriptProc(Marker* markerPtr, Blt_Ps ps)
 {
   TextMarker* tmPtr = (TextMarker*)markerPtr;
   TextMarkerOptions* ops = (TextMarkerOptions*)tmPtr->ops;
@@ -306,7 +306,7 @@ static void TextToPostscriptProc(BltMarker* markerPtr, Blt_Ps ps)
 		  tmPtr->anchorPt.x, tmPtr->anchorPt.y);
 }
 
-static void FreeTextProc(BltMarker* markerPtr)
+static void FreeTextProc(Marker* markerPtr)
 {
   Graph* graphPtr = markerPtr->obj.graphPtr;
   TextMarker* tmPtr = (TextMarker*)markerPtr;
diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h
index 5e7ed68..68aafe5 100644
--- a/src/bltGrMarkerText.h
+++ b/src/bltGrMarkerText.h
@@ -51,7 +51,7 @@ typedef struct {
   const char* string;
 } TextMarkerOptions;
 
-class TextMarker : public BltMarker {
+class TextMarker : public Marker {
  public:
   Point2d anchorPt;
   int width;
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 46396f2..806cf59 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -976,7 +976,7 @@ void Blt_GraphTags(Blt_BindTable table, ClientData object, ClientData context,
 {
   Graph* graphPtr = (Graph*)Blt_GetBindingData(table);
   GraphObj* graphObjPtr = (GraphObj*)object;
-  BltMarker* markerPtr = (BltMarker*)object;
+  Marker* markerPtr = (Marker*)object;
 
   MakeTagProc* tagProc;
   switch (graphObjPtr->classId) {
@@ -1063,7 +1063,7 @@ static ClientData PickEntry(ClientData clientData, int x, int y,
   // 1. markers drawn on top (-under false).
   // 2. elements using its display list back to front.
   // 3. markers drawn under element (-under true).
-  BltMarker* markerPtr = (BltMarker*)Blt_NearestMarker(graphPtr, x, y, FALSE);
+  Marker* markerPtr = (Marker*)Blt_NearestMarker(graphPtr, x, y, FALSE);
   if (markerPtr)
     return markerPtr;
 
@@ -1088,7 +1088,7 @@ static ClientData PickEntry(ClientData clientData, int x, int y,
   if (searchPtr->dist <= (double)searchPtr->halo)
     return searchPtr->elemPtr;
 
-  markerPtr = (BltMarker*)Blt_NearestMarker(graphPtr, x, y, TRUE);
+  markerPtr = (Marker*)Blt_NearestMarker(graphPtr, x, y, TRUE);
   if (markerPtr)
     return markerPtr;