*** empty log message ***

7 files changed, 53 insertions, 14 deletions

diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C
index 46558d0..496b918 100644
--- a/src/bltGrElemLine.C
+++ b/src/bltGrElemLine.C
@@ -32,8 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <X11/Xlib.h>
-
 #include "bltGraph.h"
 #include "bltGrElemLine.h"
 #include "bltGrElemOption.h"
diff --git a/src/bltGrLegd.C b/src/bltGrLegd.C
index 849b7e8..ea46e2d 100644
--- a/src/bltGrLegd.C
+++ b/src/bltGrLegd.C
@@ -28,9 +28,7 @@
  */
 
 #include <tk.h>
-#ifdef USE_TK_STUBS
 #include <tkInt.h>
-#endif
 
 #include "bltGrBind.h"
 #include "bltGraph.h"
diff --git a/src/bltGrLegdOp.C b/src/bltGrLegdOp.C
index 7f253d2..bdd1bfd 100644
--- a/src/bltGrLegdOp.C
+++ b/src/bltGrLegdOp.C
@@ -28,9 +28,7 @@
  */
 
 #include <tk.h>
-#ifdef USE_TK_STUBS
 #include <tkInt.h>
-#endif
 
 #include "bltGrBind.h"
 #include "bltGraph.h"
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C
index ee2c71f..e6dbfa7 100644
--- a/src/bltGrMisc.C
+++ b/src/bltGrMisc.C
@@ -34,9 +34,7 @@
 #include <stdlib.h>
 
 #include <tk.h>
-#ifdef USE_TK_STUBS
 #include <tkInt.h>
-#endif
 
 #include "bltGraph.h"
 #include "bltGrMisc.h"
@@ -116,7 +114,7 @@ static int ClipTest (double ds, double dr, double *t1, double *t2)
  *	  Line Clipping, ACM, TOG,3(1), 1984, pp.1-22.
  *---------------------------------------------------------------------------
  */
-int Blt::LineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q)
+int Blt::lineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q)
 {
   double t1, t2;
   double dx, dy;
diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C
index 0a44aa1..46d3ae9 100644
--- a/src/bltGrPSOutput.C
+++ b/src/bltGrPSOutput.C
@@ -31,8 +31,58 @@
 #include <math.h>
 #include <stdarg.h>
 
-#include <tkPort.h>
-#include <tk3d.h>
+#include "tk.h"
+#include "tkInt.h"
+
+// copied from tk3d.h
+
+typedef struct TkBorder {
+    Screen *screen;		/* Screen on which the border will be used. */
+    Visual *visual;		/* Visual for all windows and pixmaps using
+				 * the border. */
+    int depth;			/* Number of bits per pixel of drawables where
+				 * the border will be used. */
+    Colormap colormap;		/* Colormap out of which pixels are
+				 * allocated. */
+    int resourceRefCount;	/* Number of active uses of this color (each
+				 * active use corresponds to a call to
+				 * Tk_Alloc3DBorderFromObj or Tk_Get3DBorder).
+				 * If this count is 0, then this structure is
+				 * no longer valid and it isn't present in
+				 * borderTable: it is being kept around only
+				 * because there are objects referring to it.
+				 * The structure is freed when objRefCount and
+				 * resourceRefCount are both 0. */
+    int objRefCount;		/* The number of Tcl objects that reference
+				 * this structure. */
+    XColor *bgColorPtr;		/* Background color (intensity between
+				 * lightColorPtr and darkColorPtr). */
+    XColor *darkColorPtr;	/* Color for darker areas (must free when
+				 * deleting structure). NULL means shadows
+				 * haven't been allocated yet.*/
+    XColor *lightColorPtr;	/* Color used for lighter areas of border
+				 * (must free this when deleting structure).
+				 * NULL means shadows haven't been allocated
+				 * yet. */
+    Pixmap shadow;		/* Stipple pattern to use for drawing shadows
+				 * areas. Used for displays with <= 64 colors
+				 * or where colormap has filled up. */
+    GC bgGC;			/* Used (if necessary) to draw areas in the
+				 * background color. */
+    GC darkGC;			/* Used to draw darker parts of the border.
+				 * None means the shadow colors haven't been
+				 * allocated yet.*/
+    GC lightGC;			/* Used to draw lighter parts of the border.
+				 * None means the shadow colors haven't been
+				 * allocated yet. */
+    Tcl_HashEntry *hashPtr;	/* Entry in borderTable (needed in order to
+				 * delete structure). */
+    struct TkBorder *nextPtr;	/* Points to the next TkBorder structure with
+				 * the same color name. Borders with the same
+				 * name but different screens or colormaps are
+				 * chained together off a single entry in
+				 * borderTable. */
+} TkBorder;
 
 #include "bltGraph.h"
 #include "bltGrPostscript.h"
diff --git a/src/bltGrPostscriptOp.C b/src/bltGrPostscriptOp.C
index e007b0a..91006de 100644
--- a/src/bltGrPostscriptOp.C
+++ b/src/bltGrPostscriptOp.C
@@ -28,9 +28,7 @@
  */
 
 #include <tk.h>
-#ifdef USE_TK_STUBS
 #include <tkInt.h>
-#endif
 
 #include "bltGraph.h"
 #include "bltGrPostscript.h"
diff --git a/src/bltGrText.C b/src/bltGrText.C
index cc7fc2e..a0a6d4f 100644
--- a/src/bltGrText.C
+++ b/src/bltGrText.C
@@ -30,7 +30,6 @@
 #include <math.h>
 
 #include <tk.h>
-#include <tkPort.h>
 #include <tkInt.h>
 
 #include "bltGrText.h"