summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-26 11:02:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-26 11:02:29 (GMT)
commit6953f9dc57f63fe39701cd4e62ad03259e36c371 (patch)
tree083f2cf73199b4e7ae476283fdb3589d19566885 /unix
parentbcc1d86678bcd77495a02ca7b58041f6c9ff3d1a (diff)
parentdf66b47acfd0644c7cda898c0c3c60d8e99dacd8 (diff)
downloadtk-6953f9dc57f63fe39701cd4e62ad03259e36c371.zip
tk-6953f9dc57f63fe39701cd4e62ad03259e36c371.tar.gz
tk-6953f9dc57f63fe39701cd4e62ad03259e36c371.tar.bz2
[Bug 3508771]: Implement TkClipBox, Tk*Region and Tk_GetHINSTANCE for Cygwin
[Bug 3519917]: Snow Leopard unix/Makefile `make test` fail
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in13
-rw-r--r--unix/tkUnixPort.h16
2 files changed, 13 insertions, 16 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index ed5474d..1a2f6f5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1748,4 +1748,17 @@ package-generate:
pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
rm -rf $(PACKAGE)
+#
+# The list of all the targets that do not correspond to real files. This stops
+# 'make' from getting confused when someone makes an error in a rule.
+#
+
+.PHONY: all binaries libraries objs doc html html-tcl html-tk test runtest
+.PHONY: install install-strip install-binaries install-libraries
+.PHONY: install-headers install-private-headers install-doc
+.PHONY: clean distclean depend genstubs checkstubs checkexports checkuchar
+.PHONY: shell gdb valgrind valgrindshell dist alldist rpm
+.PHONY: tkLibObjs tktest-real test-classic test-ttk testlang
+.PHONY: demo install-demos
+
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index e0dbc8f..a70af48 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -129,22 +129,6 @@
#endif
/*
- * These macros are just wrappers for the equivalent X Region calls.
- */
-
-#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)
-
-/*
* The TkPutImage macro strips off the color table information, which isn't
* needed for X.
*/