Dl/feat/mouse scrolling in generic spinctrl

.git-blame-ignore-revs

@@ -31,6 +31,9 @@ db31a0161503c6ea4cc461f4e10b67830b7d6b52
 # Fix comment typos in sources, 2021-10-02
 668a2186cd89fd4576bed224df3624811eebeca1
 
+# Wrap variable initializations after '=' consistently, 2019-11-22
+2bc6e50eded2a14099655ce0b4c7df582b87c93a
+
 # Remove all trailing spaces, 2019-01-30
 8fbca5cb70c8b647d5bd2cacb1e0a2a00358f351
 

.github/workflows/ci.yml

@@ -115,10 +115,10 @@ jobs:
             skip_samples: true
             use_asan: true
             use_xvfb: true
-          - name: Ubuntu 22.04 wxGTK UTF-8 C++20
+          - name: Ubuntu 22.04 wxGTK with UBSAN
             runner: ubuntu-22.04
-            configure_flags: --with-cxx=20 --enable-utf8 --enable-utf8only
-            use_asan: true
+            configure_flags: --with-cxx=20
+            use_ubsan: true
             use_xvfb: true
             build_out_of_tree_samples: true
           - name: Ubuntu 18.04 wxX11
@@ -286,11 +286,18 @@ jobs:
           fi
 
           if [ ${{ matrix.use_asan }} ]; then
-            wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
-            wxASAN_CXXFLAGS=$wxASAN_CFLAGS
-            wxASAN_LDFLAGS="-fsanitize=address"
+            wxSANITIZER_FLAGS='-fsanitize=address'
+
+            echo 'ASAN_OPTIONS=fast_unwind_on_malloc=0' >> $GITHUB_ENV
+          elif [ ${{ matrix.use_ubsan }} ]; then
+            wxSANITIZER_FLAGS='-fsanitize=undefined'
+          fi
 
-            ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
+          if [ -n "$wxSANITIZER_FLAGS" ]; then
+            ./configure $wxCONFIGURE_OPTIONS --enable-debug \
+                "CFLAGS=$wxSANITIZER_FLAGS -fno-omit-frame-pointer" \
+                "CXXFLAGS=$wxSANITIZER_FLAGS -fno-omit-frame-pointer" \
+                "LDFLAGS=$wxSANITIZER_FLAGS" || rc=$?
           else
             ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
           fi
@@ -349,7 +356,11 @@ jobs:
 
           httpbin_launch
 
-          export ASAN_OPTIONS=fast_unwind_on_malloc=0
+          if [ ${{ matrix.use_ubsan }} ]; then
+            # First run wiht UBSAN: halt on first error to make sure we fail if
+            # any UB is detected.
+            export UBSAN_OPTIONS=halt_on_error=1
+          fi
 
           # Explicitly use bash because /bin/sh doesn't have pipefail option
           /bin/bash -o pipefail -c './test 2>&1 | tee test.out' || rc=$?
@@ -363,6 +374,15 @@ jobs:
             fi
           fi
 
+          if [ ${{ matrix.use_ubsan }} ]; then
+            if grep -qF ': runtime error: ' test.out; then
+              export UBSAN_OPTIONS=print_stacktrace=1
+              echo '+++ UB detected, rerunning the tests to show all occurrences +++'
+              ./test
+              # Leave rc set to non-zero value to indicate failure.
+            fi
+          fi
+
           if [ -n "$rc" ]; then
             httpbin_show_log
             exit $rc
@@ -384,16 +404,21 @@ jobs:
             if [ -f wx_dbgsym_available ]; then
                 export LSAN_OPTIONS=suppressions=$(pwd)/misc/suppressions/lsan
             else
-                ASAN_OPTIONS=detect_leaks=0
+                ASAN_OPTIONS="$ASAN_OPTIONS detect_leaks=0"
             fi
-            export ASAN_OPTIONS="$ASAN_OPTIONS fast_unwind_on_malloc=0"
 
             # Running all tests at once fails, apparently due to running out of
             # memory when using ASAN, work around this problem by excluding
             # RichTextCtrlTestCase whose Table sub-test seems to be problematic.
             wx_tests_selection='~[.] ~RichTextCtrlTestCase'
           fi
 
+          if [ ${{ matrix.use_ubsan }} ]; then
+            # First run with UBSAN: halt on first error to make sure we fail if
+            # any UB is detected.
+            export UBSAN_OPTIONS=halt_on_error=1
+          fi
+
           # The tests only work reliably with native windows
           export QT_USE_NATIVE_WINDOWS=1
 
@@ -413,6 +438,17 @@ jobs:
           xvfb-run -a -s '-screen 0 1600x1200x24' ./test_gui -c Title WebView >/dev/null 2>&1 || echo 'First wxWebView test failure ignored.'
 
           /bin/bash -o pipefail -c "xvfb-run -a -s '-screen 0 1600x1200x24' ./test_gui -d 1 $wx_tests_selection 2>&1 | tee -a test_gui.out" || rc=$?
+
+          if [ ${{ matrix.use_ubsan }} ]; then
+            if grep -qF ': runtime error: ' test_gui.out; then
+              echo "\n\n+++ UB detected, rerunning the tests to show all occurrences +++\n"
+              export UBSAN_OPTIONS=print_stacktrace=1
+              xvfb-run -a -s '-screen 0 1600x1200x24' ./test_gui $wx_tests_selection
+              # rc should be already set to non-zero value, but make sure of it.
+              rc=1
+            fi
+          fi
+
           if [ -n "$rc" ]; then
             if grep -qF '(core dumped)' test_gui.out; then
                 echo '*** Test crashed, trying to get more information ***'
@@ -421,6 +457,7 @@ jobs:
             exit $rc
           fi
 
+
       - name: Building samples
         if: matrix.skip_samples != true
         run: |

.github/workflows/ci_cmake.yml

@@ -66,11 +66,11 @@ 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
-          - 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

.github/workflows/ci_mac.yml

@@ -94,12 +94,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
           configure_env: PKG_CONFIG_LIBDIR=/dev/null

.mailmap

@@ -44,6 +44,7 @@ Martin Ettl		<[email protected]>		<[email protected]>
 Mathew Maidment							<[email protected]>
 Micha Ahrweiler							<[email protected]>
 ousnius			<[email protected]>	<[email protected]>
+Paul Cornett		<[email protected]>
 Paul Kulchenko		<[email protected]>			<[email protected]>
 Pavel O.							<[email protected]>
 Pavel O.		<[email protected]>	<[email protected]>