*** empty log message ***

4 files changed, 5 insertions, 43 deletions

diff --git a/src/bltGrElemOp.C b/src/bltGrElemOp.C
index 7d1674e..b5e8537 100644
--- a/src/bltGrElemOp.C
+++ b/src/bltGrElemOp.C
@@ -556,16 +556,8 @@ static int TypeOp(Graph* graphPtr, Tcl_Interp* interp,
   if (Blt_GetElement(interp, graphPtr, objv[3], &elemPtr) != TCL_OK)
     return TCL_ERROR;
 
-  switch (elemPtr->classId()) {
-  case CID_ELEM_BAR:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "bar", -1);
-    return TCL_OK;
-  case CID_ELEM_LINE:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "line", -1);
-    return TCL_OK;
-  default:
-    return TCL_ERROR;
-  }
+  Tcl_SetStringObj(Tcl_GetObjResult(interp), elemPtr->typeName(), -1);
+  return TCL_OK;
 }
 
 static Blt_OpSpec elemOps[] = {
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 8f99799..a165aed 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -418,26 +418,8 @@ static int TypeOp(Graph* graphPtr, Tcl_Interp* interp,
   if (GetMarkerFromObj(interp, graphPtr, objv[3], &markerPtr) != TCL_OK)
     return TCL_ERROR;
 
-  switch (markerPtr->classId()) {
-  case CID_MARKER_BITMAP:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "bitmap", -1);
-    return TCL_OK;
-  case CID_MARKER_LINE:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "line", -1);
-    return TCL_OK;
-  case CID_MARKER_POLYGON:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "polygon", -1);
-    return TCL_OK;
-  case CID_MARKER_TEXT:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "text", -1);
-    return TCL_OK;
-  case CID_MARKER_WINDOW:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), "window", -1);
-    return TCL_OK;
-  default:
-  Tcl_SetStringObj(Tcl_GetObjResult(interp), "unknown", -1);
-    return TCL_OK;
-  }
+  Tcl_SetStringObj(Tcl_GetObjResult(interp), markerPtr->typeName(), -1);
+  return TCL_OK;
 }
 
 static Blt_OpSpec markerOps[] =
diff --git a/src/bltGrPenOp.C b/src/bltGrPenOp.C
index 786c461..b10f95a 100644
--- a/src/bltGrPenOp.C
+++ b/src/bltGrPenOp.C
@@ -255,8 +255,7 @@ static int TypeOp(Tcl_Interp* interp, Graph* graphPtr,
   if (GetPenFromObj(interp, graphPtr, objv[3], &penPtr) != TCL_OK)
     return TCL_ERROR;
 
-  Tcl_SetStringObj(Tcl_GetObjResult(interp), 
-		   Blt_GraphClassName(penPtr->classId()), -1);
+  Tcl_SetStringObj(Tcl_GetObjResult(interp), penPtr->typeName(), -1);
   return TCL_OK;
 }
 
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 6b3c382..9055d56 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -969,17 +969,6 @@ void Blt_GraphTags(Blt_BindTable table, ClientData object, ClientData context,
       if (ops->tags)
 	for (const char** p = ops->tags; *p != NULL; p++)
 	  Blt_List_Append(list, (const char*)(*tagProc)(graphPtr, *p), 0);
-
-
-      /*
-      GraphObj* graphObjPtr = (GraphObj*)object;
-      MakeTagProc* tagProc = Blt_MakeElementTag;
-      Blt_List_Append(list, (const char*)(*tagProc)(graphPtr, graphObjPtr->name), 0);
-      Blt_List_Append(list, (const char*)(*tagProc)(graphPtr, graphObjPtr->className), 0);
-      if (graphObjPtr->tags)
-	for (const char** p = graphObjPtr->tags; *p != NULL; p++)
-	  Blt_List_Append(list, (const char*)(*tagProc)(graphPtr, *p), 0);
-      */
     }
     break;
   case CID_AXIS_X: