*** empty log message ***

10 files changed, 4 insertions, 63 deletions

diff --git a/src/bltGrHairsOp.C b/src/bltGrHairsOp.C
index af3e0ec..9a07ee7 100644
--- a/src/bltGrHairsOp.C
+++ b/src/bltGrHairsOp.C
@@ -58,7 +58,7 @@ static int CrosshairsObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
       Tk_RestoreSavedOptions(&savedOptions);
     }
 
-    graphPtr->flags |= mask;
+    //    graphPtr->flags |= mask;
     chPtr->configure();
 
     break; 
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index b4772bf..9a38da4 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -68,7 +68,7 @@ static int LegendObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
       Tk_RestoreSavedOptions(&savedOptions);
     }
 
-    graphPtr->flags |= mask;
+    //    graphPtr->flags |= mask;
     graphPtr->flags |= (RESET_WORLD | CACHE_DIRTY);
     legendPtr->configure();
     graphPtr->eventuallyRedraw();
diff --git a/src/bltGrMarkerOp.C b/src/bltGrMarkerOp.C
index 92b2c08..dcd6112 100644
--- a/src/bltGrMarkerOp.C
+++ b/src/bltGrMarkerOp.C
@@ -73,7 +73,7 @@ static int MarkerObjConfigure( Graph* graphPtr,Marker* markerPtr,
       Tk_RestoreSavedOptions(&savedOptions);
     }
 
-    markerPtr->flags |= mask;
+    //    markerPtr->flags |= mask;
     markerPtr->flags |= MAP_ITEM;
     graphPtr->flags |= CACHE_DIRTY;
     if (markerPtr->configure() != TCL_OK)
diff --git a/src/bltGraph.C b/src/bltGraph.C
index d662cd2..613cb9e 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -355,8 +355,6 @@ void Graph::draw()
 
   flags &= ~MAP_WORLD;
   flags &= ~REDRAW_WORLD;
-
-  updateMarginTraces();
 }
 
 int Graph::print(const char *ident, Blt_Ps ps)
@@ -614,29 +612,6 @@ void Graph::printMargins(Blt_Ps ps)
   }
 }
 
-void Graph::updateMarginTraces()
-{
-  GraphOptions* ops = (GraphOptions*)ops_;
-
-  Margin* marginPtr;
-  Margin* endPtr;
-  for (marginPtr = ops->margins, endPtr = marginPtr + 4; 
-       marginPtr < endPtr; marginPtr++) {
-    if (marginPtr->varName) {
-      int size;
-      if ((marginPtr->site == MARGIN_LEFT) || (marginPtr->site == MARGIN_RIGHT))
-	size = marginPtr->width;
-      else
-	size = marginPtr->height;
-
-      ostringstream str;
-      str << size << ends;
-      Tcl_SetVar(interp_, marginPtr->varName, str.str().c_str(),
-		 TCL_GLOBAL_ONLY);
-    }
-  }
-}
-
 // Crosshairs
 
 void Graph::enableCrosshairs()
diff --git a/src/bltGraph.h b/src/bltGraph.h
index b00574c..99b86c3 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -82,7 +82,6 @@ typedef struct {
   short int maxTickHeight;
   unsigned int nAxes;
   Blt_Chain axes;
-  const char *varName;
   int reqSize;
   int site;
 } Margin;
