summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2006-10-16 15:35:27 (GMT)
committerdas <das>2006-10-16 15:35:27 (GMT)
commitda455d8528eca0baa4cc40a62c75622ff17d4143 (patch)
tree7139775b61142135e07ba825343617a212d624ca /generic
parentb6667df246c196b019c9a7952b0944f904ee85c5 (diff)
downloadtk-da455d8528eca0baa4cc40a62c75622ff17d4143.zip
tk-da455d8528eca0baa4cc40a62c75622ff17d4143.tar.gz
tk-da455d8528eca0baa4cc40a62c75622ff17d4143.tar.bz2
* changes: updates for 8.5a5 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 f645243..f74bc5a 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.18 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.19 2006/10/16 15:35:27 das Exp $
*/
#include <stdio.h>
@@ -523,7 +523,15 @@ ConfigureLine(
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 05d4dfb..7338d6d 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.15 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.16 2006/10/16 15:35:28 das Exp $
*/
#include <stdio.h>
@@ -522,6 +522,15 @@ ConfigurePolygon(
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 07c4ced..b0fb6be 100644
--- a/generic/tkRectOval.c
+++ b/generic/tkRectOval.c
@@ -9,7 +9,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.14 2005/11/17 10:57:35 dkf Exp $
+ * RCS: @(#) $Id: tkRectOval.c,v 1.15 2006/10/16 15:35:28 das Exp $
*/
#include <stdio.h>
@@ -521,6 +521,15 @@ ConfigureRectOval(
} 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) {