*** empty log message ***

2 files changed, 27 insertions, 11 deletions

diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index 434145c..ecfeb17 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -41,11 +41,12 @@
 #define HAVE_UNISTD_H 1
 #include <tkPort.h>
 #include <tkInt.h>
+#include <tk3d.h>
 
 #define FOOBAR
 #include "bltInt.h"
 #undef FOOBAR
-#include "tkIntBorder.h"
+
 #include "bltDBuffer.h"
 #include "bltPicture.h"
 #include "bltPsInt.h"
@@ -853,20 +854,20 @@ Blt_Ps_Draw3DRectangle(
 	return;
     }
     if ((relief == TK_RELIEF_SOLID) ||
-	(borderPtr->lightColor == NULL) || (borderPtr->darkColor == NULL)) {
+	(borderPtr->lightColorPtr == NULL) || (borderPtr->darkColorPtr == NULL)) {
 	if (relief == TK_RELIEF_SOLID) {
 	    dark.red = dark.blue = dark.green = 0x00;
 	    light.red = light.blue = light.green = 0x00;
 	    relief = TK_RELIEF_SUNKEN;
 	} else {
-	    light = *borderPtr->bgColor;
+	    light = *borderPtr->bgColorPtr;
 	    dark.red = dark.blue = dark.green = 0xFF;
 	}
 	lightPtr = &light;
 	darkPtr = &dark;
     } else {
-	lightPtr = borderPtr->lightColor;
-	darkPtr = borderPtr->darkColor;
+	lightPtr = borderPtr->lightColorPtr;
+	darkPtr = borderPtr->darkColorPtr;
     }
 
 
@@ -893,7 +894,7 @@ Blt_Ps_Draw3DRectangle(
 	topPtr = darkPtr;
 	bottomPtr = lightPtr;
     } else {
-	topPtr = bottomPtr = borderPtr->bgColor;
+	topPtr = bottomPtr = borderPtr->bgColorPtr;
     }
     Blt_Ps_XSetBackground(ps, bottomPtr);
     Blt_Ps_XFillRectangle(ps, x, y + height - borderWidth, width, borderWidth);
@@ -925,7 +926,7 @@ Blt_Ps_Fill3DRectangle(
 {
     TkBorder *borderPtr = (TkBorder *) border;
 
-    Blt_Ps_XSetBackground(ps, borderPtr->bgColor);
+    Blt_Ps_XSetBackground(ps, borderPtr->bgColorPtr);
     Blt_Ps_XFillRectangle(ps, x, y, width, height);
     Blt_Ps_Draw3DRectangle(ps, border, x, y, width, height, borderWidth,
 	relief);
diff --git a/src/bltGrText.C b/src/bltGrText.C
index 6eedea2..39bd752 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -28,9 +28,24 @@
 #include <assert.h>
 #include <X11/Xutil.h>
 
+#define TIME_WITH_SYS_TIME 0
+#define HAVE_SYS_TIME_H 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#include <tkPort.h>
+#include <tkInt.h>
+#include <tk3d.h>
+
+#define FOOBAR
 #include "bltInt.h"
+#undef FOOBAR
+
 #include "bltHash.h"
-#include "tkIntBorder.h"
+//#include "tkIntBorder.h"
 #include "bltImage.h"
 #include "bltBitmap.h"
 #include "bltFont.h"
@@ -842,7 +857,7 @@ DrawStandardLayout(Tk_Window tkwin, Drawable drawable, TextStyle *stylePtr,
 	TkBorder *borderPtr = (TkBorder *) Blt_BackgroundBorder(stylePtr->bg);
 	XColor *color1, *color2;
 
-	color1 = borderPtr->lightColor, color2 = borderPtr->darkColor;
+	color1 = borderPtr->lightColorPtr, color2 = borderPtr->darkColorPtr;
 	if (stylePtr->state & STATE_EMPHASIS) {
 	    XColor *hold;
 	    
@@ -927,7 +942,7 @@ Blt_DrawTextWithRotatedFont(Tk_Window tkwin, Drawable drawable, float angle,
 	TkBorder *borderPtr = (TkBorder *)Blt_BackgroundBorder(stylePtr->bg);
 	XColor *color1, *color2;
 	
-	color1 = borderPtr->lightColor, color2 = borderPtr->darkColor;
+	color1 = borderPtr->lightColorPtr, color2 = borderPtr->darkColorPtr;
 	if (stylePtr->state & STATE_EMPHASIS) {
 	    XColor *hold;
 	    
@@ -992,7 +1007,7 @@ Blt_DrawTextWithRotatedBitmap(
 	TkBorder *borderPtr = (TkBorder *) Blt_BackgroundBorder(stylePtr->bg);
 	XColor *color1, *color2;
 
-	color1 = borderPtr->lightColor, color2 = borderPtr->darkColor;
+	color1 = borderPtr->lightColorPtr, color2 = borderPtr->darkColorPtr;
 	if (stylePtr->state & STATE_EMPHASIS) {
 	    XColor *hold;