@@ -179,7 +178,6 @@ class Graph {
   
   void drawMargins(Drawable);
   void printMargins(Blt_Ps);
-  void updateMarginTraces();
   int getMarginGeometry(Margin*);
 
   void destroyPens();
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index d50f94b..a97ae0c 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -91,9 +91,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-bottommargin", "bottomMargin", "BottomMargin",
    "0", -1, Tk_Offset(BarGraphOptions, bottomMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-bottomvariable", "bottomVariable", "BottomVariable",
-   NULL, -1, Tk_Offset(BarGraphOptions, bottomMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", 
    "crosshair", -1, Tk_Offset(BarGraphOptions, cursor), 
    TK_OPTION_NULL_OK, NULL, 0},
@@ -130,9 +127,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin", 
    "0", -1, Tk_Offset(BarGraphOptions, leftMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-leftvariable", "leftVariable", "LeftVariable",
-   NULL, -1, Tk_Offset(BarGraphOptions, leftMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, -1, 0, 0, "-leftmargin", 0},
   {TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground",
    STD_NORMAL_BACKGROUND, -1, Tk_Offset(BarGraphOptions, plotBg), 0, NULL,
@@ -154,9 +148,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin", 
    "0", -1, Tk_Offset(BarGraphOptions, rightMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-rightvariable", "rightVariable", "RightVariable",
-   NULL, -1, Tk_Offset(BarGraphOptions, rightMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0},
   {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", 
    "2m", -1, Tk_Offset(BarGraphOptions, search.halo), 0, NULL, 0},
@@ -177,9 +168,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin", 
    "0", -1, Tk_Offset(BarGraphOptions, topMargin.reqSize), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-topvariable", "topVariable", "TopVariable",
-   NULL, -1, Tk_Offset(BarGraphOptions, topMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_PIXELS, "-width", "width", "Width", 
    "5i", -1, Tk_Offset(BarGraphOptions, reqWidth), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C
index d0deac2..d999e3d 100644
--- a/src/bltGraphLine.C
+++ b/src/bltGraphLine.C
@@ -66,9 +66,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-bottommargin", "bottomMargin", "BottomMargin",
    "0", -1, Tk_Offset(LineGraphOptions, bottomMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-bottomvariable", "bottomVariable", "BottomVariable",
-   NULL, -1, Tk_Offset(LineGraphOptions, bottomMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor", 
    "crosshair", -1, Tk_Offset(LineGraphOptions, cursor), 
    TK_OPTION_NULL_OK, NULL, 0},
@@ -105,9 +102,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-leftmargin", "leftMargin", "Margin", 
    "0", -1, Tk_Offset(LineGraphOptions, leftMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-leftvariable", "leftVariable", "LeftVariable",
-   NULL, -1, Tk_Offset(LineGraphOptions, leftMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-lm", NULL, NULL, NULL, -1, 0, 0, "-leftmargin", 0},
   {TK_OPTION_BORDER, "-plotbackground", "plotbackground", "PlotBackground",
    STD_NORMAL_BACKGROUND, -1, Tk_Offset(LineGraphOptions, plotBg), 0, NULL,
@@ -129,9 +123,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-rightmargin", "rightMargin", "Margin", 
    "0", -1, Tk_Offset(LineGraphOptions, rightMargin.reqSize), 0, NULL, 
    RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-rightvariable", "rightVariable", "RightVariable",
-   NULL, -1, Tk_Offset(LineGraphOptions, rightMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_SYNONYM, "-rm", NULL, NULL, NULL, -1, 0, 0, "-rightmargin", 0},
   {TK_OPTION_PIXELS, "-searchhalo", "searchhalo", "SearchHalo", 
    "2m", -1, Tk_Offset(LineGraphOptions, search.halo), 0, NULL, 0},
@@ -153,9 +144,6 @@ static Tk_OptionSpec optionSpecs[] = {
   {TK_OPTION_PIXELS, "-topmargin", "topMargin", "TopMargin", 
    "0", -1, Tk_Offset(LineGraphOptions, topMargin.reqSize), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
-  {TK_OPTION_STRING, "-topvariable", "topVariable", "TopVariable",
-   NULL, -1, Tk_Offset(LineGraphOptions, topMargin.varName), 
-   TK_OPTION_NULL_OK, NULL, 0},
   {TK_OPTION_PIXELS, "-width", "width", "Width", 
    "5i", -1, Tk_Offset(LineGraphOptions, reqWidth), 
    0, NULL, RESET_WORLD | CACHE_DIRTY},
diff --git a/src/bltGraphOp.C b/src/bltGraphOp.C
index 0edbc81..1896221 100644
--- a/src/bltGraphOp.C
+++ b/src/bltGraphOp.C
@@ -86,7 +86,7 @@ int GraphObjConfigure(Graph* graphPtr, Tcl_Interp* interp,
       Tk_RestoreSavedOptions(&savedOptions);
     }
 
-    graphPtr->flags |= mask;
+    //    graphPtr->flags |= mask;
     graphPtr->configure();
     graphPtr->eventuallyRedraw();
 
diff --git a/tests/bargraph.tcl b/tests/bargraph.tcl
index 64c6701..1067703 100644
--- a/tests/bargraph.tcl
+++ b/tests/bargraph.tcl
@@ -18,7 +18,6 @@ bltTest $graph -bg green
 bltTest $graph -bm 50
 bltTest $graph -borderwidth 50
 bltTest $graph -bottommargin 50
-#bltTest $graph -bottomvariable
 #bltTest $graph -bufferelements
 #bltTest $graph -buffergraph
 bltTest $graph -cursor cross
@@ -33,7 +32,6 @@ bltTest $graph -height 300
 bltTest $graph -invertxy yes
 #bltTest $graph -justify
 bltTest $graph -leftmargin 50
-#bltTest $graph -leftvariable
 bltTest $graph -lm 50
 bltTest $graph -plotbackground cyan
 bltTest $graph -plotborderwidth 50
@@ -42,7 +40,6 @@ bltTest $graph -plotpady 50
 bltTest $graph -plotrelief groove
 bltTest $graph -relief groove
 bltTest $graph -rightmargin 50
-#bltTest $graph -rightvariable
 bltTest $graph -rm 50
 #bltTest $graph -searchhalo
 #bltTest $graph -searchmode
@@ -52,7 +49,6 @@ bltTest $graph -rm 50
 bltTest $graph -title "This is a Title"
 bltTest $graph -tm 50
 bltTest $graph -topmargin 50
-#bltTest $graph -topvariable
 bltTest $graph -width 300
 bltTest $graph -plotwidth 300
 bltTest $graph -plotheight 300
diff --git a/tests/linegraph.tcl b/tests/linegraph.tcl
index 9e9513f..d77811e 100644
--- a/tests/linegraph.tcl
+++ b/tests/linegraph.tcl
@@ -13,7 +13,6 @@ bltTest $graph -bg green
 bltTest $graph -bm 50
 bltTest $graph -borderwidth 50
 bltTest $graph -bottommargin 50
-#bltTest $graph -bottomvariable
 #bltTest $graph -bufferelements
 #bltTest $graph -buffergraph
 bltTest $graph -cursor cross
@@ -28,7 +27,6 @@ bltTest $graph -height 300
 bltTest $graph -invertxy yes
 #bltTest $graph -justify
 bltTest $graph -leftmargin 50
-#bltTest $graph -leftvariable
 bltTest $graph -lm 50
 bltTest $graph -plotbackground cyan
 bltTest $graph -plotborderwidth 50
@@ -37,7 +35,6 @@ bltTest $graph -plotpady 50
 bltTest $graph -plotrelief groove
 bltTest $graph -relief groove
 bltTest $graph -rightmargin 50
-#bltTest $graph -rightvariable
 bltTest $graph -rm 50
 #bltTest $graph -searchhalo
 #bltTest $graph -searchmode
@@ -47,7 +44,6 @@ bltTest $graph -rm 50
 bltTest $graph -title "This is a Title"
 bltTest $graph -tm 50
 bltTest $graph -topmargin 50
-#bltTest $graph -topvariable
 bltTest $graph -width 300
 bltTest $graph -plotwidth 300
 bltTest $graph -plotheight 300