Merge 8.6

6 files changed, 5 insertions, 300 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 08858a9..98fe4ca 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -194,4 +194,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index d0a9712..6f30417 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -161,7 +161,7 @@ jobs:
             echo "::error::Failure in ttk test results"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 20
       - name: Carry out trial installation
         run: |
           make install || {
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 9efa4bf..4ef735f 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -87,7 +87,7 @@ jobs:
         env:
           CI_BUILD_WITH_MSVC: 1
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 10
       - name: Build Help (${{ matrix.config }})
         run: |
           &nmake -f makefile.vc htmlhelp ${{ matrix.config }}
@@ -176,4 +176,4 @@ jobs:
             echo "::error::Failure during Test"
             exit 1
           }
-        timeout-minutes: 15
+        timeout-minutes: 10
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7268340..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,294 +0,0 @@
-language: c
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - binutils-mingw-w64-i686
-      - binutils-mingw-w64-x86-64
-      - gcc-mingw-w64
-      - gcc-mingw-w64-base
-      - gcc-mingw-w64-i686
-      - gcc-mingw-w64-x86-64
-      - gcc-multilib
-      - tcl8.6-dev
-      - libx11-dev
-      - libnotify-dev
-      - libglib2.0-dev
-      - libxss-dev
-      - libxft-dev
-      - xvfb
-  homebrew:
-    packages:
-      - tcl-tk
-      - libnotify
-      - glib
-#   casks:
-#     - xquartz
-jobs:
-  include:
-# Testing on Linux GCC
-    - name: "Linux/GCC/Shared"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: &x11gui
-        - make binaries libraries tktest
-        - make install
-        - make test-classic >out-classic.txt
-        - cat out-classic.txt
-        - grep -q "Failed	0" out-classic.txt
-        - make test-ttk >out-ttk.txt
-        - cat out-ttk.txt
-        - grep -q "Failed	0" out-ttk.txt
-    - name: "Linux/GCC/Shared: NO_DEPRECATED"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
-      script: *x11gui
-    - name: "Linux/GCC/Shared/no-xft"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-xft"
-      script: *x11gui
-    - name: "Linux/GCC/Shared/no-libnotify"
-      os: linux
-      dist: focal
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-libnotify"
-      script: *x11gui
-    - name: "Linux/GCC/Shared/bionic"
-      os: linux
-      dist: bionic
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: *x11gui
-    - name: "Linux/GCC/Shared/xenial"
-      os: linux
-      dist: xenial
-      services:
-        - xvfb
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script: *x11gui
-    - name: "Linux/GCC/Static"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-shared"
-    - name: "Linux/GCC/Debug"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-    - name: "Linux/G++/Shared"
-      os: linux
-      dist: focal
-      compiler: g++
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="CC=g++ CFLAGS=-Dregister=dont+use+register"
-    - name: "Linux/G++/Shared UTF_MAX=4"
-      os: linux
-      dist: focal
-      compiler: g++
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="CC=g++ CFLAGS=-DTCL_UTF_MAX=4"
-    - name: "Linux/G++/Shared UTF_MAX=6"
-      os: linux
-      dist: focal
-      compiler: g++
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="CC=g++ CFLAGS=-DTCL_UTF_MAX=6"
-# Newer/Older versions of GCC
-    - name: "Linux/GCC 10/Shared"
-      os: linux
-      dist: focal
-      compiler: gcc-10
-      addons:
-        apt:
-          packages:
-            - g++-10
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC 5/Shared"
-      os: linux
-      dist: bionic
-      compiler: gcc-5
-      addons:
-        apt:
-          packages:
-            - g++-5
-      env:
-        - BUILD_DIR=unix
-# Testing on Linux Clang
-    - name: "Linux/Clang/Shared"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Shared: NO_DEPRECATED"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
-    - name: "Linux/Clang/Shared/no-xft"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--disable-xft"
-    - name: "Linux/Clang/Static"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
-    - name: "Linux/Clang/Debug"
-      os: linux
-      dist: focal
-      compiler: clang
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--enable-symbols"
-# Testing on Mac, various styles
-    - name: "macOS/Xcode 12/Shared"
-      os: osx
-      osx_image: xcode12
-      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 12/Shared"
-      os: osx
-      osx_image: xcode12
-      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/Xcode 12/Static"
-      os: osx
-      osx_image: xcode12
-      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"
-    - name: "macOS/Xcode 12/Debug"
-      os: osx
-      osx_image: xcode12
-      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"
-#   - name: "macOS/Xcode 12/Shared/XQuartz"
-#     os: osx
-#     osx_image: xcode12
-#     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"
-# Older MacOS versions
-    - name: "macOS/Xcode 11/Shared"
-      os: osx
-      osx_image: xcode11.7
-      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"
-    - name: "macOS/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"
-    - name: "macOS/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"
-# Test on Windows with MSVC native
-#   - name: "Windows/MSVC/Shared"
-#     os: windows
-#     compiler: cl
-#     env: &vcenv
-#       - BUILD_DIR=win
-#       - VCDIR="/C/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build"
-#     before_install: &vcpreinst
-#       - PATH="$PATH:$VCDIR"
-#       - cd ${BUILD_DIR}
-#     install: []
-#     script:
-#       - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tktest
-# "make dist" only
-    - name: "Linux: make dist"
-      os: linux
-      dist: focal
-      compiler: gcc
-      env:
-        - BUILD_DIR=unix
-      script:
-        - make dist
-before_install:
-  - |-
-      case $TRAVIS_OS_NAME in
-        windows)
-          choco install -y magicsplat-tcl-tk
-          ;;
-      esac
-  - cd ${BUILD_DIR}
-install:
-  - mkdir "$HOME/install dir"
-  - ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
-script:
-  - make all tktest
-  - make install
-before_cache:
-  - |-
-      case $TRAVIS_OS_NAME in
-        osx)
-          brew cleanup
-          ;;
-      esac
-cache:
-  directories:
-  - $HOME/Library/Caches/Homebrew
-  - $HOME/AppData/Local/Temp/chocolatey
-  - $HOME/AppData/Local/Apps/Tcl86
diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h
index 146bfe7..043c88d 100644
--- a/generic/tkMenubutton.h
+++ b/generic/tkMenubutton.h
@@ -165,7 +165,7 @@ typedef struct {
     				 * "right", and "flush". "flush" means that
     				 * the upper left corner of the menubutton is
     				 * where the menu pops up. "above" and "below"
-    				 * will attempt to pop the menu compleletly
+    				 * will attempt to pop the menu completely
     				 * above or below the menu respectively.
     				 * "left" and "right" will pop the menu left
     				 * or right, and the active item will be next
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5592c6c..ec6ea48 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1797,7 +1797,6 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC
 		$(TEST_DIR)/option.file* $(DISTDIR)/tests
 	$(INSTALL_DATA_DIR) $(DISTDIR)/tests/ttk
 	$(DIST_INSTALL_DATA) $(TEST_DIR)/ttk/*.{svg,test,tcl} $(DISTDIR)/tests/ttk
-	cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
 	mkdir -p $(DISTDIR)/.github/workflows
 	cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows