diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-25 09:25:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-25 09:25:55 (GMT) |
| commit | 08b64027f4480a5aaa634ba89da1704539893bc5 (patch) | |
| tree | 3f39b0f56643da053a628fc4fc045dd82faedbf6 | |
| parent | 2bc6fae00d9ae77272e63ae6c01bf2a127088d3f (diff) | |
| parent | 2834e574832ddd1db4d7c68b5cdee9aa466fadb5 (diff) | |
| download | tk-08b64027f4480a5aaa634ba89da1704539893bc5.zip tk-08b64027f4480a5aaa634ba89da1704539893bc5.tar.gz tk-08b64027f4480a5aaa634ba89da1704539893bc5.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | macosx/tkMacOSXImage.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index fc0773d..c783871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,27 +21,27 @@ jobs: # Testing on Linux with various compilers - name: "Linux/GCC/Shared" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix - name: "Linux/GCC/Shared/no-xft" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix - CFGOPT="--disable-xft" - name: "Linux/GCC/Static" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix - CFGOPT="--disable-shared" - name: "Linux/GCC/Debug" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix @@ -49,7 +49,7 @@ jobs: # Older versions of GCC... - name: "Linux/GCC 7/Shared" os: linux - dist: bionic + dist: focal compiler: gcc-7 addons: apt: @@ -86,27 +86,27 @@ jobs: # Clang - name: "Linux/Clang/Shared" os: linux - dist: bionic + dist: focal compiler: clang env: - BUILD_DIR=unix - name: "Linux/Clang/Shared/no-xft" os: linux - dist: bionic + dist: focal compiler: clang env: - BUILD_DIR=unix - CFGOPT="--disable-xft" - name: "Linux/Clang/Static" os: linux - dist: bionic + dist: focal compiler: clang env: - CFGOPT="--disable-shared" - BUILD_DIR=unix - name: "Linux/Clang/Debug" os: linux - dist: bionic + dist: focal compiler: clang env: - BUILD_DIR=unix @@ -203,7 +203,7 @@ jobs: # "make dist" only - name: "Linux: make dist" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index d4dcc78..2e6b5e7 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -484,7 +484,7 @@ TkPutImage( * macro TK_NO_DOUBLE_BUFFERING, the generic code never calls XGetImage * or XCopyArea on macOS. Nonetheless, these function are in the stubs * table and therefore could be used by extensions. - * + * * This implementation does not work correctly. Originally it relied on * [NSBitmapImageRep initWithFocusedViewRect:view_rect] which was * deprecated by Apple in OSX 10.14 and also required the use of other |