diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-16 13:31:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-16 13:31:48 (GMT) |
commit | 1163ef54c110e4a57ccf168d955da777bf7a3525 (patch) | |
tree | 34f7f531464329534828bc183ab4079b2de3a103 /unix/tkUnixPort.h | |
parent | 2ef1eadbc983ba136d631cf4ac449b130d4af086 (diff) | |
parent | 4b5b028a16729b1caae6ec89ee2e8673958ad127 (diff) | |
download | tk-1163ef54c110e4a57ccf168d955da777bf7a3525.zip tk-1163ef54c110e4a57ccf168d955da777bf7a3525.tar.gz tk-1163ef54c110e4a57ccf168d955da777bf7a3525.tar.bz2 |
implement TkSetPixmapColormap and TkpPrintWindowId for cygwin
cleanup some more unused CYGWIN stuff
Diffstat (limited to 'unix/tkUnixPort.h')
-rw-r--r-- | unix/tkUnixPort.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 601ef57..bc432e7 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -113,15 +113,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 * @@ -135,6 +126,16 @@ # 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 /* @@ -167,7 +168,9 @@ #define TkpButtonSetDefaults() {} #define TkpDestroyButton(butPtr) {} #define TkSelUpdateClipboard(a,b) {} +#ifndef __CYGWIN__ #define TkSetPixmapColormap(p,c) {} +#endif /* * These calls implement native bitmaps which are not supported under @@ -182,8 +185,9 @@ * 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)) +#endif #endif /* _UNIXPORT */ |