*** empty log message ***

8 files changed, 27 insertions, 12 deletions

diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index 8b163db..b0ff7d7 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -1056,7 +1056,7 @@ void Axis::resetTextStyles()
   gcMask = (GCForeground | GCLineWidth | GCCapStyle);
   gcValues.foreground = ops->tickColor->pixel;
   gcValues.font = Tk_FontId(ops->tickFont);
-  gcValues.line_width = LineWidth(ops->lineWidth);
+  gcValues.line_width = ops->lineWidth;
   gcValues.cap_style = CapProjecting;
 
   GC newGC = Tk_GetGC(graphPtr_->tkwin, gcMask, &gcValues);
@@ -1072,7 +1072,7 @@ void Axis::resetTextStyles()
   activeTickGC_ = newGC;
 
   gcValues.background = gcValues.foreground = ops->major.color->pixel;
-  gcValues.line_width = LineWidth(ops->major.lineWidth);
+  gcValues.line_width = ops->major.lineWidth;
   gcMask = (GCForeground | GCBackground | GCLineWidth);
   if (LineIsDashed(ops->major.dashes)) {
     gcValues.line_style = LineOnOffDash;
@@ -1088,7 +1088,7 @@ void Axis::resetTextStyles()
   ops->major.gc = newGC;
 
   gcValues.background = gcValues.foreground = ops->minor.color->pixel;
-  gcValues.line_width = LineWidth(ops->minor.lineWidth);
+  gcValues.line_width = ops->minor.lineWidth;
   gcMask = (GCForeground | GCBackground | GCLineWidth);
   if (LineIsDashed(ops->minor.dashes)) {
     gcValues.line_style = LineOnOffDash;
diff --git a/src/bltGrHairs.C b/src/bltGrHairs.C
index fd8991e..63c50c7 100644
--- a/src/bltGrHairs.C
+++ b/src/bltGrHairs.C
@@ -96,7 +96,7 @@ void Crosshairs::configure()
   gcValues.background = pixel;
   gcValues.foreground = (pixel ^ ops->colorPtr->pixel);
 
-  gcValues.line_width = LineWidth(ops->lineWidth);
+  gcValues.line_width = ops->lineWidth;
   unsigned long gcMask = 
     (GCForeground | GCBackground | GCFunction | GCLineWidth);
   if (LineIsDashed(ops->dashes)) {
diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C
index 0a384e0..a80063a 100644
--- a/src/bltGrMarkerLine.C
+++ b/src/bltGrMarkerLine.C
@@ -119,7 +119,7 @@ int LineMarker::configure()
   }
   gcValues.cap_style = ops->capStyle;
   gcValues.join_style = ops->joinStyle;
-  gcValues.line_width = LineWidth(ops->lineWidth);
+  gcValues.line_width = ops->lineWidth;
   gcValues.line_style = LineSolid;
   if (LineIsDashed(ops->dashes)) {
     gcValues.line_style = 
diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C
index d18af99..0662413 100644
--- a/src/bltGrMarkerPolygon.C
+++ b/src/bltGrMarkerPolygon.C
@@ -139,7 +139,7 @@ int PolygonMarker::configure()
   gcValues.join_style = ops->joinStyle;
   gcValues.line_style = LineSolid;
   gcValues.dash_offset = 0;
-  gcValues.line_width = LineWidth(ops->lineWidth);
+  gcValues.line_width = ops->lineWidth;
   if (LineIsDashed(ops->dashes)) {
     gcValues.line_style = (ops->outlineBg == NULL)
       ? LineOnOffDash : LineDoubleDash;
diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h
index 4c2e8e3..b2feef6 100644
--- a/src/bltGrMisc.h
+++ b/src/bltGrMisc.h
@@ -41,9 +41,22 @@
 #endif
 
 typedef struct {
-    Point2d p, q;
+  double left;
+  double right;
+  double top;
+  double bottom;
+} Region2d;
+
+typedef struct {
+  Point2d p;
+  Point2d q;
 } Segment2d;
 
+typedef struct {
+  short int width;
+  short int height;
+} Dim2D;
+
 extern int Blt_PointInPolygon(Point2d *samplePtr, Point2d *screenPts, 
 			      int nScreenPts);
 extern int Blt_GetXY(Tcl_Interp* interp, Tk_Window tkwin, 
diff --git a/src/bltGrPenBar.C b/src/bltGrPenBar.C
index bd472df..35b9890 100644
--- a/src/bltGrPenBar.C
+++ b/src/bltGrPenBar.C
@@ -120,7 +120,7 @@ int BarPen::configure()
   {
     unsigned long gcMask = GCForeground | GCLineWidth;
     XGCValues gcValues;
-    gcValues.line_width = LineWidth(ops->errorBarLineWidth);
+    gcValues.line_width = ops->errorBarLineWidth;
     if (ops->outlineColor)
       gcValues.foreground = ops->outlineColor->pixel;
     else if (ops->fill)
@@ -163,7 +163,7 @@ int BarPen::configure()
       colorPtr = ops->outlineColor;
     XGCValues gcValues;
     gcValues.foreground = colorPtr->pixel;
-    gcValues.line_width = LineWidth(ops->errorBarLineWidth);
+    gcValues.line_width = ops->errorBarLineWidth;
     GC newGC = Tk_GetGC(graphPtr_->tkwin, gcMask, &gcValues);
     if (errorBarGC_)
       Tk_FreeGC(graphPtr_->display, errorBarGC_);
diff --git a/src/bltGrPenLine.C b/src/bltGrPenLine.C
index f907d52..cf4bcd2 100644
--- a/src/bltGrPenLine.C
+++ b/src/bltGrPenLine.C
@@ -305,7 +305,7 @@ int LinePen::configure()
 	gcMask |= GCClipMask;
       }
     }
-    gcValues.line_width = LineWidth(ops->symbol.outlineWidth);
+    gcValues.line_width = ops->symbol.outlineWidth;
     GC newGC = Tk_GetGC(graphPtr_->tkwin, gcMask, &gcValues);
     if (ops->symbol.outlineGC)
       Tk_FreeGC(graphPtr_->display, ops->symbol.outlineGC);
@@ -337,7 +337,7 @@ int LinePen::configure()
     gcValues.cap_style = CapButt;
     gcValues.join_style = JoinRound;
     gcValues.line_style = LineSolid;
-    gcValues.line_width = LineWidth(ops->traceWidth);
+    gcValues.line_width = ops->traceWidth;
 
     gcValues.foreground = ops->traceColor->pixel;
     XColor* colorPtr = ops->traceOffColor;
@@ -367,7 +367,7 @@ int LinePen::configure()
     if (!colorPtr)
       colorPtr = ops->traceColor;
     XGCValues gcValues;
-    gcValues.line_width = LineWidth(ops->errorBarLineWidth);
+    gcValues.line_width = ops->errorBarLineWidth;
     gcValues.foreground = colorPtr->pixel;
     GC newGC = Tk_GetGC(graphPtr_->tkwin, gcMask, &gcValues);
     if (errorBarGC_) {
diff --git a/src/bltGrText.h b/src/bltGrText.h
index f3e597a..51589ef 100644
--- a/src/bltGrText.h
+++ b/src/bltGrText.h
@@ -30,6 +30,8 @@
 #ifndef _BLT_TEXT_H
 #define _BLT_TEXT_H
 
+#include "bltGrMisc.h"
+
 #define UPDATE_GC 1
 
 typedef struct {