update to upstream wxWidgets v3.2.11 + apply fixes

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   build-fedora:
     docker:
-      - image: fedora
+      - image: fedora:43
     steps:
       - run:
           name: Install Git

.cirrus.yml

@@ -11,7 +11,7 @@ task:
   skip: "changesIncludeOnly('appveyor.yml','CMakeLists.txt','.circleci/**','.github/**','docs/**','interface/**','include/wx/{msw,osx,qt}/**','src/{msw,osx,qt}/**','build/{cmake,msw,osx}/**')"
   name: Cirrus CI / FreeBSD wxGTK 3
   freebsd_instance:
-    image_family: freebsd-14-0
+    image_family: freebsd-14-3
 
   before_script: |
     echo LD_LIBRARY_PATH=`pwd`/lib >> $CIRRUS_ENV

.github/workflows/abi_check.yml

@@ -55,12 +55,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
       - name: Install CCache
-        uses: hendrikmuhs/ccache-action@v1.2.3
+        uses: hendrikmuhs/ccache-action@v1.2.23
         with:
           key: ubuntu-22.04-default
 

.github/workflows/ci.yml

@@ -88,16 +88,17 @@ jobs:
             use_xvfb: true
             build_out_of_tree_samples: true
           - name: Ubuntu 20.04 wxGTK 3 with clang
-            runner: ubuntu-20.04
+            runner: ubuntu-latest
+            container: ubuntu:20.04
             compiler: clang++-10
             configure_flags: --disable-sys-libs
             use_xvfb: true
-          - name: Ubuntu 20.04 wxGTK ANSI
-            runner: ubuntu-20.04
+          - name: Ubuntu 22.04 wxGTK ANSI
+            runner: ubuntu-22.04
             configure_flags: --disable-unicode
             skip_samples: true
-          - name: Ubuntu 22.04 wxGTK with ASAN
-            runner: ubuntu-22.04
+          - name: Ubuntu 24.04 wxGTK with ASAN
+            runner: ubuntu-24.04
             configure_flags: --disable-compat30 --disable-sys-libs
             skip_samples: true
             use_asan: true
@@ -149,16 +150,43 @@ jobs:
               fi
 
               compiler=${{ matrix.compiler }}
+              case "$compiler" in
+                clang++*)
+                  compiler_packages='clang libc++-dev libc++abi-dev'
+                  ;;
+
+                g++*)
+                  compiler_packages="${compiler}"
+                  ;;
+
+                '')
+                  # Assume gcc.
+                  compiler_packages='g++'
+                  ;;
+
+                *)
+                  echo '::error ::Unknown compiler kind.'
+                  exit 1
+              esac
 
               # Explanation for installing some less obvious packages:
               #   - coreutils contains nproc used in proc_count.sh called below.
               #   - locales contains locale-gen also used below.
-              #   - Python can't be installed using the action as usual because
-              #     it installs an ABI-incompatible version, see (wrongly, IMO)
-              #     closed https://github.com/actions/setup-python/issues/370
               #   - xvfb is used for running the GUI tests.
               apt-get update -qq
-              apt-get install -qq coreutils ${compiler-g++} git locales make pkg-config python3 python3-pip sudo xvfb
+              apt-get install -qq coreutils ${compiler_packages} git locales make pkg-config sudo xvfb
+
+              # Checkout action doesn't work under Ubuntu 18.04 any more, so
+              # run checkout manually.
+              git config --global --add safe.directory $GITHUB_WORKSPACE
+              git config --global gc.auto 0
+              git init $GITHUB_WORKSPACE
+              cd $GITHUB_WORKSPACE
+              git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+              git fetch --depth=1 origin $GITHUB_REF
+              git checkout FETCH_HEAD
+              git submodule update --init --depth=1 --recursive
+              git log -1 --format='%H'
               ;;
 
             '')
@@ -170,12 +198,14 @@ jobs:
           esac
 
       - name: Checkout
-        uses: actions/checkout@v3
+        if: matrix.container != 'ubuntu:18.04'
+        uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
       - name: Install CCache
