summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-25 09:59:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-25 09:59:54 (GMT)
commite91f3d0c6bcf6195288c6681ec3dccbcbb6e499c (patch)
tree935c0ed63c3648073d343c28d8ea7dca372a0d06 /generic
parenta44e0cadf8a931c0c64219ae8754758f7b7368c3 (diff)
parentb26dd4bffbf6100a480e0fd05d677bd7507a67b6 (diff)
downloadtk-e91f3d0c6bcf6195288c6681ec3dccbcbb6e499c.zip
tk-e91f3d0c6bcf6195288c6681ec3dccbcbb6e499c.tar.gz
tk-e91f3d0c6bcf6195288c6681ec3dccbcbb6e499c.tar.bz2
Merge trunk
Diffstat (limited to 'generic')
-rw-r--r--generic/tkImgPhInstance.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index 81b196c..b774b40 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -19,9 +19,7 @@
*/
#include "tkImgPhoto.h"
-#ifdef MAC_OSX_TK
-#define TKPUTIMAGE_CAN_BLEND
-#endif
+#include "tkPort.h"
/*
* Declaration for internal Xlib function used here:
@@ -416,9 +414,6 @@ TkImgPhotoGet(
*
* Note that Win32 pre-defines those operations that we really need.
*
- * Note that on MacOS, if the background comes from a Retina display
- * then it will be twice as wide and twice as high as the photoimage.
- *
*----------------------------------------------------------------------
*/
#ifndef TKPUTIMAGE_CAN_BLEND