diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-27 15:21:16 (GMT) |
| commit | 8982d2a60381e8ad4eb9305272f572d939a5d097 (patch) | |
| tree | 5bc0701b49839f4c2039e46686b5432d58c23b2d /macosx/tkMacOSXXStubs.c | |
| parent | f43df857228b616f87644802136c05915d59d48b (diff) | |
| parent | 506ee2fc81bb27e237860565c11a1494ab8c7b38 (diff) | |
| download | tk-8982d2a60381e8ad4eb9305272f572d939a5d097.zip tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.gz tk-8982d2a60381e8ad4eb9305272f572d939a5d097.tar.bz2 | |
Merge core-8-6-branch. More surrogate handling, e.g. in HandleIMEComposition()
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index a2d175b..1ed526d 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -897,7 +897,7 @@ XGetImage( * We do not support any other values here. */ int scalefactor = 1; - if (win && [win respondsToSelector:@selector(backingScaleFactor)]) { + if (win && [win respondsToSelector:@selector(backingScaleFactor)]) { scalefactor = ([win backingScaleFactor] == 2.0) ? 2 : 1; } int scaled_height = height * scalefactor; |