summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvLine.c
diff options
context:
space:
mode:
authorericm <ericm>2000-10-24 23:51:32 (GMT)
committerericm <ericm>2000-10-24 23:51:32 (GMT)
commitcbe4193da475122d9dca8bfa030decadea66242c (patch)
treea1351ab32999ccdd7a0d7b478e6997177154c15f /generic/tkCanvLine.c
parent4c32f8f07eaea4de5aefe53de754a3c4a7d0ae05 (diff)
downloadtk-cbe4193da475122d9dca8bfa030decadea66242c.zip
tk-cbe4193da475122d9dca8bfa030decadea66242c.tar.gz
tk-cbe4193da475122d9dca8bfa030decadea66242c.tar.bz2
* 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).
Diffstat (limited to 'generic/tkCanvLine.c')
-rw-r--r--generic/tkCanvLine.c12
1 files changed, 6 insertions, 6 deletions
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;
}
}
/*