diff options
| author | das <das> | 2004-02-23 10:49:29 (GMT) |
|---|---|---|
| committer | das <das> | 2004-02-23 10:49:29 (GMT) |
| commit | 297090b448fe798845d0a7c7e9427e9ef7dbc8ca (patch) | |
| tree | b311d4d99e05537a622c27159bf7d6b0c74ef3a3 /generic/tkImgPhoto.c | |
| parent | 27f215c03a679ec897bd96a5fa2daa40fb42b7db (diff) | |
| download | tk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.zip tk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.tar.gz tk-297090b448fe798845d0a7c7e9427e9ef7dbc8ca.tar.bz2 | |
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXXStubs.c:
* xlib/ximage.c: fixed MacOSX XGetImage/XPutImage and related
functions to deal properly with XImages copied from screen.
* generic/tkCanvPs.c (TkImageGetColor): MacOSX fix.
* generic/tkImgPhoto.c (ImgPhotoDisplay): enabled alpha blending
for images with partial transparency on MacOSX.
[Bug 809157]
Diffstat (limited to 'generic/tkImgPhoto.c')
| -rw-r--r-- | generic/tkImgPhoto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index d525660..edff9cf 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,7 +17,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.36.2.4 2004/02/09 14:40:31 dkf Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.36.2.5 2004/02/23 10:49:30 das Exp $ */ #include "tkInt.h" @@ -2678,10 +2678,10 @@ ImgPhotoDisplay(clientData, display, drawable, imageX, imageY, width, } if ( -#if defined(MAC_TCL) || defined(MAC_OSX_TK) +#if defined(MAC_TCL) /* - * The retrieval of bgImg is currently not functional on OSX - * (and likely not OS9 either), so skip attempts to alpha blend. + * The retrieval of bgImg is currently not functional on OS9 + * so skip attempts to alpha blend. */ 0 && #endif |