-        uses: hendrikmuhs/ccache-action@v1.2.3
+        if: matrix.container != 'ubuntu:18.04'
+        uses: hendrikmuhs/ccache-action@v1.2.23
         with:
           key: ${{ matrix.name }}
 
@@ -188,6 +218,13 @@ jobs:
 
           echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
 
+          if [ '${{ matrix.container }}' = 'ubuntu:18.04' ]; then
+            # We can't easily install Go, so skip the tests requiring httpbin.
+            echo 'Disabling httpbin under Ubuntu 18.04'
+            echo WX_TEST_WEBREQUEST_URL=0 >> $GITHUB_ENV
+            export WX_TEST_WEBREQUEST_URL=0
+          fi
+
           # Setting this variable suppresses "Error retrieving accessibility bus address"
           # messages from WebKit tests that we're not interested in.
           echo NO_AT_BRIDGE=1 >> $GITHUB_ENV
@@ -200,6 +237,8 @@ jobs:
               echo LD=$compiler >> $GITHUB_ENV
 
               allow_warn_opt="-Wno-error=#warnings"
+
+              export WX_EXTRA_PACKAGES="libc++-dev"
               ;;
 
             g++*)
@@ -245,7 +284,7 @@ jobs:
           echo
 
           echo "ccache version:"
-          ccache --version
+          ccache --version || echo "ccache not available"
           echo
 
       - name: Configuring
@@ -294,11 +333,12 @@ jobs:
           make $wxBUILD_ARGS failtest
           make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
-      - name: Setup Python
-        if: matrix.container == ''
-        uses: actions/setup-python@v4
+      - name: Setup Go
+        if: matrix.container != 'ubuntu:18.04'
+        uses: actions/setup-go@v6
         with:
-          python-version: '3.10'
+          go-version: '1'
+          cache: false
 
       - name: Testing
         working-directory: tests

.github/workflows/ci_cmake.yml

@@ -59,12 +59,12 @@ jobs:
             runner: ubuntu-22.04
             cmake_generator: Unix Makefiles
             cmake_samples: ALL
-          - name: macOS 12 wxOSX
-            runner: macos-12
+          - name: macOS 14 wxOSX
+            runner: macos-14
             cmake_generator: Xcode
             cmake_defines: -DCMAKE_CXX_STANDARD=11
-          - name: macOS 12 wxIOS
-            runner: macos-12
+          - name: macOS 14 wxIOS
+            runner: macos-14
             cmake_generator: Xcode
             cmake_defines: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_FIND_ROOT_PATH=/usr/local -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO
             cmake_samples: OFF
@@ -87,7 +87,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
@@ -118,10 +118,11 @@ jobs:
         run: |
           ./build/tools/before_install.sh
 
-      # required for CMake to find Ninja
-      - name: "[Windows] Set up MSVC Developer Command Prompt"
-        if: runner.os == 'Windows'
-        uses: wxWidgets/gha-setup-vsdevenv@ac61ecb4b05909261f8f375601c0e15aabdd9f10
+      # required for CMake to find Ninja but shouldn't be used when using
+      # MSYS2, or we'd end up using MSVC clang instead of its own.
+      - name: Setup MSVC Environment
+        if: ${{ runner.os == 'Windows' && matrix.cmake_generator != 'MinGW Makefiles' }}
+        uses: step-security/gha-setup-vsdevenv@v6
 
       - name: Configuring
         run: |
@@ -144,10 +145,12 @@ jobs:
                 cmake --build . --target install
             fi
 
-      - name: Setup Python
-        uses: actions/setup-python@v4
+      - name: Setup Go
+        if: matrix.cmake_tests != 'OFF'
+        uses: actions/setup-go@v6
         with:
-          python-version: '3.10'
+          go-version: '1'
+          cache: false
 
       - name: Testing
         if: matrix.cmake_tests != 'OFF'

.github/workflows/ci_mac.yml

