diff options
| -rw-r--r-- | .travis.yml | 34 | ||||
| -rw-r--r-- | generic/tkScale.c | 10 |
2 files changed, 26 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index e4662b3..c0ca84a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -147,21 +147,21 @@ jobs: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Clang/Xcode 11.5/Shared" + - name: "macOS/Clang/Xcode 11.6/Shared" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" - - name: "macOS/Clang++/Xcode 11.5/Shared" + - name: "macOS/Clang++/Xcode 11.6/Shared" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib CC=clang++ --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-D__private_extern__=extern" - - name: "macOS/Clang/Xcode 11.5/Shared" + - name: "macOS/Clang/Xcode 11.6/Shared" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" @@ -169,27 +169,27 @@ jobs: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: &mactest - make all tktest - - name: "macOS/Clang/Xcode 11.5/Static" + - name: "macOS/Clang/Xcode 11.6/Static" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include" install: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: *mactest - - name: "macOS/Clang/Xcode 11.5/Debug" + - name: "macOS/Clang/Xcode 11.6/Debug" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include" install: - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1) script: *mactest - - name: "macOS/Clang/Xcode 11.5/Shared/XQuartz" + - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz" os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 env: - BUILD_DIR=unix - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include" @@ -209,6 +209,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" @@ -218,6 +223,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" diff --git a/generic/tkScale.c b/generic/tkScale.c index 82ed70c..f1e2cec 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -659,13 +659,11 @@ ConfigureScale( } } - /* - * Several options need special processing, such as parsing the - * orientation and creating GCs. - */ + /* + * The fromValue shall not be rounded to the resolution, but the + * toValue and tickInterval do. + */ - scalePtr->fromValue = TkRoundValueToResolution(scalePtr, - scalePtr->fromValue); scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue); scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr, scalePtr->tickInterval); |