summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
commit29067ec103d779feffa6d5dea099666cc2785b76 (patch)
tree12d4d15c3f59ae70b1113469422fb33b9039d700 /unix
parent20ae5845bf5393c40ddd12145483e4c6af9ef77e (diff)
parentd7e1d66497a877b980042968a57edd01d2840818 (diff)
downloadtk-29067ec103d779feffa6d5dea099666cc2785b76.zip
tk-29067ec103d779feffa6d5dea099666cc2785b76.tar.gz
tk-29067ec103d779feffa6d5dea099666cc2785b76.tar.bz2
merge core-8-4-branch, still to be tested on Unixtobetested
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixPort.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 8318724..4f530d2 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -128,15 +128,6 @@
# define NBBY 8
#endif
-/*
- * 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);
-
#ifdef __CYGWIN__
# define UINT unsigned int
# define HWND void *
@@ -151,6 +142,14 @@
# define LPARAM void *
# define LRESULT void *
#endif
+ /*
+ * 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);
/*
* Supply macros for seek offsets, if they're not already provided by
@@ -199,6 +198,7 @@
* This macro stores a representation of the window handle in a string.
* This should perhaps use the real size of an XID.
*/
+
#ifndef __CYGWIN__
#define TkpPrintWindowId(buf,w) \
sprintf((buf), "%#08lx", (unsigned long) (w))