summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2006-10-16 15:35:50 (GMT)
committerdas <das>2006-10-16 15:35:50 (GMT)
commitb71993589cdd8bfdbfec240b98d7537d4d9d5f59 (patch)
treeec30fa3d227bed8ea0080cf22c2d28d3b8fceace /generic
parent1a67b85428b8e2a3b1b848b950b00bb68a570898 (diff)
downloadtk-b71993589cdd8bfdbfec240b98d7537d4d9d5f59.zip
tk-b71993589cdd8bfdbfec240b98d7537d4d9d5f59.tar.gz
tk-b71993589cdd8bfdbfec240b98d7537d4d9d5f59.tar.bz2
* changes: updates for 8.4.14 release.
* macosx/tkMacOSXDraw.c: fix numerous issues in CG and QD drawing procs so that they now match X11 drawing much more closely [Bug 1558051]; use Tiger ellipse drawing API when available; fix comments & whitespace. * macosx/tkMacOSXInit.c: set default linewidth limit for CG antialiasing to 0 as thin horizontal/vertical lines look good now. * generic/tkCanvLine.c (ConfigureLine): on TkAqua, pass outline * generic/tkCanvPoly.c (ConfigurePolygon): linewidth in gc even for * generic/tkRectOval.c (ConfigureRectOval): fills (as it controls AA).
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCanvLine.c10
-rw-r--r--generic/tkCanvPoly.c11
-rw-r--r--generic/tkRectOval.c11
3 files changed, 29 insertions, 3 deletions
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index e868ae6..dfa25c5 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.13.2.1 2005/08/11 12:17:09 dkf Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.13.2.2 2006/10/16 15:35:50 das Exp $
*/
#include <stdio.h>
@@ -535,7 +535,15 @@ ConfigureLine(interp, canvas, itemPtr, objc, objv, flags)
gcValues.join_style = linePtr->joinStyle;
mask |= GCJoinStyle;
newGC = Tk_GetGC(tkwin, mask, &gcValues);
+#ifdef MAC_OSX_TK
+ /*
+ * Mac OS X CG drawing needs access to linewidth even for
+ * arrow fills (as linewidth controls antialiasing).
+ */
+ mask |= GCLineWidth;
+#else
gcValues.line_width = 0;
+#endif
arrowGC = Tk_GetGC(tkwin, mask, &gcValues);
} else {
newGC = arrowGC = None;
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index 6831a5d..798576b 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.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: tkCanvPoly.c,v 1.10.2.2 2005/08/11 12:17:09 dkf Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.10.2.3 2006/10/16 15:35:50 das Exp $
*/
#include <stdio.h>
@@ -529,6 +529,15 @@ ConfigurePolygon(interp, canvas, itemPtr, objc, objv, flags)
gcValues.fill_style = FillStippled;
mask |= GCStipple|GCFillStyle;
}
+#ifdef MAC_OSX_TK
+ /*
+ * Mac OS X CG drawing needs access to the outline linewidth
+ * even for fills (as linewidth controls antialiasing).
+ */
+ gcValues.line_width = polyPtr->outline.gc != None ?
+ polyPtr->outline.gc->line_width : 0;
+ mask |= GCLineWidth;
+#endif
newGC = Tk_GetGC(tkwin, mask, &gcValues);
}
if (polyPtr->fillGC != None) {
diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c
index 636b4ba..3a173a9 100644
--- a/generic/tkRectOval.c
+++ b/generic/tkRectOval.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: tkRectOval.c,v 1.10.2.1 2004/07/27 18:58:33 das Exp $
+ * RCS: @(#) $Id: tkRectOval.c,v 1.10.2.2 2006/10/16 15:35:50 das Exp $
*/
#include <stdio.h>
@@ -514,6 +514,15 @@ ConfigureRectOval(interp, canvas, itemPtr, objc, objv, flags)
} else {
mask = GCForeground;
}
+#ifdef MAC_OSX_TK
+ /*
+ * Mac OS X CG drawing needs access to the outline linewidth
+ * even for fills (as linewidth controls antialiasing).
+ */
+ gcValues.line_width = rectOvalPtr->outline.gc != None ?
+ rectOvalPtr->outline.gc->line_width : 0;
+ mask |= GCLineWidth;
+#endif
newGC = Tk_GetGC(tkwin, mask, &gcValues);
}
if (rectOvalPtr->fillGC != None) {