diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-01 07:35:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-01 07:35:05 (GMT) |
| commit | adc2b98bbf0fed75d90775d3e1706c5246c72521 (patch) | |
| tree | cbc449848991cc00c8bd60b67ce0367d298d7266 | |
| parent | 4deef3d6e9f16828bae60ad2862c9ef5fc6a5e88 (diff) | |
| parent | 4609e36025d2dd05783233feac88c6cad06256df (diff) | |
| download | tk-adc2b98bbf0fed75d90775d3e1706c5246c72521.zip tk-adc2b98bbf0fed75d90775d3e1706c5246c72521.tar.gz tk-adc2b98bbf0fed75d90775d3e1706c5246c72521.tar.bz2 | |
merge
| -rw-r--r-- | generic/tkIntXlibDecls.h | 11 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index a613cf1..f4aa5f9 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -1270,15 +1270,4 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT -#if !(defined(__WIN32__) || defined(__CYGWIN__)) -/* - * 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 - #endif /* _TKINTXLIBDECLS */ 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 /* |