From 68e290fdc0f4ae976acc38fe78754df0481b6acb Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 17 Aug 2020 12:10:28 +0000 Subject: Xcode 9 and 10 builds are failing. Let's see if this helps. --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7b1cac1..47eba63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -162,6 +162,11 @@ jobs: - name: "macOS/Clang/Xcode 10/Shared" os: osx osx_image: xcode10.3 + addons: + homebrew: + packages: + - tcl-tk + update: true env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14" @@ -171,6 +176,11 @@ jobs: - name: "macOS/Clang/Xcode 9/Shared" os: osx osx_image: xcode9.4 + addons: + homebrew: + packages: + - tcl-tk + update: true env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13" -- cgit v0.12 From 4897bedc54dcd46849d2288ad10bf6b457dfcdad Mon Sep 17 00:00:00 2001 From: fvogel Date: Mon, 17 Aug 2020 21:11:08 +0000 Subject: Remove comment relic. --- generic/tkScale.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generic/tkScale.c b/generic/tkScale.c index 979d39d..fd2f870 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -615,11 +615,6 @@ ConfigureScale( } } - /* - * Several options need special processing, such as parsing the - * orientation and creating GCs. - */ - scalePtr->fromValue = TkRoundValueToResolution(scalePtr, scalePtr->fromValue); scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue); -- cgit v0.12 From 69ce8a993ddb35eab3f80ad353471e43db57bd1e Mon Sep 17 00:00:00 2001 From: fvogel Date: Mon, 17 Aug 2020 21:15:28 +0000 Subject: Remove rounding of the fromValue to the resolution (which is a no-op). --- generic/tkScale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/generic/tkScale.c b/generic/tkScale.c index fd2f870..c5237be 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -615,8 +615,11 @@ ConfigureScale( } } - scalePtr->fromValue = TkRoundValueToResolution(scalePtr, - scalePtr->fromValue); + /* + * The fromValue shall not be rounded to the resolution, but the + * toValue and tickInterval do. + */ + scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue); scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr, scalePtr->tickInterval); -- cgit v0.12