summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 07:35:05 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-01 07:35:05 (GMT)
commitadc2b98bbf0fed75d90775d3e1706c5246c72521 (patch)
treecbc449848991cc00c8bd60b67ce0367d298d7266 /unix
parent4deef3d6e9f16828bae60ad2862c9ef5fc6a5e88 (diff)
parent4609e36025d2dd05783233feac88c6cad06256df (diff)
downloadtk-adc2b98bbf0fed75d90775d3e1706c5246c72521.zip
tk-adc2b98bbf0fed75d90775d3e1706c5246c72521.tar.gz
tk-adc2b98bbf0fed75d90775d3e1706c5246c72521.tar.bz2
merge
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixPort.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 93422cf..8118d95 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -126,6 +126,15 @@
# define WPARAM void *
# define LPARAM void *
# define LRESULT void *
+#else
+/*
+ * The TkPutImage macro strips off the color table information, which isn't
+ * needed for X.
+ */
+
+#define TkPutImage(colors, ncolors, display, pixels, gc, image, srcx, srcy, destx, desty, width, height) \
+ XPutImage(display, pixels, gc, image, srcx, srcy, destx, \
+ desty, width, height);
#endif
/*