summaryrefslogtreecommitdiffstats
path: root/generic/tkIntDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-05 04:46:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-05 04:46:39 (GMT)
commitc21d43b1a96fda8597f9838f90c33efdd6447a7f (patch)
tree4b1b6848a2a8f1b3f66d319e784c6d08ddc042ab /generic/tkIntDecls.h
parent3f0541ae5dbacb552186ca434da000dc3947c731 (diff)
parent4d934afdaa794c2cb190a8f1b5712069e12b9750 (diff)
downloadtk-c21d43b1a96fda8597f9838f90c33efdd6447a7f.zip
tk-c21d43b1a96fda8597f9838f90c33efdd6447a7f.tar.gz
tk-c21d43b1a96fda8597f9838f90c33efdd6447a7f.tar.bz2
Change XSetDashes signature and many others to match Xorg, needed for Cygwin
Diffstat (limited to 'generic/tkIntDecls.h')
-rw-r--r--generic/tkIntDecls.h44
1 files changed, 23 insertions, 21 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7f1c096..eb224c8 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -1854,31 +1854,33 @@ extern TkIntStubs *tkIntStubsPtr;
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
-#ifndef __WIN32__
+#if !defined(__WIN32__) && !defined(MAC_OSX_TK)
+
/*
* These macros are just wrappers for the equivalent X Region calls.
*/
-#undef TkClipBox
-#undef TkCreateRegion
-#undef TkDestroyRegion
-#undef TkIntersectRegion
-#undef TkRectInRegion
-#undef TkSetRegion
-#undef TkSubtractRegion
-#undef TkUnionRectWithRegion
+# undef TkClipBox
+# undef TkCreateRegion
+# undef TkDestroyRegion
+# undef TkIntersectRegion
+# undef TkRectInRegion
+# undef TkSetRegion
+# undef TkSubtractRegion
+# undef TkUnionRectWithRegion
+
+# define TkClipBox(rgn, rect) XClipBox((Region) (rgn), (rect))
+# define TkCreateRegion() (TkRegion) XCreateRegion()
+# define TkDestroyRegion(rgn) XDestroyRegion((Region) (rgn))
+# define TkIntersectRegion(a, b, r) XIntersectRegion((Region) (a), \
+(Region) (b), (Region) (r))
+# define TkRectInRegion(r, x, y, w, h) XRectInRegion((Region) (r), (x), (y), (w), (h))
+# define TkSetRegion(d, gc, rgn) XSetRegion((d), (gc), (Region) (rgn))
+# define TkSubtractRegion(a, b, r) XSubtractRegion((Region) (a), \
+(Region) (b), (Region) (r))
+# define TkUnionRectWithRegion(rect, src, ret) XUnionRectWithRegion((rect), \
+(Region) (src), (Region) (ret))
+#endif /* !__CYGWIN__*/
-#define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect)
-#define TkCreateRegion() (TkRegion) XCreateRegion()
-#define TkDestroyRegion(rgn) XDestroyRegion((Region) rgn)
-#define TkIntersectRegion(a, b, r) XIntersectRegion((Region) a, \
- (Region) b, (Region) r)
-#define TkRectInRegion(r, x, y, w, h) XRectInRegion((Region) r, x, y, w, h)
-#define TkSetRegion(d, gc, rgn) XSetRegion(d, gc, (Region) rgn)
-#define TkSubtractRegion(a, b, r) XSubtractRegion((Region) a, \
- (Region) b, (Region) r)
-#define TkUnionRectWithRegion(rect, src, ret) XUnionRectWithRegion(rect, \
- (Region) src, (Region) ret)
-#endif /* __WIN32__ */
#endif /* _TKINTDECLS */