diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 12:45:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 12:45:47 (GMT) |
| commit | 1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272 (patch) | |
| tree | 12d4d15c3f59ae70b1113469422fb33b9039d700 /unix/tkUnixPort.h | |
| parent | 9ea605f06bdde8beed71761774f09a632d2fb100 (diff) | |
| parent | ba34893472773623c15b6e7b5a6739213d6b4edf (diff) | |
| download | tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.zip tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.gz tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.bz2 | |
merge core-8-4-branch, still to be tested on Unix
Diffstat (limited to 'unix/tkUnixPort.h')
| -rw-r--r-- | unix/tkUnixPort.h | 18 |
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)) |