*** empty log message ***

3 files changed, 17 insertions, 21 deletions

diff --git a/src/bltGrAxis.C b/src/bltGrAxis.C
index ac339e8..734b7d1 100644
--- a/src/bltGrAxis.C
+++ b/src/bltGrAxis.C
@@ -350,10 +350,9 @@ static Blt_ConfigSpec configSpecs[] = {
   {BLT_CONFIG_DOUBLE, "-autorange", "autoRange", "AutoRange",
    DEF_AXIS_RANGE, Tk_Offset(Axis, windowSize),
    ALL_GRAPHS | BLT_CONFIG_DONT_SET_DEFAULT}, 
-  {BLT_CONFIG_CUSTOM, "-background", "background", "Background",
+  {BLT_CONFIG_BORDER, "-background", "background", "Background",
    DEF_AXIS_BACKGROUND, Tk_Offset(Axis, normalBg),
-   ALL_GRAPHS | BLT_CONFIG_NULL_OK,
-   &backgroundOption},
+   ALL_GRAPHS | BLT_CONFIG_NULL_OK},
   {BLT_CONFIG_SYNONYM, "-bg", "background", (char *)NULL, (char *)NULL, 0, 0},
   {BLT_CONFIG_CUSTOM, "-bindtags", "bindTags", "BindTags", DEF_AXIS_TAGS, 
    Tk_Offset(Axis, obj.tags), ALL_GRAPHS | BLT_CONFIG_NULL_OK,
@@ -2904,12 +2903,13 @@ DrawAxis(Axis *axisPtr, Drawable drawable)
     Graph *graphPtr = axisPtr->obj.graphPtr;
 
     if (axisPtr->normalBg != NULL) {
-	Blt_FillBackgroundRectangle(graphPtr->tkwin, drawable, 
-		axisPtr->normalBg, 
-		axisPtr->left, axisPtr->top, 
-		axisPtr->right - axisPtr->left, 
-		axisPtr->bottom - axisPtr->top, axisPtr->borderWidth, 
-		axisPtr->relief);
+	Tk_Fill3DRectangle(graphPtr->tkwin, drawable, 
+			   axisPtr->normalBg, 
+			   axisPtr->left, axisPtr->top, 
+			   axisPtr->right - axisPtr->left, 
+			   axisPtr->bottom - axisPtr->top,
+			   axisPtr->borderWidth, 
+			   axisPtr->relief);
     }
     if (axisPtr->title != NULL) {
 	TextStyle ts;
@@ -3059,10 +3059,7 @@ AxisToPostScript(Blt_Ps ps, Axis *axisPtr)
 {
     Blt_Ps_Format(ps, "%% Axis \"%s\"\n", axisPtr->obj.name);
     if (axisPtr->normalBg != NULL) {
-	Tk_3DBorder border;
-
-	border = Blt_BackgroundBorder(axisPtr->normalBg);
-	Blt_Ps_Fill3DRectangle(ps, border, 
+	Blt_Ps_Fill3DRectangle(ps, axisPtr->normalBg, 
 		(double)axisPtr->left, (double)axisPtr->top, 
 		axisPtr->right - axisPtr->left, axisPtr->bottom - axisPtr->top, 
 		axisPtr->borderWidth, axisPtr->relief);
diff --git a/src/bltGrAxis.h b/src/bltGrAxis.h
index 21bb44d..1ca6281 100644
--- a/src/bltGrAxis.h
+++ b/src/bltGrAxis.h
@@ -277,7 +277,7 @@ typedef struct {
     short int left, right, top, bottom;	/* Region occupied by the of axis. */
     short int width, height;		/* Extents of axis */
     short int maxTickWidth, maxTickHeight;
-    Blt_Background normalBg;
+    Tk_3DBorder normalBg;
     Blt_Background activeBg;
     XColor *activeFgColor;
 
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 362093e..dc81500 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -316,7 +316,7 @@ typedef struct {
     XColor *fillBgColor;
     GC fillGC;
 
-    Blt_Background fillBg;		/* Background for fill area. */
+    Tk_3DBorder fillBg;		/* Background for fill area. */
 
     Point2d *fillPts;			/* Array of points used to draw polygon
 					 * to fill area under the curve */
@@ -449,10 +449,9 @@ static Blt_ConfigSpec lineElemConfigSpecs[] = {
   {BLT_CONFIG_COLOR, "-areaforeground", "areaForeground", "AreaForeground",
    DEF_LINE_PATTERN_FG, Tk_Offset(LineElement, fillFgColor), 
    BLT_CONFIG_NULL_OK},
-  {BLT_CONFIG_CUSTOM, "-areabackground", "areaBackground", 
+  {BLT_CONFIG_BORDER, "-areabackground", "areaBackground", 
    "AreaBackground", DEF_LINE_PATTERN_BG, Tk_Offset(LineElement, fillBg),
-   BLT_CONFIG_NULL_OK,
-   &backgroundOption},
+   BLT_CONFIG_NULL_OK},
   {BLT_CONFIG_CUSTOM, "-bindtags", "bindTags", "BindTags", DEF_LINE_TAGS, 
    Tk_Offset(LineElement, obj.tags), BLT_CONFIG_NULL_OK,
    &listOption},
@@ -4154,9 +4153,9 @@ DrawNormalLineProc(Graph *graphPtr, Drawable drawable, Element *basePtr)
 	    count++;
 	}
 	if (elemPtr->fillBg != NULL) {
-	    Blt_SetBackgroundOrigin(graphPtr->tkwin, elemPtr->fillBg, 0, 0);
-	    Blt_FillBackgroundPolygon(graphPtr->tkwin, drawable, 
-		elemPtr->fillBg, points, elemPtr->nFillPts, 0, TK_RELIEF_FLAT);
+	    Tk_Fill3DPolygon(graphPtr->tkwin, drawable, 
+			     elemPtr->fillBg, points, 
+			     elemPtr->nFillPts, 0, TK_RELIEF_FLAT);
 	}
 	free(points);
     }