*** empty log message ***

20 files changed, 34 insertions, 41 deletions

diff --git a/src/bltGrElem.C b/src/bltGrElem.C
index 78de714..76adf8d 100644
--- a/src/bltGrElem.C
+++ b/src/bltGrElem.C
@@ -34,7 +34,6 @@
 Element::Element(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
 {
   graphPtr_ = graphPtr;
-  classId_ = CID_NONE;
   name_ = dupstr(name);
   optionTable_ =NULL;
   ops_ =NULL;
diff --git a/src/bltGrElem.h b/src/bltGrElem.h
index 40032ba..02d19fa 100644
--- a/src/bltGrElem.h
+++ b/src/bltGrElem.h
@@ -115,7 +115,6 @@ typedef struct {
 class Element {
  public:
   Graph* graphPtr_;
-  ClassId classId_;
   const char* name_;
   Tk_OptionTable optionTable_;
   void* ops_;
@@ -151,10 +150,11 @@ class Element {
   virtual void printNormal(Blt_Ps) =0;
   virtual void printSymbol(Blt_Ps, double, double, int) =0;
 
-  ClassId classId() {return classId_;}
-  const char* name() {return name_;}
+  virtual ClassId classId() =0;
   virtual const char* className() =0;
-  Tk_OptionTable optionTable() {return optionTable();}
+
+  const char* name() {return name_;}
+  Tk_OptionTable optionTable() {return optionTable_;}
   void* ops() {return ops_;}
 };
 
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 533edd9..4537540 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -171,8 +171,6 @@ static Tk_OptionSpec optionSpecs[] = {
 BarElement::BarElement(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
   : Element(graphPtr, name, hPtr)
 {
-  classId_ = CID_ELEM_BAR;
-
   barToData_ =NULL;
   bars_ =NULL;
   activeToData_ =NULL;
diff --git a/src/bltGrElemBar.h b/src/bltGrElemBar.h
index e0d1675..87c3f28 100644
--- a/src/bltGrElemBar.h
+++ b/src/bltGrElemBar.h
@@ -109,6 +109,9 @@ class BarElement : public Element {
   BarElement(Graph*, const char*, Tcl_HashEntry*);
   virtual ~BarElement();
 
+  ClassId classId() {return CID_ELEM_BAR;}
+  const char* className() {return "BarElement";}
+
   int configure();
   void map();
   void extents(Region2d*);
@@ -119,8 +122,6 @@ class BarElement : public Element {
   void printActive(Blt_Ps);
   void printNormal(Blt_Ps);
   void printSymbol(Blt_Ps, double, double, int);
-
-  const char* className() {return "BarElement";}
 };
 
 #endif
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 9581695..cea00d7 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -230,8 +230,6 @@ static Tk_OptionSpec optionSpecs[] = {
 LineElement::LineElement(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
   : Element(graphPtr, name, hPtr)
 {
-  classId_ = CID_ELEM_LINE;
-
   smooth_ = PEN_SMOOTH_LINEAR;
   fillBgColor_ =NULL;
   fillGC_ = NULL;
diff --git a/src/bltGrElemLine.h b/src/bltGrElemLine.h
index 5afbe8f..bc96043 100644
--- a/src/bltGrElemLine.h
+++ b/src/bltGrElemLine.h
@@ -157,6 +157,9 @@ class LineElement : public Element {
   LineElement(Graph*, const char*, Tcl_HashEntry*);
   virtual ~LineElement();
 
+  ClassId classId() {return CID_ELEM_LINE;}
+  const char* className() {return "LineElement";}
+
   int configure();
   void map();
   void extents(Region2d*);
@@ -167,8 +170,6 @@ class LineElement : public Element {
   void printActive(Blt_Ps);
   void printNormal(Blt_Ps);
   void printSymbol(Blt_Ps, double, double, int);
-
-  const char* className() {return "LineElement";}
 };
 
 #endif
diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C
index 02e6f00..34a7f72 100644
--- a/src/bltGrMarker.C
+++ b/src/bltGrMarker.C
@@ -33,9 +33,7 @@ using namespace Blt;
 
 Marker::Marker(Graph* gPtr, const char* nPtr, Tcl_HashEntry* hPtr)
 {
-  classId_ =CID_NONE;
   name_ = dupstr(nPtr);
-  className_ =NULL;
   optionTable_ =NULL;
   ops_ =NULL;
   graphPtr_ =gPtr;  
@@ -50,9 +48,6 @@ Marker::~Marker()
 {
   Blt_DeleteBindings(graphPtr_->bindTable, this);
 
-  if (className_)
-    delete [] className_;
-
   if (name_)
     delete [] name_;
 
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index a3bcf29..ca1a732 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -61,9 +61,7 @@ namespace Blt {
   class Marker {
   protected:
     Graph* graphPtr_;
-    ClassId classId_;
     const char *name_;
-    const char *className_;
     Tk_OptionTable optionTable_;
     void* ops_;
     Tcl_HashEntry* hashPtr_;
@@ -94,9 +92,9 @@ namespace Blt {
     virtual int regionIn(Region2d*, int) =0;
     virtual void postscript(Blt_Ps) =0;
 
-    ClassId classId() {return classId_;}
+    virtual ClassId classId() =0;
+    virtual const char* className() =0;
     const char* name() {return name_;}
-    const char* className() {return className_;}
     Tk_OptionTable optionTable() {return optionTable_;}
     void* ops() {return ops_;}
     int clipped() {return clipped_;}
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index 744fb7d..a4338bd 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -85,8 +85,6 @@ static Tk_OptionSpec optionSpecs[] = {
 LineMarker::LineMarker(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) 
   : Marker(graphPtr, name, hPtr)
 {
-  classId_ = CID_MARKER_LINE;
-  className_ = dupstr("LineMarker");
   ops_ = (LineMarkerOptions*)calloc(1, sizeof(LineMarkerOptions));
   optionTable_ = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index 56c125e..1eadf71 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -73,6 +73,9 @@ namespace Blt {
   public:
     LineMarker(Graph*, const char*, Tcl_HashEntry*);
     virtual ~LineMarker();
+
+    ClassId classId() {return CID_MARKER_LINE;}
+    const char* className() {return "LineMarker";}
   };
 
 };
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index 70910f1..8b2c1da 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -92,8 +92,6 @@ PolygonMarker::PolygonMarker(Graph* graphPtr, const char* name,
 			     Tcl_HashEntry* hPtr) 
   : Marker(graphPtr, name, hPtr)
 {
-  classId_ = CID_MARKER_POLYGON;
-  className_ = dupstr("PolygonMarker");
   ops_ = (PolygonMarkerOptions*)calloc(1, sizeof(PolygonMarkerOptions));
   optionTable_ = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
 
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 721f10a..2e6c808 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -78,6 +78,9 @@ namespace Blt {
   public:
     PolygonMarker(Graph*, const char*, Tcl_HashEntry*);
     virtual ~PolygonMarker();
+
+    ClassId classId() {return CID_MARKER_POLYGON;}
+    const char* className() {return "PolygonMarker";}
   };
 
 };
diff --git a/src/bltGrMarkerText.C b/src/bltGrMarkerText.C
index 1b18b4b..db34af8 100644
--- a/src/bltGrMarkerText.C
+++ b/src/bltGrMarkerText.C
@@ -82,8 +82,6 @@ static Tk_OptionSpec optionSpecs[] = {
 TextMarker::TextMarker(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr) 
   : Marker(graphPtr, name, hPtr)
 {
-  classId_ = CID_MARKER_TEXT;
-  className_ = dupstr("TextMarker");
   ops_ = (TextMarkerOptions*)calloc(1, sizeof(TextMarkerOptions));
   Blt_Ts_InitStyle(((TextMarkerOptions*)ops_)->style);
   optionTable_ = Tk_CreateOptionTable(graphPtr->interp, optionSpecs);
diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h
index 0637755..ae8336c 100644
--- a/src/bltGrMarkerText.h
+++ b/src/bltGrMarkerText.h
@@ -70,6 +70,9 @@ namespace Blt {
   public:
     TextMarker(Graph*, const char*, Tcl_HashEntry*);
     virtual ~TextMarker();
+
+    ClassId classId() {return CID_MARKER_TEXT;}
+    const char* className() {return "TextMarker";}
   };
 
 };
diff --git a/src/bltGrPen.C b/src/bltGrPen.C
index 909cbc1..a8d4118 100644
--- a/src/bltGrPen.C
+++ b/src/bltGrPen.C
@@ -32,7 +32,6 @@
 Pen::Pen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
 {
   graphPtr_ = graphPtr;
-  classId_ = CID_NONE;
   name_ = dupstr(name);
   optionTable_ = NULL;
   ops_ = NULL;
diff --git a/src/bltGrPen.h b/src/bltGrPen.h
index cfb1876..bab919e 100644
--- a/src/bltGrPen.h
+++ b/src/bltGrPen.h
@@ -52,7 +52,6 @@ typedef struct {
 class Pen {
  public:
   Graph* graphPtr_;
-  ClassId classId_;
   const char *name_;
   Tk_OptionTable optionTable_;
   void* ops_;
@@ -66,12 +65,14 @@ class Pen {
   Pen(Graph*, const char*, Tcl_HashEntry*);
   virtual ~Pen();
 
-  virtual int configure() =0;
-  void* ops() {return ops_;}
-  Tk_OptionTable optionTable() {return optionTable_;}
-  const char* name() {return name_;}
+  virtual ClassId classId() =0;
   virtual const char* className() =0;
-  ClassId classId() {return classId_;}
+
+  const char* name() {return name_;}
+  Tk_OptionTable optionTable() {return optionTable_;}
+  void* ops() {return ops_;}
+
+  virtual int configure() =0;
 };
 
 #endif
diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C
index 751882e..bd472df 100644
--- a/src/bltGrPenBar.C
+++ b/src/bltGrPenBar.C
@@ -75,7 +75,6 @@ static Tk_OptionSpec barPenOptionSpecs[] = {
 BarPen::BarPen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
   : Pen(graphPtr, name, hPtr)
 {
-  classId_ = CID_ELEM_BAR;
   optionTable_ = Tk_CreateOptionTable(graphPtr_->interp, barPenOptionSpecs);
   ops_ = calloc(1, sizeof(BarPenOptions));
   manageOptions_ =1;
@@ -91,7 +90,6 @@ BarPen::BarPen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
 BarPen::BarPen(Graph* graphPtr, const char* name, void* options)
   : Pen(graphPtr, name, NULL)
 {
-  classId_ = CID_ELEM_BAR;
   optionTable_ = Tk_CreateOptionTable(graphPtr_->interp, barPenOptionSpecs);
   ops_ = options;
   manageOptions_ =0;
diff --git a/src/bltGrPenBar.h b/src/bltGrPenBar.h
index 743c687..b5c61ff 100644
--- a/src/bltGrPenBar.h
+++ b/src/bltGrPenBar.h
@@ -64,8 +64,10 @@ class BarPen : public Pen {
   BarPen(Graph*, const char*, void*);
   virtual ~BarPen();
 
-  int configure();
+  ClassId classId() {return CID_ELEM_BAR;}
   const char* className() {return "BarElement";}
+
+  int configure();
 };
 
 #endif
diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C
index 1e4ca1d..ddc11b6 100644
--- a/src/bltGrPenLine.C
+++ b/src/bltGrPenLine.C
@@ -216,7 +216,6 @@ static Tk_OptionSpec linePenOptionSpecs[] = {
 LinePen::LinePen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
   : Pen(graphPtr, name, hPtr)
 {
-  classId_ = CID_ELEM_LINE;
   optionTable_ = Tk_CreateOptionTable(graphPtr_->interp, linePenOptionSpecs);
   ops_ = calloc(1, sizeof(LinePenOptions));
   manageOptions_ =1;
@@ -234,7 +233,6 @@ LinePen::LinePen(Graph* graphPtr, const char* name, Tcl_HashEntry* hPtr)
 LinePen::LinePen(Graph* graphPtr, const char* name, void* options)
   : Pen(graphPtr, name, NULL)
 {
-  classId_ = CID_ELEM_LINE;
   optionTable_ = Tk_CreateOptionTable(graphPtr_->interp, linePenOptionSpecs);
   ops_ = options;
   manageOptions_ =0;
diff --git a/src/bltGrPenLine.h b/src/bltGrPenLine.h
index cc942f6..9701fb8 100644
--- a/src/bltGrPenLine.h
+++ b/src/bltGrPenLine.h
@@ -83,8 +83,10 @@ class LinePen : public Pen {
   LinePen(Graph*, const char*, void*);
   virtual ~LinePen();
 
-  int configure();
+  ClassId classId() {return CID_ELEM_LINE;}
   const char* className() {return "LineElement";}
+
+  int configure();
 };
 
 extern Tk_ObjCustomOption symbolObjOption;