diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-30 04:34:50 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-30 04:34:50 (GMT) |
commit | 91ae12c773a03fe4533d19a6d115deb6a4c95351 (patch) | |
tree | 7248ac19414918cc38c6d14a602c4ba094ef3e83 /unix | |
parent | 3f9d8f314ffa4e803d29993d3b1248b6c733b2c5 (diff) | |
parent | 29067ec103d779feffa6d5dea099666cc2785b76 (diff) | |
download | tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.zip tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.tar.gz tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.tar.bz2 |
Simpify determination whether we are running on cygwin.
Export Tk_GetHINSTANCE, TkSetPixmapColormap and TkpPrintWindowId on the Cygwin dll.
Diffstat (limited to 'unix')
-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)) |