* win/tkWinDraw.c (RenderObject): Applied patch from [Bug: 6368],

which corrects rendering of 1-pixel wide stippled lines on Windows.

* generic/tkCanvLine.c (DisplayLine): Applied patch from
[Bug: 6368], corrects bugs relating to use of active- and
disabledwidth values for displaying lines (disabledwidth was never
used, and activewidth/disablewidths would only possibly be used
when greater than default width, rather than when simply not equal
to default width).

3 files changed, 22 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 407cb93..211396a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-10-18  Eric Melski  <ericm@ajubasolutions.com>
 
+	* win/tkWinDraw.c (RenderObject): Applied patch from [Bug: 6368],
+	which corrects rendering of 1-pixel wide stippled lines on Windows.
+
+	* generic/tkCanvLine.c (DisplayLine): Applied patch from 
+	[Bug: 6368], corrects bugs relating to use of active- and
+	disabledwidth values for displaying lines (disabledwidth was never
+	used, and activewidth/disablewidths would only possibly be used
+	when greater than default width, rather than when simply not equal
+	to default width).
+
 	* library/tkfbox.tcl (OkCmd): Applied patch from [Bug: 6365],
 	which adds safety for directory names containing spaces or which
 	are non-lists.
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 7fbd51e..708490d 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvLine.c,v 1.7 2000/02/01 11:41:09 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.8 2000/10/24 23:51:33 ericm Exp $
  */
 
 #include <stdio.h>
@@ -866,18 +866,18 @@ DisplayLine(canvas, itemPtr, display, drawable, x, y, width, height)
     }
     linewidth = linePtr->outline.width;
     if (((TkCanvas *)canvas)->currentItemPtr == itemPtr) {
-	if (linePtr->outline.activeStipple!=None) {
+	if (linePtr->outline.activeStipple != None) {
 	    stipple = linePtr->outline.activeStipple;
 	}
-	if (linePtr->outline.activeWidth>linewidth) {
+	if (linePtr->outline.activeWidth != linewidth) {
 	    linewidth = linePtr->outline.activeWidth;
 	}
     } else if (state==TK_STATE_DISABLED) {
-	if (linePtr->outline.disabledStipple!=None) {
+	if (linePtr->outline.disabledStipple != None) {
 	    stipple = linePtr->outline.disabledStipple;
 	}
-	if (linePtr->outline.disabledWidth>linewidth) {
-	    linewidth = linePtr->outline.activeWidth;
+	if (linePtr->outline.disabledWidth != linewidth) {
+	    linewidth = linePtr->outline.disabledWidth;
 	}
     }
     /*
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index 55c4e59..5b09693 100644
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinDraw.c,v 1.8 2000/03/31 09:24:26 hobbs Exp $
+ * RCS: @(#) $Id: tkWinDraw.c,v 1.9 2000/10/24 23:51:33 ericm Exp $
  */
 
 #include "tkWinInt.h"
@@ -745,15 +745,13 @@ RenderObject(dc, gc, points, npoints, mode, pen, func)
 	}
 
 	/*
-	 * Grow the bounding box enough to account for wide lines.
+	 * Grow the bounding box enough to account for line width.
 	 */
 
-	if (gc->line_width > 1) {
-	    rect.left -= gc->line_width;
-	    rect.top -= gc->line_width;
-	    rect.right += gc->line_width;
-	    rect.bottom += gc->line_width;
-	}
+	rect.left -= gc->line_width;
+	rect.top -= gc->line_width;
+	rect.right += gc->line_width;
+	rect.bottom += gc->line_width;
 
 	width = rect.right - rect.left;
 	height = rect.bottom - rect.top;