@@ -99,12 +99,12 @@ jobs:
           runner: self-hosted
           arch: arm64
           configure_flags: --with-cxx=14 --enable-universal_binary=arm64,x86_64 --disable-shared --disable-debug --enable-optimise
-        - name: wxMac macOS 12
-          runner: macos-12
+        - name: wxMac macOS 14
+          runner: macos-14
           arch: x86_64
           configure_flags: --disable-sys-libs
         - name: wxiOS
-          runner: macos-12
+          runner: macos-14
           arch: x86_64
           configure_flags: --with-osx_iphone --enable-monolithic  --disable-sys-libs --host=i686-apple-darwin_sim --build=x86_64-apple-darwin17.7.0
           xcode_sdk: iphonesimulator
@@ -120,7 +120,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 
@@ -207,12 +207,12 @@ jobs:
         make -C tests $wxBUILD_ARGS failtest
         make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
-    - name: Setup Python
-      # actions/setup-python broken on self-hosted https://github.com/actions/setup-python/issues/108
-      if: matrix.runner != 'self-hosted'
-      uses: actions/setup-python@v4
+    - name: Setup Go
+      if: matrix.skip_testing != true
+      uses: actions/setup-go@v6
       with:
-        python-version: '3.10'
+        go-version: '1'
+        cache: false
 
     - name: Testing
       if: matrix.skip_testing != true

.github/workflows/ci_mac_xcode.yml

@@ -114,7 +114,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v6
       with:
         submodules: recursive
 

.github/workflows/ci_msw.yml

@@ -56,26 +56,24 @@ permissions:
 
 jobs:
   msw-msvs:
-    runs-on: windows-${{ matrix.vsversion }}
-    name: wxMSW vs${{ matrix.vsversion }} ${{ matrix.configuration }} ${{ matrix.platform }}
+    runs-on: windows-2022
+    name: wxMSW vs2022 ${{ matrix.configuration }} ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - configuration: 'DLL Debug'
             platform: 'x64'
-            vsversion: 2022
+            use_utf8: true
           - configuration: 'Debug'
             platform: 'Win32'
-            vsversion: 2019
           - configuration: 'DLL Release'
             platform: 'x64'
-            vsversion: 2019
             use_stl: true
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
@@ -89,7 +87,7 @@ jobs:
             Set-Content setup.h
 
       - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.1.3
+        uses: microsoft/setup-msbuild@v3
         with:
             vs-prerelease: true
 
@@ -113,6 +111,21 @@ jobs:
       - name: Run tests
         working-directory: tests
         run: |
+            go install github.com/mccutchen/go-httpbin/v2/cmd/go-httpbin@v2
+            $gopath = $(go env GOPATH)
+            $env:PATH += ";$gopath\bin"
+            Start-Job -Name wx_httpbin { go-httpbin -host 127.0.0.1 -port 8081 2>&1 > httpbin.log }
+            Start-Sleep -Seconds 5
+            curl.exe --silent --show-error http://127.0.0.1:8081/ip > $null
+            if ($lastExitCode -eq "0") {
+                $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:8081"
+            }
+            else {
+                Write-Error "Disabling wxWebRequest tests as launching httpbin failed, log follows:"
+                Get-Content httpbin.log
+                $env:WX_TEST_WEBREQUEST_URL="0"
+            }
+
             .\vc*msw*\test.exe
 
       - name: Build GUI tests

.github/workflows/ci_msw_cross.yml

@@ -71,7 +71,7 @@ jobs:
       matrix:
         include:
           - name: wxMSW 64 bits
-            debian_release: testing
+            debian_release: stable
             configure_flags: --enable-stl --disable-compat30
           - name: wxMSW 32 bits
             # Testing doesn't have 32 bit support any more.
@@ -137,12 +137,12 @@ jobs:
           echo "wxTEST_RUNNER=wine" >> $GITHUB_ENV
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
       - name: Install CCache
-        uses: hendrikmuhs/ccache-action@v1.2.3
+        uses: hendrikmuhs/ccache-action@v1.2.23
         with:
           key: ${{ matrix.name }}