diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-25 09:26:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-25 09:26:55 (GMT) |
| commit | b26dd4bffbf6100a480e0fd05d677bd7507a67b6 (patch) | |
| tree | 77a74d103fe3e72964728381f96b8d0bff573eff | |
| parent | 8207bbae557d4d7711c3b5a383dfb791f8156345 (diff) | |
| parent | 08b64027f4480a5aaa634ba89da1704539893bc5 (diff) | |
| download | tk-b26dd4bffbf6100a480e0fd05d677bd7507a67b6.zip tk-b26dd4bffbf6100a480e0fd05d677bd7507a67b6.tar.gz tk-b26dd4bffbf6100a480e0fd05d677bd7507a67b6.tar.bz2 | |
Merge 8.6
| -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 c0ca84a..95dd99b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ jobs: # Testing on Linux with various compilers - name: "Linux/GCC/Shared" os: linux - dist: bionic + dist: focal compiler: gcc env: - BUILD_DIR=unix @@ -34,21 +34,21 @@ jobs: - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1" - 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 @@ -77,7 +77,7 @@ jobs: # Older versions of GCC... - name: "Linux/GCC 7/Shared" os: linux - dist: bionic + dist: focal compiler: gcc-7 addons: apt: @@ -114,7 +114,7 @@ jobs: # Clang - name: "Linux/Clang/Shared" os: linux - dist: bionic + dist: focal compiler: clang env: - BUILD_DIR=unix @@ -127,21 +127,21 @@ jobs: - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1" - 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 @@ -250,7 +250,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 9257829..3523f2f 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -471,7 +471,7 @@ XPutImage( * 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 |