Tag 3.0.0-rc2 release yet again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_3_0_0-rc2@75087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

.editorconfig

@@ -1,16 +0,0 @@
-# This is the EditorConfig (http://editorconfig.org/) coding style file for
-# wxWidgets.
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-
-[makefile.*]
-indent_style = tab
-indent_size = 8

.gitattributes

@@ -1,46 +0,0 @@
-# Windows-specific files that require CRLF:
-
-*.bat             eol=crlf
-*.bcc             eol=crlf
-*.dsw             eol=crlf
-*.gcc             eol=crlf
-*.props           eol=crlf
-*.rc              eol=crlf
-*.sln             eol=crlf
-*.vc              eol=crlf
-*.vcproj          eol=crlf
-*.vcxproj         eol=crlf
-*.vcxproj.filters eol=crlf
-
-# Documentation used with Windows installer:
-
-/BuildGit.txt         text=auto
-/docs/changes.txt     text=auto
-/docs/licence.txt     text=auto
-/docs/readme.txt      text=auto
-/docs/msw/*.txt       text=auto
-
-# Unix-specific files that require LF:
-
-*.h.in       eol=lf
-*.m4         eol=lf
-*.sh         eol=lf
-configure.in eol=lf
-Makefile.am  eol=lf
-Makefile.in  eol=lf
-makefile.unx eol=lf
-
-config.guess eol=lf
-config.sub   eol=lf
-configure    eol=lf
-configure.in eol=lf
-
-# Ignore changes in the generated files.
-build/upmake    -diff
-
-# Don't include stuff which is only used with Git in the archives.
-.github/                        export-ignore
-.gitattributes                  export-ignore
-.gitignore                      export-ignore
-.gitmodules                     export-ignore
-appveyor.yml                    export-ignore

.github/CONTRIBUTING.md

@@ -1,12 +0,0 @@
-# How to Contribute to wxWidgets
-
-We appreciate receiving contributions and we have a community-maintained
-[guide for contributors](https://wiki.wxwidgets.org/Development:_How_To_Contribute)
-which explains everything you ever wanted to know for contributing to
-wxWidgets.
-
-You can either submit your [patches](https://trac.wxwidgets.org/wiki/HowToSubmitPatches)
-to [wxTrac](https://trac.wxwidgets.org/newticket) or open GitHub pull requests,
-depending on your preferences.
-
-### Thanks in advance and looking forward to your contributions!

.github/workflows/ci.yml

@@ -1,282 +0,0 @@
-# CI workflow for wxWidgets builds using configure+make under Unix.
-name: Unix builds
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_msw.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/msw/**'
-      - 'locale/**'
-      - 'src/msw/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_msw.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/msw/**'
-      - 'locale/**'
-      - 'src/msw/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-
-jobs:
-  build:
-    runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.name }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Ubuntu 18.04 wxGTK 2
-            runner: ubuntu-18.04
-            gtk_version: 2
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK 2 UTF-8
-            runner: ubuntu-18.04
-            gtk_version: 2
-            configure_flags: --enable-utf8 --enable-utf8only --enable-monolithic
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK3 static
-            runner: ubuntu-18.04
-            configure_flags: --disable-shared
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK 3 STL
-            runner: ubuntu-18.04
-            configure_flags: --enable-cxx11 --enable-stl --disable-compat30
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK 3 with clang
-            runner: ubuntu-18.04
-            compiler: clang
-            configure_flags: --disable-sys-libs
-            use_xvfb: true
-          - name: Ubuntu 20.04 wxGTK ANSI
-            runner: ubuntu-20.04
-            configure_flags: --disable-unicode
-            skip_samples: true
-          - name: Ubuntu 20.04 wxGTK with ASAN
-            runner: ubuntu-20.04
-            configure_flags: --disable-compat30 --disable-sys-libs --disable-webview
-            skip_samples: true
-            use_asan: true
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxX11
-            runner: ubuntu-18.04
-            configure_flags: --with-x11 --enable-pch --disable-stc
-            skip_samples: true
-          - name: Ubuntu 18.04 wxDFB
-            runner: ubuntu-18.04
-            configure_flags: --with-directfb --enable-pch --disable-stc
-            skip_samples: true
-            allow_warnings: true
-          - name: Ubuntu 18.04 wxMotif
-            runner: ubuntu-18.04
-            configure_flags: --with-motif --enable-pch --disable-stc
-            skip_samples: true
-          - name: Ubuntu 18.04 wxQt
-            runner: ubuntu-18.04
-            configure_flags: --with-qt --enable-pch --without-opengl
-            skip_samples: true
-
-    env:
-      wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
-      wxCONFIGURE_FLAGS: ${{ matrix.configure_flags }}
-      wxUSE_ASAN: ${{ matrix.use_asan && 1 || 0 }}
-      wxUSE_XVFB: ${{ matrix.use_xvfb && 1 || 0 }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Install CCache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ matrix.name }}
-
-      - name: Set up build environment
-        run: |
-          echo LD_LIBRARY_PATH=`pwd`/lib >> $GITHUB_ENV
-
-          wxPROC_COUNT=`./build/tools/proc_count.sh`
-          echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $GITHUB_ENV
-
-          echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
-
-          # 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
-
-          case "${{ matrix.compiler }}" in
-            clang)
-              echo CC=clang >> $GITHUB_ENV
-              echo CXX='clang++ -stdlib=libc++' >> $GITHUB_ENV
-              echo LD=clang++ >> $GITHUB_ENV
-
-              allow_warn_opt="-Wno-error=#warnings"
-              ;;
-
-            '')
-              # Assume gcc.
-              allow_warn_opt="-Wno-error=cpp"
-              ;;
-
-            *)
-              echo "*** Unknown compiler: ${{ matrix.compiler }} ***"
-              ;;
-          esac
-
-          if [ -z ${{ matrix.allow_warnings }} ]; then
-            error_opts="-Werror $allow_warn_opt"
-            echo "wxMAKEFILE_ERROR_CXXFLAGS=$error_opts" >> $GITHUB_ENV
-            echo "wxMAKEFILE_CXXFLAGS=$wxMAKEFILE_CXXFLAGS $error_opts" >> $GITHUB_ENV
-          fi
-
-          echo "wxMAKEFILE_CXXFLAGS=$wxMAKEFILE_CXXFLAGS $error_opts" >> $GITHUB_ENV
-
-          # Install locales used by our tests to run all the tests instead of
-          # skipping them.
-          sudo locale-gen de_DE.utf8 de_CH.utf8 en_US.utf8 fr_FR.utf8 sv_SE.utf8
-
-          ./build/tools/before_install.sh
-
-      - name: Show build environment
-        run: |
-          echo "Environment:"
-          env | sort
-          echo
-
-          echo "Compiler version:"
-          ${CXX-g++} --version
-          echo
-
-          echo "ccache version:"
-          ccache --version
-          echo
-
-      - name: Configuring
-        run: |
-          wxCONFIGURE_OPTIONS="--disable-optimise $wxCONFIGURE_FLAGS"
-          if [ -n "${{ matrix.gtk_version }}" ]; then
-            wxCONFIGURE_OPTIONS="--with-gtk=${{ matrix.gtk_version }} $wxCONFIGURE_OPTIONS"
-          fi
-
-          if [ ${{ matrix.use_asan }} ]; then
-            wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
-            wxASAN_CXXFLAGS=$wxASAN_CFLAGS
-            wxASAN_LDFLAGS="-fsanitize=address"
-
-            ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
-          else
-            ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
-          fi
-
-          if [ -n "$rc" ]; then
-            echo '*** Configuring failed, contents of config.log follows: ***'
-            echo '-----------------------------------------------------------'
-            cat config.log
-            echo '-----------------------------------------------------------'
-            exit $rc
-          fi
-
-      - name: Building
-        run: |
-          make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
-
-      - name: Building tests
-        working-directory: tests
-        run: |
-          make $wxBUILD_ARGS failtest
-          make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
-
-      - name: Testing
-        working-directory: tests
-        run: |
-          . ../build/tools/httpbin.sh
-
-          httpbin_launch
-
-          export ASAN_OPTIONS=fast_unwind_on_malloc=0
-
-          # Explicitly use bash because /bin/sh doesn't have pipefail option
-          /bin/bash -o pipefail -c './test 2>&1 | tee test.out' || rc=$?
-          if [ ${{ matrix.use_asan }} ]; then
-            # Work around spurious crashes by running the test again.
-            # See https://github.com/google/sanitizers/issues/1353
-            if fgrep -q 'LeakSanitizer has encountered a fatal error' test.out; then
-                echo '+++ Rerunning the tests once again after LeakSanitizer crash +++'
-                unset rc
-                ./test || rc=$?
-            fi
-          fi
-
-          if [ -n "$rc" ]; then
-            httpbin_show_log
-            exit $rc
-          fi
-
-      - name: Testing GUI using Xvfb
-        if: matrix.use_xvfb
-        working-directory: tests
-        run: |
-          if [ ${{ matrix.use_asan }} ]; then
-            # Leak suppression only works if we have debug symbols available,
-            # otherwise we disable it to avoid tons of reports about leaks in
-            # libfontconfig etc.
-            if [ -f wx_dbgsym_available ]; then
-                export LSAN_OPTIONS=suppressions=$(pwd)/misc/suppressions/lsan
-            else
-                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
-          ulimit -c unlimited
-          /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 [ -n "$rc" ]; then
-            if fgrep -q '(core dumped)' test_gui.out; then
-                echo '*** Test crashed, trying to get more information ***'
-                gdb --quiet --core=core -ex 'where' -ex 'thread apply all bt' -ex 'q' ./test_gui
-            fi
-            exit $rc
-          fi
-
-      - name: Building samples
-        if: matrix.skip_samples != true
-        run: |
-          make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples
-
-      - name: Installing
-        run: |
-          sudo make install
-
-      - name: Testing installation
-        run: |
-          make -C samples/minimal -f makefile.unx clean
-          make -C samples/minimal -f makefile.unx $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"

.github/workflows/ci_cmake.yml

@@ -1,139 +0,0 @@
-# CI workflow for wxWidgets builds using CMake.
-name: CMake builds
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/msw/**'
-      - 'locale/**'
-      - 'src/msw/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/msw/**'
-      - 'locale/**'
-      - 'src/msw/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-
-jobs:
-  build:
-    runs-on: ${{ matrix.runner }}
-    name: ${{ matrix.name }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Ubuntu 18.04 wxGTK 3
-            runner: ubuntu-18.04
-            cmake_generator: Unix Makefiles
-            cmake_samples: ALL
-          - name: macOS 10.15 wxOSX
-            runner: macos-10.15
-            cmake_generator: Xcode
-            cmake_defines: -DCMAKE_CXX_STANDARD=11
-          - name: macOS 10.15 wxIOS
-            runner: macos-10.15
-            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
-            cmake_tests: OFF
-
-    env:
-      wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Set environment variables
-        run: |
-          wxPROC_COUNT=`./build/tools/proc_count.sh`
-          if [ "${{ matrix.cmake_generator }}" == "Xcode" ]; then
-              # Xcode generates a lot of output, suppress it so only warnings and errors are visible
-              wxBUILD_ARGS="-jobs $wxPROC_COUNT -quiet"
-          else
-              wxBUILD_ARGS=-j$wxPROC_COUNT
-          fi
-          echo wxBUILD_ARGS=$wxBUILD_ARGS >> $GITHUB_ENV
-
-          cmake_tests=${{ matrix.cmake_tests }}
-          if [ -z $cmake_tests ]; then cmake_tests=CONSOLE_ONLY; fi
-          echo wxCMAKE_TESTS=$cmake_tests >> $GITHUB_ENV
-
-          cmake_samples=${{ matrix.cmake_samples }}
-          if [ -z $cmake_samples ]; then cmake_samples=SOME; fi
-          echo wxCMAKE_SAMPLES=$cmake_samples >> $GITHUB_ENV
-
-          # 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
-
-      - name: Before install
-        run: |
-          ./build/tools/before_install.sh
-
-      - name: Configuring
-        run: |
-          cmake --version
-          mkdir build_cmake
-          pushd build_cmake
-          cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.cmake_defines }} -DwxBUILD_SAMPLES=$wxCMAKE_SAMPLES -DwxBUILD_TESTS=$wxCMAKE_TESTS ..
-
-      - name: Building
-        working-directory: build_cmake
-        run: |
-          cmake --build . -- $wxBUILD_ARGS
-
-      - name: Installing
-        working-directory: build_cmake
-        run: |
-          sudo cmake --build . --target install
-
-      - name: Testing
-        if: matrix.cmake_tests != 'OFF'
-        working-directory: build_cmake
-        run: |
-          . ../build/tools/httpbin.sh
-
-          httpbin_launch
-
-          ctest -V -C Debug --output-on-failure --interactive-debug-mode 0 . || rc=$?
-          if [ -n "$rc" ]; then
-              httpbin_show_log
-              exit $rc
-          fi
-
-      - name: Testing installation
-        run: |
-          mkdir build_cmake_install_test
-          pushd build_cmake_install_test
-          cmake -G "${{ matrix.cmake_generator }}" ${{ matrix.cmake_defines }} ../samples/minimal
-          cmake --build .

.github/workflows/ci_mac.yml

@@ -1,225 +0,0 @@
-name: Mac builds
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ master ]
-    paths-ignore:
-    - '.github/workflows/ci.yml'
-    - '.github/workflows/ci_cmake.yml'
-    - '.github/workflows/ci_msw.yml'
-    - '.github/workflows/ci_msw_cross.yml'
-    - 'build/tools/appveyor*.bat'
-    - 'distrib/**'
-    - 'docs/**'
-    - 'interface/**'
-    - 'include/msvc/**'
-    - 'include/wx/dfb/**'
-    - 'include/wx/gtk/**'
-    - 'include/wx/gtk1/**'
-    - 'include/wx/motif/**'
-    - 'include/wx/msw/**'
-    - 'include/wx/x11/**'
-    - 'locale/**'
-    - 'src/dfb/**'
-    - 'src/gtk/**'
-    - 'src/gtk1/**'
-    - 'src/motif/**'
-    - 'src/msw/**'
-    - 'src/x11/**'
-    - '*.md'
-    - '*.yml'
-    - 'wxwidgets.props'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-    - '.github/workflows/ci.yml'
-    - '.github/workflows/ci_cmake.yml'
-    - '.github/workflows/ci_msw.yml'
-    - '.github/workflows/ci_msw_cross.yml'
-    - 'build/tools/appveyor*.bat'
-    - 'distrib/**'
-    - 'docs/**'
-    - 'interface/**'
-    - 'include/msvc/**'
-    - 'include/wx/dfb/**'
-    - 'include/wx/gtk/**'
-    - 'include/wx/gtk1/**'
-    - 'include/wx/motif/**'
-    - 'include/wx/msw/**'
-    - 'include/wx/x11/**'
-    - 'locale/**'
-    - 'src/dfb/**'
-    - 'src/gtk/**'
-    - 'src/gtk1/**'
-    - 'src/motif/**'
-    - 'src/msw/**'
-    - 'src/x11/**'
-    - '*.md'
-    - '*.yml'
-    - 'wxwidgets.props'
-
-jobs:
-  build-and-test:
-    defaults:
-      run:
-        shell: /usr/bin/arch -arch ${{ matrix.arch }} /bin/bash -l {0}
-
-    runs-on: ${{ matrix.runner }}
-
-    name: ${{ matrix.name }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: wxMac ARM C++11
-          runner: self-hosted
-          arch: arm64
-          configure_flags: --with-cxx=11
-          use_asan: true
-        - name: wxMac Intel C++17
-          runner: self-hosted
-          arch: x86_64
-          configure_flags: --with-cxx=17 --with-macosx-version-min=10.12 --enable-debug
-        - name: wxMac Universal C++14
-          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 10.15
-          runner: macos-10.15
-          arch: x86_64
-          configure_flags: --disable-sys-libs
-        - name: wxiOS
-          runner: macos-10.15
-          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
-          skip_samples: true
-          skip_testing: true
-          allow_warnings: true
-
-    env:
-      wxCONFIGURE_FLAGS: --disable-sys-libs --without-liblzma ${{ matrix.configure_flags }} --prefix=${{ github.workspace }}/localbin_${{ matrix.arch }}
-      wxUSE_ASAN: ${{ matrix.use_asan && 1 || 0 }}
-      DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
-      NSUnbufferedIO: YES
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: recursive
-
-    - name: Set environment variables
-      run: |
-        echo TZ=UTC >> $GITHUB_ENV
-        echo LD_LIBRARY_PATH=`pwd`/lib >> $GITHUB_ENV
-        wxPROC_COUNT=`sysctl -n hw.logicalcpu`
-        ((wxPROC_COUNT++))
-        echo wxPROC_COUNT=$wxPROC_COUNT >> $GITHUB_ENV
-        echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $GITHUB_ENV
-        # 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
-        case "${{ matrix.compiler }}" in
-          clang)
-            echo CC=clang >> $GITHUB_ENV
-            echo CXX='clang++ -stdlib=libc++' >> $GITHUB_ENV
-            echo LD=clang++ >> $GITHUB_ENV
-            allow_warn_opt="-Wno-error=#warnings"
-            ;;
-          '')
-            # Assume gcc.
-            allow_warn_opt="-Wno-error=cpp"
-            ;;
-          *)
-            echo "*** Unknown compiler: ${{ matrix.compiler }} ***"
-            ;;
-        esac
-        if [ -z ${{ matrix.allow_warnings }} ]; then
-          error_opts="-Werror $allow_warn_opt"
-          echo "wxMAKEFILE_ERROR_CXXFLAGS=$error_opts" >> $GITHUB_ENV
-          echo "wxMAKEFILE_CXXFLAGS=$wxMAKEFILE_CXXFLAGS $error_opts" >> $GITHUB_ENV
-        fi
-        echo "wxMAKEFILE_CXXFLAGS=$wxMAKEFILE_CXXFLAGS $error_opts" >> $GITHUB_ENV
-
-    - name: Before install
-      run: |
-        ./build/tools/before_install.sh
-        mkdir -p $PWD/localbin_${{ matrix.arch }}
-
-    - name: Configuring
-      run: |
-        wxCONFIGURE_OPTIONS="--disable-optimise $wxCONFIGURE_FLAGS"
-
-        if [ -n "${{ matrix.xcode_sdk }}" ]; then
-          sdk_path=`xcrun --sdk ${{ matrix.xcode_sdk }} --show-sdk-path`
-          wxCONFIGURE_OPTIONS="--with-macosx-sdk=$sdk_path $wxCONFIGURE_OPTIONS"
-        fi
-
-        ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
-        if [ ${{ matrix.use_asan }} ]; then
-          wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
-          wxASAN_CXXFLAGS=$wxASAN_CFLAGS
-          wxASAN_LDFLAGS="-fsanitize=address"
-
-          ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
-        else
-          ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
-        fi
-        if [ -n "$rc" ]; then
-          echo '*** Configuring failed, contents of config.log follows: ***'
-          echo '-----------------------------------------------------------'
-          cat config.log
-          echo '-----------------------------------------------------------'
-          exit $rc
-        fi
-
-    - name: Building
-      run: |
-        make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
-
-    - name: Building tests
-      run: |
-        make -C tests $wxBUILD_ARGS failtest
-        make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
-
-    - name: Testing
-      if: matrix.skip_testing != true
-      working-directory: tests
-      run: |
-        . ../build/tools/httpbin.sh
-        httpbin_launch
-        export ASAN_OPTIONS=fast_unwind_on_malloc=0
-        # Explicitly use bash because /bin/sh doesn't have pipefail option
-        /bin/bash -o pipefail -c './test 2>&1 | tee test.out' || rc=$?
-        if [ -n "$rc" ]; then
-          httpbin_show_log
-          exit $rc
-        fi
-
-    - name: Testing GUI
-      if: matrix.skip_testing != true
-      working-directory: tests
-      run: |
-        export ASAN_OPTIONS=fast_unwind_on_malloc=0
-        # Exclude tests that are currently known to fail
-        wx_tests_selection='~[valnum] ~wxPersistTLW ~wxPersistDVC ~wxTopLevel::Show ~wxFont::Weight ~wxFont::NativeFontInfo ~WebView ~RadioButton::Single ~RadioButton::Focus ~wxHtmlPrintout::Pagination ~wxTextCtrl::GetBestSize ~TextCtrlTestCase ~ClippingBoxTestCase::wxClientDC ~wxExecute::RedirectUTF8 ~Ellipsization::NormalCase ~SpinCtrl::* ~SpinCtrlDouble::* ~NotebookTestCase ~SettingsTestCase ~XRC::LoadURL ~Window::Show ~ModalDialogsTestCase ~Button::Click ~Button::Disabled ~wxDVC::GetItemRect ~wxDVC::AppendTextColumn ~Grid::KeyboardSelection ~Grid::CellClick ~Grid::ReorderedColumnsCellClick ~Grid::CellSelect ~wxStyledTextCtrl::AutoComp ~EvtLoopTestCase ~EventPropagationTestCase'
-        ./test_gui $wx_tests_selection
-
-    - name: Building samples
-      if: matrix.skip_testing != true && matrix.skip_samples != true
-      run: |
-        make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples
-
-    - name: Installing
-      if: matrix.skip_testing != true
-      run: |
-        make install
-
-    - name: Testing installation
-      if: matrix.skip_testing != true
-      run: |
-        make -C samples/minimal -f makefile.unx clean
-        make -C samples/minimal -f makefile.unx WX_CONFIG=${{ github.workspace }}/localbin_${{ matrix.arch }}/bin/wx-config $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"

.github/workflows/ci_msw.yml

@@ -1,102 +0,0 @@
-# CI workflow building wxMSW under Windows.
-name: MSW builds
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/wx/gtk/**'
-      - 'include/wx/osx/**'
-      - 'locale/**'
-      - 'src/gtk/**'
-      - 'src/osx/**'
-      - '*.md'
-      - '*.yml'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw_cross.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/wx/gtk/**'
-      - 'include/wx/osx/**'
-      - 'locale/**'
-      - 'src/gtk/**'
-      - 'src/osx/**'
-      - '*.md'
-      - '*.yml'
-
-jobs:
-  msw-msvs:
-    runs-on: windows-${{ matrix.vsversion }}
-    name: wxMSW vs${{ matrix.vsversion }} ${{ matrix.configuration }} ${{ matrix.platform }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - configuration: 'DLL Debug'
-            platform: 'x64'
-            vsversion: 2022
-          - configuration: 'Debug'
-            platform: 'Win32'
-            vsversion: 2019
-          - configuration: 'DLL Release'
-            platform: 'x64'
-            vsversion: 2019
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.3
-        with:
-            vs-prerelease: true
-
-      - name: Build
-        run: |
-            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} build\msw\wx_vc16.sln
-            if ( '${{ matrix.configuration }}'.IndexOf('DLL') -ne -1 ) {
-                $dlldir = Join-Path (Get-Location) 'lib\vc_${{ matrix.platform }}_dll'
-                Write-Output "Adding $dlldir to the PATH"
-                $dlldir | Out-File -Append $env:GITHUB_PATH
-            }
-
-      - name: Build minimal sample
-        run: |
-            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} samples\minimal\minimal_vc16.sln
-
-      - name: Build tests
-        run: |
-            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} tests\test_vc16.sln
-
-      - name: Run tests
-        working-directory: tests
-        run: |
-            .\vc*msw*\test.exe
-
-      - name: Build GUI tests
-        run: |
-            msbuild /noLogo /m '/p:Configuration=${{ matrix.configuration }}' /p:Platform=${{ matrix.platform }} tests\test_gui_vc16.sln
-
-      - name: Run GUI tests
-        working-directory: tests
-        run: |
-            .\vc*msw*\test_gui.exe

.github/workflows/ci_msw_cross.yml

@@ -1,254 +0,0 @@
-# CI workflow cross-building wxMSW under Linux.
-name: MSW cross-builds
-
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/gtk/**'
-      - 'include/wx/osx/**'
-      - 'locale/**'
-      - 'src/gtk/**'
-      - 'src/osx/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '.github/workflows/ci.yml'
-      - '.github/workflows/ci_cmake.yml'
-      - '.github/workflows/ci_mac.yml'
-      - '.github/workflows/ci_msw.yml'
-      - 'build/tools/appveyor*.bat'
-      - 'distrib/**'
-      - 'docs/**'
-      - 'interface/**'
-      - 'include/msvc/**'
-      - 'include/wx/gtk/**'
-      - 'include/wx/osx/**'
-      - 'locale/**'
-      - 'src/gtk/**'
-      - 'src/osx/**'
-      - '*.md'
-      - '*.yml'
-      - 'wxwidgets.props'
-
-jobs:
-  msw-cross-build:
-    # Set up this job to run in a Debian Sid container because it has recent
-    # versions of MinGW and Wine and is simpler to test with locally than the
-    # bespoke container used by GitHub Actions by default.
-    runs-on: ubuntu-latest
-    container: debian:sid-slim
-    name: ${{ matrix.name }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: wxMSW 64 bits
-          - name: wxMSW 32 bits
-            triplet: i686-w64-mingw32
-    env:
-      # Default to 64-bit build.
-      HOST_TRIPLET: ${{ matrix.triplet || 'x86_64-w64-mingw32' }}
-
-      # While our tests should run in any locale natively, it seems that Wine
-      # requires the locale encoding to be UTF-8 for Unicode file names to work
-      # correctly, so set the locale explicitly for it.
-      LC_ALL: C.UTF-8
-
-    # Run all commands as the normal user, created by the first step below.
-    #
-    # Note that the Bash options used here are the same as for the default
-    # shell used by GitHub Actions to minimize any surprises.
-    defaults:
-      run:
-        shell: /usr/bin/setpriv --reuid=runner --regid=adm --clear-groups --inh-caps=-all bash --noprofile --norc -eo pipefail {0}
-
-    steps:
-      - name: Set up container user
-        # Specify the default shell explicitly to override the default value above.
-        shell: bash
-        run: |
-          apt-get -q -o=Dpkg::Use-Pty=0 update
-          apt-get -q -o=Dpkg::Use-Pty=0 -y install sudo
-
-          # Create a user with the same UID/GID and name as the existing user
-          # outside of the container and allow it using sudo without password.
-          useradd --home-dir $HOME --no-create-home --gid adm --uid 1001 runner
-
-          echo 'runner ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/runner
-
-      - name: Install prerequisites
-        run: |
-          packages="git make wine x11-xserver-utils"
-
-          case "${HOST_TRIPLET}" in
-            x86_64-w64-mingw32)
-              packages="$packages g++-mingw-w64-x86-64 wine64 xvfb"
-              winerun=wine64
-              ;;
-
-            i686-w64-mingw32)
-              sudo dpkg --add-architecture i386
-              sudo apt-get -q -o=Dpkg::Use-Pty=0 update
-              packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386 xvfb:i386"
-              winerun=wine
-              ;;
-
-            *)
-              echo "Unknown host triplet \"${HOST_TRIPLET}\"."
-              exit 1
-              ;;
-          esac
-
-          sudo DEBIAN_FRONTEND=noninteractive apt-get -q -o=Dpkg::Use-Pty=0 -y install $packages
-
-          echo "wxTEST_RUNNER=${winerun}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: 'recursive'
-
-      - name: System and environment setup
-        run: |
-          normal_uid=`id --user`
-
-          # The checkout actions runs as root and there doesn't seem to be any
-          # way to change this, so just adjust the owner after checkout.
-          sudo chown -R $normal_uid $GITHUB_WORKSPACE
-
-          # Add the directories containing MinGW and wx DLLs to Wine path.
-          winepath="$(winepath --windows $(dirname $(${HOST_TRIPLET}-g++ -print-libgcc-file-name)))"
-          winepath="${winepath};$(winepath --windows $(pwd)/lib)"
-          echo "WINEPATH=${winepath}" >> $GITHUB_ENV
-
-          cpu_count=`nproc`
-          ((cpu_count++))
-          echo "wxMAKE_ARGS=-k -j$cpu_count" >> $GITHUB_ENV
-
-          echo "wxMAKEFILE_ERROR_CXXFLAGS=-Werror -Wno-error=cpp" >> $GITHUB_ENV
-
-      - name: Configure
-        run: |
-          ./configure --host=${HOST_TRIPLET} --disable-sys-libs --disable-optimise --disable-debug_info || rc=$?
-
-          if [ -n "$rc" ]; then
-            echo '*** Configuring failed, contents of config.log follows: ***'
-            echo '-----------------------------------------------------------'
-            cat config.log
-            echo '-----------------------------------------------------------'
-            exit $rc
-          fi
-
-      - name: Build
-        run: |
-          make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
-
-      - name: Build samples
-        run: |
-          make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS" samples
-
-      - name: Build tests
-        working-directory: tests
-        run: |
-          make $wxMAKE_ARGS failtest
-          make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
-
-      - name: Launch Xvfb
-        run: |
-          echo 'Launching Xvfb...'
-          sudo mkdir /tmp/.X11-unix
-          sudo chmod 1777 /tmp/.X11-unix
-          Xvfb :10 -screen 0 1600x1200x24 &
-          num_tries=1
-          while true; do
-              if xset -d :10 -q >/dev/null 2>&1; then
-                  echo 'Xvfb has become available.'
-                  # Trying to use it immediately can still result in errors
-                  # when creating the windows, somehow, so give it some time
-                  # to settle.
-                  sleep 3
-                  break
-              fi
-
-              if [[ $num_tries -gt 10 ]]; then
-                  echo 'Timed out waiting for Xvfb'
-                  exit 1
-              fi
-
-              ((num_tries++))
-              echo "Still waiting for Xvfb (attempt #$num_tries)"
-              sleep 3
-          done
-          echo 'Xvfb is running on display :10'
-          echo 'DISPLAY=:10' >> $GITHUB_ENV
-
-      - name: Run non-GUI tests
-        working-directory: tests
-        run: |
-          # Some tests are currently failing under Wine while they pass under
-          # native MSW, just skip running them until they can be dealt with.
-
-          # As soon as we specify the tests to exclude explicitly, we also need
-          # to exclude the tests that are not run by default, so start with this.
-          excluded_tests=('~[.]')
-
-          # There is 1 day difference in creation time under Wine somehow.
-          excluded_tests+=('~wxFileName::SetTimes')
-
-          # Closing the file fails for unknown reason under Wine.
-          excluded_tests+=('~FileFunctions::Error')
-
-          # Sporadic failures due to extra events.
-          excluded_tests+=('~wxFileSystemWatcher::EventCreate')
-
-          # The test fails (even with wxTEST_RUNNER-related changes) and hangs.
-          excluded_tests+=('~ExecTestCase')
-
-          # Wine WinHTTP implementations seems buggy, there are many errors.
-          excluded_tests+=('~[webrequest]')
-
-          $wxTEST_RUNNER ./test "${excluded_tests[@]}"
-
-      - name: Run GUI tests
-        working-directory: tests
-        run: |
-          # Same as for the non-GUI test above, except many more GUI tests fail
-          # under Wine.
-          excluded_gui_tests=('~[.]')
-
-          excluded_gui_tests+=('~BitmapComboBoxTestCase') # TextChangeEvents
-          excluded_gui_tests+=('~ClippingBoxTestCase*')
-          excluded_gui_tests+=('~ComboBoxTestCase') # TextChangeEvents
-          excluded_gui_tests+=('~DatePickerCtrlTestCase') # Range
-          excluded_gui_tests+=('~wxDC::GetTextExtent')
-          excluded_gui_tests+=('~ExecTestCase')
-          excluded_gui_tests+=('~wxFont::GetSet')
-          excluded_gui_tests+=('~GraphicsPathTestCaseGDIPlus')
-          excluded_gui_tests+=('~ImageList*')
-          excluded_gui_tests+=('~RadioButton::Focus')
-          excluded_gui_tests+=('~SettingsTestCase') # GetFont fails
-          excluded_gui_tests+=('~SliderTestCase')   # Thumb
-          excluded_gui_tests+=('~TransformMatrixTestCase*')
-          excluded_gui_tests+=('~TreeCtrlTestCase') # LabelEdit
-          excluded_gui_tests+=('~TextCtrlTestCase') # many sub-tests
-          excluded_gui_tests+=('~wxTextCtrl::InitialCanUndo')
-          excluded_gui_tests+=('~[wxWebView]')
-          excluded_gui_tests+=('~Window::PositioningBeyondShortLimit')
-          excluded_gui_tests+=('~XRC::LoadURL')
-
-          $wxTEST_RUNNER ./test_gui "${excluded_gui_tests[@]}"

.github/workflows/code_checks.yml

@@ -1,72 +0,0 @@
-# This workflow does some quick checks.
-name: Code Checks
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  check-unix:
-    runs-on: ubuntu-20.04
-    name: Check Spelling
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install codespell
-        run: |
-          pip3 install --no-warn-script-location codespell==1.17.1
-
-      - name: Run codespell
-        run: |
-          CODESPELL=$HOME/.local/bin/codespell ./misc/scripts/spellcheck
-
-
-  check-whitespace:
-    runs-on: ubuntu-20.04
-    name: Check Whitespace
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Check for trailing whitespace and TABs
-        run: |
-            git fetch --depth=1 origin master
-            git -c core.whitespace=blank-at-eol,blank-at-eof,space-before-tab,cr-at-eol,tab-in-indent \
-                diff --check origin/master \
-                ':!.gitmodules' \
-                ':!Makefile.in' \
-                ':!config.guess' \
-                ':!config.sub' \
-                ':!configure' \
-                ':!descrip.mms' \
-                ':!install-sh' \
-                ':!**/*akefile*' \
-                ':!**/*.pbxproj' \
-                ':!**/Info*.plist*' \
-                ':!**/*.sln' \
-                ':!**/*.vcproj' \
-                ':!**/*.xpm'
-
-
-  check-mixed-eol:
-    runs-on: ubuntu-20.04
-    name: Check Mixed EOL
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install dos2unix
-        run: |
-          sudo apt-get install -y dos2unix
-
-      - name: Check for mixed EOL
-        run: |
-            ./misc/scripts/check_mixed_eol.sh

.gitignore

@@ -1,428 +0,0 @@
-# /
-/.gdb_history
-/config.cache
-/configarg.cache
-/config.status
-/wx-config
-/config.log
-/stamp-h.in
-/Makefile
-/setup.h
-/*tags
-/autom4te.cache
-
-# /build/
-
-# /build/autoconf_prepend-include/autoconf/
-/build/autoconf_prepend-include/autoconf/autoconf.m4f
-
-# /build/bakefiles/
-/build/bakefiles/.bakefile_gen.state
-/build/bakefiles/Bakefiles.local.bkgen
-/build/bakefiles/wxwin.pyc
-/build/bakefiles/wxpresets/presets/wx_presets.pyc
-
-# /build/msw/
-/build/msw/.m*
-/build/msw/config.dmc
-/build/msw/makefile.dmc
-/build/msw/*c*_msw
-/build/msw/*c*_msw_x64
-/build/msw/*c*_msw_arm64
-/build/msw/*c*_msw[du]
-/build/msw/*c*_msw[du]_x64
-/build/msw/*c*_msw[du]_arm64
-/build/msw/*c*_mswud
-/build/msw/*c*_mswud_x64
-/build/msw/*c*_mswud_arm64
-/build/msw/*c*_mswdll
-/build/msw/*c*_mswdll_x64
-/build/msw/*c*_mswdll_arm64
-/build/msw/*c*_msw[du]dll
-/build/msw/*c*_msw[du]dll_x64
-/build/msw/*c*_msw[du]dll_arm64
-/build/msw/*c*_mswuddll
-/build/msw/*c*_mswuddll_x64
-/build/msw/*c*_mswuddll_arm64
-/build/msw/*c*_mswuniv
-/build/msw/*c*_mswuniv_x64
-/build/msw/*c*_mswuniv_arm64
-/build/msw/*c*_mswuniv[du]
-/build/msw/*c*_mswuniv[du]_x64
-/build/msw/*c*_mswuniv[du]_arm64
-/build/msw/*c*_mswunivud
-/build/msw/*c*_mswunivud_x64
-/build/msw/*c*_mswunivud_arm64
-/build/msw/*c*_mswunivdll
-/build/msw/*c*_mswunivdll_x64
-/build/msw/*c*_mswunivdll_arm64
-/build/msw/*c*_mswuniv[du]dll
-/build/msw/*c*_mswuniv[du]dll_x64
-/build/msw/*c*_mswuniv[du]dll_arm64
-/build/msw/*c*_mswunivuddll
-/build/msw/*c*_mswunivuddll_x64
-/build/msw/*c*_mswunivuddll_arm64
-/build/msw/*c*_mswhdll
-/build/msw/*c*_mswhdll_x64
-/build/msw/*c*_mswhdll_arm64
-/build/msw/*c*_mswuhdll
-/build/msw/*c*_mswuhdll_x64
-/build/msw/*c*_mswuhdll_arm64
-/build/msw/wx_local.props
-
-/build/msw/*.vcproj.*.user
-/build/msw/*.vcxproj.user
-/build/msw/vc*_mswud
-/build/msw/wx_vc8arm_*.vcproj
-/build/msw/wx_vc8arm.sln
-/build/msw/ipch/
-/build/msw/*.opensdf
-/build/msw/*.sdf
-/build/msw/*.VC.db
-/build/msw/*.VC.VC.opendb
-/build/msw/*.suo
-/build/msw/.vs/
-
-# /build/osx
-**/*.xcodeproj/*
-!**/*.xcodeproj/project.pbxproj
-!**/*.xcodeproj/xcshareddata/
-!**/*.xcworkspace/contents.xcworkspacedata
-/build/osx/build
-/build/osx/setup/cocoa/include/wx/setup.h
-/build/osx/setup/iphone/include/wx/setup.h
-
-# /demos/
-/demos/*/*.sln
-/demos/*/*c*_msw
-/demos/*/*c*_msw_x64
-/demos/*/*c*_msw_arm64
-/demos/*/*c*_msw[du]
-/demos/*/*c*_msw[du]_x64
-/demos/*/*c*_msw[du]_arm64
-/demos/*/*c*_mswud
-/demos/*/*c*_mswud_x64
-/demos/*/*c*_mswud_arm64
-/demos/*/*c*_mswdll
-/demos/*/*c*_mswdll_x64
-/demos/*/*c*_mswdll_arm64
-/demos/*/*c*_msw[du]dll
-/demos/*/*c*_msw[du]dll_x64
-/demos/*/*c*_msw[du]dll_arm64
-/demos/*/*c*_mswuddll
-/demos/*/*c*_mswuddll_x64
-/demos/*/*c*_mswuddll_arm64
-/demos/*/*c*_mswuniv
-/demos/*/*c*_mswuniv_x64
-/demos/*/*c*_mswuniv_arm64
-/demos/*/*c*_mswuniv[du]
-/demos/*/*c*_mswuniv[du]_x64
-/demos/*/*c*_mswuniv[du]_arm64
-/demos/*/*c*_mswunivud
-/demos/*/*c*_mswunivud_x64
-/demos/*/*c*_mswunivud_arm64
-/demos/*/*c*_mswunivdll
-/demos/*/*c*_mswunivdll_x64
-/demos/*/*c*_mswunivdll_arm64
-/demos/*/*c*_mswuniv[du]dll
-/demos/*/*c*_mswuniv[du]dll_x64
-/demos/*/*c*_mswuniv[du]dll_arm64
-/demos/*/*c*_mswunivuddll
-/demos/*/*c*_mswunivuddll_x64
-/demos/*/*c*_mswunivuddll_arm64
-/demos/*/*Classic?Debug*
-/demos/*/*Classic?Release*
-/demos/*/*Carbon?Debug*
-/demos/*/*Carbon?Release*
-
-# /demos/bombs/
-/demos/bombs/bombsM5.mcp
-/demos/bombs/bombsM*Data
-
-# /demos/forty/
-/demos/forty/fortyM5.mcp
-/demos/forty/fortyM*Data
-
-# /demos/fractal/
-/demos/fractal/fractalM5.mcp
-/demos/fractal/fractalM*Data
-
-# /demos/life/
-/demos/life/lifeM5.mcp
-/demos/life/lifeM*Data
-
-# /demos/poem/
-/demos/poem/poemM5.mcp
-/demos/poem/poemM*Data
-
-# /distrib/release/
-/distrib/release
-
-# /docs/doxygen/
-/docs/doxygen/doxygen.log
-/docs/doxygen/out
-
-# /include/
-/include/Makefile.in
-/include/*.mch
-
-# /include/wx/
-/include/wx/Makefile.in
-
-# /include/wx/generic/
-/include/wx/generic/Makefile.in
-
-# /include/wx/gtk/
-/include/wx/gtk/Makefile.in
-
-# /include/wx/gtk1/
-/include/wx/gtk1/Makefile.in
-
-# /include/wx/html/
-/include/wx/html/Makefile.in
-
-# /include/wx/motif/
-/include/wx/motif/Makefile.in
-
-# /include/wx/msw/
-/include/wx/msw/Makefile.in
-/include/wx/msw/Makefile
-
-# /include/wx/protocol/
-/include/wx/protocol/Makefile.in
-
-# /include/wx/unix/
-/include/wx/unix/Makefile.in
-
-# /lib/
-/lib/base
-/lib/based
-/lib/basedll
-/lib/basedll[du]
-/lib/basedllud
-/lib/baseu
-/lib/baseud
-/lib/bcc_lib
-/lib/cdef*.res
-/lib/dmc_lib
-/lib/expat*.lib
-/lib/gcc*_dll
-/lib/gcc_dll32
-/lib/gcc_dll64
-/lib/gcc*_lib
-/lib/gcc_lib32
-/lib/gcc_lib64
-/lib/jpeg*.lib
-/lib/ldef*.res
-/lib/[Ll]inux
-/lib/linux-gnu
-/lib/msw
-/lib/mswd
-/lib/mswdll
-/lib/mswdll[du]
-/lib/mswdllud
-/lib/mswu
-/lib/mswud
-/lib/png*.lib
-/lib/regex*.lib
-/lib/tiff*.lib
-/lib/univ
-/lib/univd
-/lib/univdll
-/lib/univdlld
-/lib/vc*_dll
-/lib/vc*_lib
-/lib/wx_*.rsrc
-/lib/wxbase*.dll
-/lib/wxbase*.exp
-/lib/wxbase*.ilk
-/lib/wxbase*.lib
-/lib/wxmsw*.dll
-/lib/wxmsw*.exp
-/lib/wxmsw*.ilk
-/lib/wxmsw*.lib
-/lib/zlib*.lib
-
-# /locale/
-/locale/*.mo
-
-# /locale/msw/
-/locale/msw/*.mo
-
-# /samples/
-/samples/**/*c*_msw
-/samples/**/*c*_msw_x64
-/samples/**/*c*_msw_arm64
-/samples/**/*c*_msw[du]
-/samples/**/*c*_msw[du]_x64
-/samples/**/*c*_msw[du]_arm64
-/samples/**/*c*_mswud
-/samples/**/*c*_mswud_x64
-/samples/**/*c*_mswud_arm64
-/samples/**/*c*_mswdll
-/samples/**/*c*_mswdll_x64
-/samples/**/*c*_mswdll_arm64
-/samples/**/*c*_msw[du]dll
-/samples/**/*c*_msw[du]dll_x64
-/samples/**/*c*_msw[du]dll_arm64
-/samples/**/*c*_mswuddll
-/samples/**/*c*_mswuddll_x64
-/samples/**/*c*_mswuddll_arm64
-/samples/**/*c*_mswuniv
-/samples/**/*c*_mswuniv_x64
-/samples/**/*c*_mswuniv_arm64
-/samples/**/*c*_mswuniv[du]
-/samples/**/*c*_mswuniv[du]_x64
-/samples/**/*c*_mswuniv[du]_arm64
-/samples/**/*c*_mswunivud
-/samples/**/*c*_mswunivud_x64
-/samples/**/*c*_mswunivud_arm64
-/samples/**/*c*_mswunivdll
-/samples/**/*c*_mswunivdll_x64
-/samples/**/*c*_mswunivdll_arm64
-/samples/**/*c*_mswuniv[du]dll
-/samples/**/*c*_mswuniv[du]dll_x64
-/samples/**/*c*_mswuniv[du]dll_arm64
-/samples/**/*c*_mswunivuddll
-/samples/**/*c*_mswunivuddll_x64
-/samples/**/*c*_mswunivuddll_arm64
-/samples/**/*.vcxproj.user
-/samples/**/.vs/
-
-# /samples/image/
-/samples/image/saved.xpm
-/samples/image/test.png
-/samples/image/test.xpm
-
-# /src/
-/src/FreeBSD
-/src/[Ll]inux
-/src/linux-gnu
-/src/Makefile.in
-/src/*.lo
-/src/*.la
-/src/make.env
-/src/makeprog.env
-/src/makelib.env
-/src/ReleaseDebug
-/src/wxwindowsM*Data
-/src/wxwindowsM5.mcp
-/src/build
-/src/*.ncb
-/src/*.opt
-/src/*.plg
-
-# /src/common/
-/src/common/y_tab.c
-
-# /src/gtk/
-/src/gtk/Makefile.in
-/src/gtk/*.lo
-/src/gtk/*.la
-
-# /src/gtk1/
-/src/gtk1/Makefile.in
-/src/gtk1/*.lo
-/src/gtk1/*.la
-
-# /src/jpeg/
-/src/jpeg/jpegM*Data
-/src/jpeg/jpegM5.mcp
-/src/jpeg/Debug
-/src/jpeg/Release
-
-# /src/motif/
-/src/motif/Makefile.in
-
-# /src/msw/
-/src/msw/Makefile.in
-
-# /src/regex/
-/src/regex/Debug
-/src/regex/Release
-/src/regex/*.vcl
-
-# /src/zlib/
-/src/zlib/zlibM*Data
-/src/zlib/zlibM5.mcp
-/src/zlib/Debug
-/src/zlib/Release
-
-# /tests/
-/tests/*c*_msw
-/tests/*c*_msw_x64
-/tests/*c*_msw_arm64
-/tests/*c*_msw[du]
-/tests/*c*_msw[du]_x64
-/tests/*c*_msw[du]_arm64
-/tests/*c*_mswud
-/tests/*c*_mswud_x64
-/tests/*c*_mswud_arm64
-/tests/*c*_mswdll
-/tests/*c*_mswdll_x64
-/tests/*c*_mswdll_arm64
-/tests/*c*_msw[du]dll
-/tests/*c*_msw[du]dll_x64
-/tests/*c*_msw[du]dll_arm64
-/tests/*c*_mswuddll
-/tests/*c*_mswuddll_x64
-/tests/*c*_mswuddll_arm64
-/tests/*c*_mswuniv
-/tests/*c*_mswuniv_x64
-/tests/*c*_mswuniv_arm64
-/tests/*c*_mswuniv[du]
-/tests/*c*_mswuniv[du]_x64
-/tests/*c*_mswuniv[du]_arm64
-/tests/*c*_mswunivud
-/tests/*c*_mswunivud_x64
-/tests/*c*_mswunivud_arm64
-/tests/*c*_mswunivdll
-/tests/*c*_mswunivdll_x64
-/tests/*c*_mswunivdll_arm64
-/tests/*c*_mswuniv[du]dll
-/tests/*c*_mswuniv[du]dll_x64
-/tests/*c*_mswuniv[du]dll_arm64
-/tests/*c*_mswunivuddll
-/tests/*c*_mswunivuddll_x64
-/tests/*c*_mswunivuddll_arm64
-/tests/test.opt
-/tests/test*.dsw
-/tests/test.suo
-/tests/test_test.vcproj
-
-# /tests/benchmarks/
-/tests/benchmarks/*.sln
-/tests/benchmarks/*c*_msw*/
-
-# /utils/
-/utils/**/*c*_mswu
-/utils/**/*c*_mswu_x64
-/utils/**/*c*_mswu_arm64
-/utils/**/*c*_mswud
-/utils/**/*c*_mswud_x64
-/utils/**/*c*_mswud_arm64
-/utils/**/*c*_mswudll
-/utils/**/*c*_mswudll_x64
-/utils/**/*c*_mswudll_arm64
-/utils/**/*c*_mswuddll
-/utils/**/*c*_mswuddll_x64
-/utils/**/*c*_mswuddll_arm64
-
-# /utils/emulator/src/
-/utils/emulator/src/*.sln
-
-# /utils/helpview/src/
-/utils/helpview/src/*.sln
-
-# /utils/hhp2cached/
-/utils/hhp2cached/*.sln
-/utils/hhp2cached/HHP2CachedM*Data
-/utils/hhp2cached/*Classic?Debug*
-/utils/hhp2cached/*Classic?Release*
-/utils/hhp2cached/*Carbon?Debug*
-/utils/hhp2cached/*Carbon?Release*
-
-# /utils/wxrc/
-/utils/wxrc/wxrc_vc[789].sln
-
-/3rdparty/webview2

.gitmodules

@@ -1,32 +0,0 @@
-[submodule "3rdparty/catch"]
-	path = 3rdparty/catch
-	url = https://github.com/wxWidgets/Catch.git
-	branch = wx
-[submodule "src/zlib"]
-	path = src/zlib
-	url = https://github.com/wxWidgets/zlib.git
-	branch = wx
-[submodule "src/png"]
-	path = src/png
-	url = https://github.com/wxWidgets/libpng.git
-	branch = wx
-[submodule "src/expat"]
-	path = src/expat
-	url = https://github.com/wxWidgets/libexpat.git
-	branch = wx
-[submodule "src/tiff"]
-	path = src/tiff
-	url = https://github.com/wxWidgets/libtiff.git
-	branch = wx
-[submodule "src/jpeg"]
-	path = src/jpeg
-	url = https://github.com/wxWidgets/libjpeg-turbo.git
-	branch = wx
-[submodule "3rdparty/pcre"]
-	path = 3rdparty/pcre
-	url = https://github.com/wxWidgets/pcre
-	branch = wx
-[submodule "3rdparty/nanosvg"]
-	path = 3rdparty/nanosvg
-	url = https://github.com/wxWidgets/nanosvg
-	branch = wx

.mailmap

@@ -1,71 +0,0 @@
-AliKet								<aliket1435@gmail.com>
-Anil Kumar		<Anil.Kumar@efi.com>			<anilkumar8753@gmail.com>
-ARATA Mizuki							<minorinoki@gmail.com>
-Artur Sochirca		<arturs@bricsys.com>			<arturs@trac.wxwidgets.org>
-Artur Wieczorek							<artwik@wp.pl>
-Daniel Kulp		<dan@kulp.com>				<dkulp@apache.org>
-Blake Eryx		<seasweptdreams@gmail.com>		<Blake-Eryx@users.noreply.github.com>
-Bogdan Iordanescu						<bogdan_iordanescu@yahoo.com>
-Cătălin Răceanu							<maildus@gmail.com>
-			<maildus@gmail.com>			<catalinr@users.noreply.github.com>
-			<maildus@gmail.com>			<catalinraceanu2@gmail.com>
-Danny Scott							<doscott@doscott.ca>
-			<doscott@doscott.ca>			<doscott@gmail.com>
-			<doscott@doscott.ca>			<d.o.scott@unb.ca>
-Dimitri Schoolwerth	<dimitri.schoolwerth@gmail.com>		<dimitri@schoolwerth.com>
-Hashir Ahmad							<hashirahmadleo@gmail.com>
-Frédéric Bron		<frederic.bron@m4x.org>			<ufospoke@gmail.com>
-Hubert Talbot							<hubert.talbot64@gmail.com>
-Igor Korot							<ikorot01@gmail.com>
-Ilya Bizyaev							<bizyaev.game@yandex.ru>
-Jens Göpfert		<jens.goepfert@tracetronic.de>		<jensgoe@users.noreply.github.com>
-John Roberts		<johnr@iinet.net.au>			<johnr@jjbone.com>
-Jouk Jansen							<joukj@hrem.nano.tudelft.nl>
-Jose Lorenzo		<josee.loren@gmail.com>			<isleo11@gmail.com>
-Julian Smart							<julian@anthemion.co.uk>
-Jevgenijs Protopopovs						<jprotopopov1122@gmail.com>
-Hartwig Wiesmann	<git@skywind.eu>
-			<git@skywind.eu>			<hartwig.wiesmann@wanadoo.nl>
-Kinaou Hervé							<kinaouherve@gmail.com>
-Kolya Kosenko		<kolya.kosenko@gmail.com>		<kosenko@trac.wxwidgets.org>
-Konstantin S. Matveyev	<kos@eligovision.ru>			<konstantin.matveyev@eligovision.ru>
-Konstantin S. Matveyev	<kos@eligovision.ru>			valid-ptr	<kos@eligovision.ru>
-Lauri Nurmi		<lanurmi@iki.fi>			<lauri@ksenos.fi>
-Lynn C. Rees							<lcrees@gmail.com>
-Maarten Bent							<MaartenBent@users.noreply.github.com>
-Manuel Martin							<mmartin@ceyd.es>
-Markus Juergens		<mj@be-enabled.de>			<markusj@trac.wxwidgets.org>
-Martin Ettl							<ettl.martin78@googlemail.com>
-Martin Ettl		<ettl.martin78@googlemail.com>		<ettl.martin78@gmail.com>
-Martin Ettl		<ettl.martin78@googlemail.com>		<orbitcowboy@web.de>
-Mathew Maidment							<mathew1800@gmail.com>
-Micha Ahrweiler							<mbaschnitzi@users.noreply.github.com>
-ousnius			<ousnius@users.noreply.github.com>	<denis41@hotmail.de>
-Paul Kulchenko		<paul@kulchenko.com>			<paulclinger@gmail.com>
-Pavel O.							<pavelxdd@users.noreply.github.com>
-Pavel O.		<pavelxdd@users.noreply.github.com>	<pavel.otchertsov@gmail.com>
-Pavel Tyunin							<36256989+pavel-t@users.noreply.github.com>
-PB			<PBfordev@gmail.com>			<pbfordev@gmail.com>
-			<PBfordev@gmail.com>			<PBforDev@gmail.com>
-Prashant Kumar Nirmal	<prashantkn94@gmail.com>		<ohhereim@gmail.com>
-René Kijewski		<rene.kijewski@fu-berlin.de>		<kijewski@mi.fu-berlin.de>
-Richard Fath							<richard.fath@t-online.de>
-Richard Powell							<rmpowell77@me.com>
-Rick S			<rivdsl@gmail.com>			<rivdsl@hotmail.com>
-Roberto Boriotti	<roberto.boriotti@canon-europe.com>
-Steffen Olszewski	<steffen.olszewski@gero-mess.de>	<sodev@trac.wxwidgets.org>
-Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
-			<swbrowne@gmail.com>			<amn3sia@gmail.com>
-Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>
-Tim Stahlhut		<stahta01@gmail.com>
-Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.sourceforge.net>
-Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.noreply.github.com>
-Tobias Taschner		<ttaschner@protect-software.com>	<TcT2k@users.noreply.github.com>
-			<ttaschner@protect-software.com>	<github@tc84.de>
-Václav Slavík		<vaclav@slavik.io>			<vslavik@fastmail.fm>
-Václav Slavík							<vaclav@slavik.io>
-Vadim Zeitlin		<vadim@wxwidgets.org>			<vz-github@zeitlins.org>
-			<vadim@wxwidgets.org>			<vadim@zeitlins.org>
-Wolfgang Stöggl		<c72578@yahoo.de>
-Xlord2			<b1146285@trbvn.com>			<b1223723@trbvn.com>
-Iwbnwif Yiw							<iwbnwif@gmail.com>

.travis.yml

@@ -0,0 +1,38 @@
+# This is the control file for Travis continuous integration system.
+#
+# It is used automatically for the repositories on Github if it's found in the
+# root directory of the project.
+language: cpp
+
+compiler: gcc
+
+branches:
+    only:
+        - master
+
+notifications:
+    email:
+        recipients:
+            - vadim@wxwidgets.org
+        on_success: change
+        on_failure: change
+
+before_install:
+    - sudo apt-get install -y libcppunit-dev
+
+env:
+    - wxCONFIGURE_FLAGS=
+    - wxCONFIGURE_FLAGS="--disable-shared"
+    - wxCONFIGURE_FLAGS="--disable-precomp-headers --enable-monolithic"
+    - wxCONFIGURE_FLAGS="--enable-stl" CXXFLAGS=-std=c++0x
+
+script:
+    - ./configure --disable-optimise $wxCONFIGURE_FLAGS
+    - make
+    - make -C tests
+    - pushd tests
+    - ./test -t
+    - popd
+    - make samples
+    - sudo make install
+    - make -C samples/minimal -f makefile.unx

BuildSVN.txt

@@ -0,0 +1,13 @@
+------------------------------------------------------------------------
+                How to build the sources from SVN
+------------------------------------------------------------------------
+
+Before building from svn sources under Windows, you need to copy the
+file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is
+necessary in order to allow having local modifications to the latter
+file without showing it as modified, as it is not under version
+control.
+
+After doing this, please proceed with the build as with any official
+release, i.e. follow the instructions in the install.txt file in
+docs/gtk, docs/msw and so on.

CMakeLists.txt

@@ -1,98 +0,0 @@
-#############################################################################
-# Name:        CMakeLists.txt
-# Purpose:     Primary CMake for wxWidgets
-# Author:      Tobias Taschner
-# Created:     2016-09-20
-# Copyright:   (c) 2016 wxWidgets development team
-# Licence:     wxWindows licence
-#############################################################################
-
-cmake_minimum_required(VERSION 2.8.12)
-
-if(NOT CMAKE_CONFIGURATION_TYPES)
-    get_property(HAVE_MULTI_CONFIG_GENERATOR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-    # Set default configuration types for multi-config generators
-    if(HAVE_MULTI_CONFIG_GENERATOR)
-        set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
-    endif()
-endif()
-
-# https://blog.kitware.com/cmake-and-the-default-build-type/
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(default_build_type "Debug")
-    message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
-    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
-    # Set the possible values of build type for cmake-gui
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
-endif()
-
-# This block, particularly the versions used, should be kept in sync with
-# samples/minimal/CMakeLists.txt.
-if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    # If no deployment target has been set default to the minimum supported
-    # OS version (this has to be set before the first project() call)
-    if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0 CACHE STRING "iOS Deployment Target")
-    else()
-        set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10 CACHE STRING "macOS Deployment Target")
-    endif()
-endif()
-
-include(build/cmake/policies.cmake NO_POLICY_SCOPE)
-
-# Initialize variables for quick access to wx root dir in sub dirs
-set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(wxBINARY_DIR ${CMAKE_BINARY_DIR})
-set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
-
-# parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
-file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
-string(REGEX MATCH "wxMAJOR_VERSION[ \t]+([0-9]+)"
-    wxMAJOR_VERSION ${WX_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)"
-    wxMAJOR_VERSION ${wxMAJOR_VERSION})
-string(REGEX MATCH "wxMINOR_VERSION[ \t]+([0-9]+)"
-    wxMINOR_VERSION ${WX_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)"
-    wxMINOR_VERSION ${wxMINOR_VERSION})
-string(REGEX MATCH "wxRELEASE_NUMBER[ \t]+([0-9]+)"
-    wxRELEASE_NUMBER ${WX_VERSION_H_CONTENTS})
-string (REGEX MATCH "([0-9]+)"
-    wxRELEASE_NUMBER ${wxRELEASE_NUMBER})
-
-# Determine if current version is a "Development" release
-math(EXPR rel_dev "${wxMINOR_VERSION} % 2")
-if(rel_dev)
-    set(wxVERSION_IS_DEV TRUE)
-else()
-    set(wxVERSION_IS_DEV FALSE)
-endif()
-
-# parse the .so version from build/bakefiles/version.bkl
-file(READ "${wxSOURCE_DIR}/build/bakefiles/version.bkl" WX_VERSION_BKL_CONTENTS)
-string(REGEX MATCH "WX_CURRENT.>([0-9]+)"
-    WX_CURRENT ${WX_VERSION_BKL_CONTENTS})
-string(REGEX MATCH "([0-9]+)"
-    WX_CURRENT ${WX_CURRENT})
-string(REGEX MATCH "WX_REVISION.>([0-9]+)"
-    WX_REVISION ${WX_VERSION_BKL_CONTENTS})
-string(REGEX MATCH "([0-9]+)"
-    WX_REVISION ${WX_REVISION})
-string(REGEX MATCH "WX_AGE.>([0-9]+)"
-    WX_AGE ${WX_VERSION_BKL_CONTENTS})
-string(REGEX MATCH "([0-9]+)"
-    WX_AGE ${WX_AGE})
-math(EXPR wxSOVERSION_MAJOR "${WX_CURRENT} - ${WX_AGE}")
-set(wxSOVERSION ${wxSOVERSION_MAJOR}.${WX_AGE}.${WX_REVISION})
-
-set(wxVERSION ${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER})
-set(wxCOPYRIGHT "2002-2021 wxWidgets")
-
-project(wxWidgets VERSION ${wxVERSION})
-
-include(build/cmake/main.cmake)
-
-# Set the default startup project for Visual Studio
-if(wxBUILD_SAMPLES AND wxUSE_GUI)
-    set_directory_properties(PROPERTIES VS_STARTUP_PROJECT minimal)
-endif()

README-GIT.md

@@ -1,12 +0,0 @@
-Building from Git Sources
--------------------------
-
-Please use `--recurse-submodules` option with the initial `git clone`. If you
-had already cloned the repository without this option, please run `git
-submodule update --init` to also get all 3rd party libraries code.
-
-Otherwise, building from Git checkout is not different from building
-from the sources include into the releases, so please follow the usual
-instructions in the port-specific files, such as
-[wxMSW](docs/msw/install.md), [wxGTK](docs/gtk/install.md),
-[wxOSX](docs/osx/install.md) and so on.

README.md

@@ -1,87 +0,0 @@
-About
------
-
-wxWidgets is a free and open source cross-platform C++ framework
-for writing advanced GUI applications using native controls.
-
-![wxWidgets Logo](https://www.wxwidgets.org/assets/img/header-logo.png)
-
-wxWidgets allows you to write native-looking GUI applications for
-all the major desktop platforms and also helps with abstracting
-the differences in the non-GUI aspects between them. It is free
-for the use in both open source and commercial applications, comes
-with the full, easy to read and modify, source and extensive
-documentation and a collection of more than a hundred examples.
-You can learn more about wxWidgets at https://www.wxwidgets.org/
-and read its documentation online at https://docs.wxwidgets.org/
-
-
-Platforms
----------
-
-[![AppVeyor](https://img.shields.io/appveyor/build/wxWidgets/wxWidgets/master?label=AppVeyor&logo=appveyor)](https://ci.appveyor.com/project/wxWidgets/wxwidgets)
-[![Unix (make)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci.yml/badge.svg)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci.yml)
-[![Unix (CMake)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_cmake.yml/badge.svg)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_cmake.yml)
-[![MSW (MSVC)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_msw.yml/badge.svg)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_msw.yml)
-[![MSW (gcc)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_msw_cross.yml/badge.svg)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_msw_cross.yml)
-[![Mac](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_mac.yml/badge.svg)](https://github.com/wxWidgets/wxWidgets/actions/workflows/ci_mac.yml)
-[![OSS-Fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/wxwidgets.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:wxwidgets)
-
-This version of wxWidgets supports the following primary platforms:
-
-- Windows XP, Vista, 7, 8 and 10 (32/64 bits).
-- Most Unix variants using the GTK+ toolkit (version 2.6 or newer or 3.x).
-- macOS (10.10 or newer) using Cocoa under both amd64 and ARM platforms.
-
-Most popular C++ compilers are supported including but not limited to:
-
-- Microsoft Visual C++ 2005 or later (up to 2022).
-- g++ 4 or later, including MinGW/MinGW-64/TDM under Windows.
-- Clang under macOS and Linux.
-- Intel icc compiler.
-- Oracle (ex-Sun) CC.
-
-
-Licence
--------
-
-[wxWidgets licence](https://github.com/wxWidgets/wxWidgets/blob/master/docs/licence.txt)
-is a modified version of LGPL explicitly allowing not distributing the sources
-of an application using the library even in the case of static linking.
-
-
-Building
---------
-
-For building the library, please see platform-specific documentation under
-`docs/<port>` directory, e.g. here are the instructions for
-[wxGTK](docs/gtk/install.md), [wxMSW](docs/msw/install.md) and
-[wxOSX](docs/osx/install.md).
-
-If you're building the sources checked out from Git, and not from a released
-version, please see these additional [Git-specific notes](README-GIT.md).
-
-
-Further information
--------------------
-
-If you are looking for community support, you can get it from
-
-- [Mailing Lists](https://www.wxwidgets.org/support/mailing-lists/)
-- [Discussion Forums](https://forums.wxwidgets.org/)
-- [#wxwidgets IRC channel](https://www.wxwidgets.org/support/irc/)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/wxwidgets)
-  (tag your questions with `wxwidgets`)
-- And you can report bugs at https://trac.wxwidgets.org/newticket
-
-[Commercial support](https://www.wxwidgets.org/support/commercial/) is also
-available.
-
-Finally, keep in mind that wxWidgets is an open source project collaboratively
-developed by its users and your contributions to it are always welcome. Please
-check [our guidelines](.github/CONTRIBUTING.md) if you'd like to do it.
-
-
-Have fun!
-
-The wxWidgets Team.

acinclude.m4

@@ -184,6 +184,77 @@ dnl ===========================================================================
 dnl C++ features test
 dnl ===========================================================================
 
+dnl ---------------------------------------------------------------------------
+dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
+dnl or only the old <iostream.h> one - it may be generally assumed that if
+dnl <iostream> exists, the other "new" headers (without .h) exist too.
+dnl
+dnl call WX_CPP_NEW_HEADERS(action-if-true, action-if-false)
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CPP_NEW_HEADERS],
+[
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    AC_CHECK_HEADERS([iostream],,, [ ])
+
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      ifelse([$1], , :, [$1])
+    else
+      ifelse([$2], , :, [$2])
+    fi
+
+    AC_LANG_RESTORE
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
+dnl keyword and defines HAVE_EXPLICIT if this is the case
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CPP_EXPLICIT],
+[
+  AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
+                 wx_cv_explicit,
+  [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    dnl do the test in 2 steps: first check that the compiler knows about the
+    dnl explicit keyword at all and then verify that it really honours it
+    AC_TRY_COMPILE(
+      [
+        class Foo { public: explicit Foo(int) {} };
+      ],
+      [
+        return 0;
+      ],
+      [
+        AC_TRY_COMPILE(
+            [
+                class Foo { public: explicit Foo(int) {} };
+                static void TakeFoo(const Foo& foo) { }
+            ],
+            [
+                TakeFoo(17);
+                return 0;
+            ],
+            wx_cv_explicit=no,
+            wx_cv_explicit=yes
+        )
+      ],
+      wx_cv_explicit=no
+    )
+
+    AC_LANG_RESTORE
+  ])
+
+  if test "$wx_cv_explicit" = "yes"; then
+    AC_DEFINE(HAVE_EXPLICIT)
+  fi
+])
+
 dnl ---------------------------------------------------------------------------
 dnl WX_CHECK_FUNCS(FUNCTIONS...,
 dnl                [ACTION-IF-FOUND],
@@ -296,18 +367,12 @@ dnl this macro checks for a three-valued command line --with argument:
 dnl   possible arguments are 'yes', 'no', 'sys', or 'builtin'
 dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
 dnl
-dnl the default value (used if the option is not specified at all) is
+dnl the default value (used if the option is not specified at all) is the value
-dnl determined in the following way:
+dnl of wxUSE_ALL_FEATURES (which is "yes" by default but can be changed by
-dnl  1. If default value for the given library (DEFAULT_wxUSE_LIBXXX) exists,
+dnl giving configure --disable-all-features option)
-dnl     it is used: this allows to disable some libraries by default.
-dnl  2. If wxUSE_ALL_FEATURES is turned off, the use of the library is turned
-dnl     off as well: this ensures that minimal builds are really minimal.
-dnl  3. If wxUSE_SYS_LIBS is turned off, then "builtin" is used: this allows
-dnl     to prevent system libraries from being used by using a single option.
-dnl  4. Otherwise the default value is "yes", meaning that either the system
-dnl     (preferred) or builtin version of the library will be used.
 AC_DEFUN([WX_ARG_SYS_WITH],
         [
+          AC_MSG_CHECKING([for --with-$1])
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -323,20 +388,22 @@ AC_DEFUN([WX_ARG_SYS_WITH],
                         fi
                       ],
                       [
-                        if test "DEFAULT_$3" = no; then
+                        AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
-                            value=no
-                        elif test "$wxUSE_ALL_FEATURES" = no; then
-                            value=no
-                        elif test "$wxUSE_SYS_LIBS" = no; then
-                            value=builtin
-                        else
-                            value=yes
-                        fi
-
-                        AS_TR_SH(wx_cv_use_$1)="$3=$value"
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+
+          if test "$$3" = yes; then
+            AC_MSG_RESULT(yes)
+          elif test "$$3" = no; then
+            AC_MSG_RESULT(no)
+          elif test "$$3" = sys; then
+            AC_MSG_RESULT([system version])
+          elif test "$$3" = builtin; then
+            AC_MSG_RESULT([builtin version])
+          else
+            AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
+          fi
         ])
 
 dnl this macro simply checks for a command line argument
@@ -352,6 +419,7 @@ AC_DEFUN([WX_ARG_WITH],
                   defaultval=no
               fi
           fi
+          AC_MSG_CHECKING([for --${withstring:-with}-$1])
           AC_ARG_WITH($1, [$2],
                       [
                         if test "$withval" = yes; then
@@ -365,21 +433,23 @@ AC_DEFUN([WX_ARG_WITH],
                       ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+
+          if test x"$withstring" = xwithout; then
+            if test $$3 = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$$3
+          fi
+
+          AC_MSG_RESULT($result)
         ])
 
 dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
 AC_DEFUN([WX_ARG_WITHOUT], [WX_ARG_WITH($1, [$2], $3, without)])
 
-dnl variant of AC_ARG_WITH which doesn't accept --without-xxx varient
-AC_DEFUN([WX_ARG_ONLY_WITH], [
-        AC_ARG_WITH($1, [$2], [
-            if test "$withval" != yes; then
-                AC_MSG_ERROR([Option --with-$1 doesn't accept any arguments])
-            fi
-            $3
-        ])
-    ])
-
 dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
 dnl usage: WX_ARG_ENABLE(option, helpmessage, var, [enablestring], [default])
 dnl
@@ -402,6 +472,7 @@ AC_DEFUN([WX_ARG_ENABLE],
               fi
           fi
 
+          AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
           AC_ARG_ENABLE($1, [$2],
                         [
                           if test "$enableval" = yes; then
@@ -415,6 +486,18 @@ AC_DEFUN([WX_ARG_ENABLE],
                         ])
 
           eval "$AS_TR_SH(wx_cv_use_$1)"
+
+          if test x"$enablestring" = xdisable; then
+            if test $$3 = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$$3
+          fi
+
+          AC_MSG_RESULT($result)
         ])
 
 dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
@@ -440,6 +523,7 @@ dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
           enablestring=$4
+          AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
           AC_ARG_ENABLE($1, [$2],
                         [
                           wx_cv_use_$1="$3='$enableval'"
@@ -449,6 +533,8 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
                         ])
 
           eval "$wx_cv_use_$1"
+
+          AC_MSG_RESULT([$$3])
         ])
 
 dnl ===========================================================================

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,20 +11,18 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
 m4_include([build/aclocal/atomic_builtins.m4])
 m4_include([build/aclocal/ax_cflags_gcc_option.m4])
-m4_include([build/aclocal/ax_cxx_compile_stdcxx.m4])
 m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
 m4_include([build/aclocal/ax_gcc_option.m4])
 m4_include([build/aclocal/ax_gxx_version.m4])
-m4_include([build/aclocal/ax_subdirs_configure.m4])
+m4_include([build/aclocal/bakefile-dllar.m4])
 m4_include([build/aclocal/bakefile-lang.m4])
 m4_include([build/aclocal/bakefile.m4])
+m4_include([build/aclocal/cppunit.m4])
 m4_include([build/aclocal/gtk-2.0.m4])
 m4_include([build/aclocal/gtk-3.0.m4])
-m4_include([build/aclocal/gtk-4.0.m4])
 m4_include([build/aclocal/gtk.m4])
 m4_include([build/aclocal/pkg.m4])
 m4_include([build/aclocal/sdl.m4])

appveyor.yml

@@ -1,108 +0,0 @@
-version: '{build}'
-
-branches:
-  only:
-  - master
-  - WX_3_0_BRANCH
-
-skip_commits:
-  files:
-    - demos/
-    - docs/
-    - interface/
-    - locale/
-    - misc/
-    - include/wx/dfb/
-    - src/dfb/
-    - include/wx/gtk/
-    - src/gtk/
-    - include/wx/gtk1/
-    - src/gtk1/
-    - include/wx/motif/
-    - src/motif/
-    - include/wx/osx/
-    - src/osx/
-    - include/wx/unix/
-    - src/unix/
-    - include/wx/x11/
-    - src/x11/
-    - '**/*.md'
-    - .github/workflows/
-    - build/tools/before_install.sh
-    - build/tools/httpbin.sh
-
-environment:
-  matrix:
-  - TOOLSET: msbuild
-    CONFIGURATION: DLL Release
-    ARCH: x64
-    wxUSE_STL: 1
-  - TOOLSET: nmake
-    VS: '9.0'
-    BUILD: release
-    ARCH: x86
-  - TOOLSET: nmake
-    VS: '14.0'
-    BUILD: debug
-    ARCH: amd64
-    wxUSE_STL: 1
-    wxUSE_WEBVIEW_EDGE: 1
-  - TOOLSET: mingw
-  - TOOLSET: msys2
-    MSYSTEM: MINGW32
-  - TOOLSET: cmake
-    GENERATOR: 'Visual Studio 12'
-    SHARED: ON
-    CONFIGURATION: Release
-  - TOOLSET: cmake_qt
-    GENERATOR: 'Visual Studio 14 2015 Win64'
-    SHARED: ON
-    CONFIGURATION: Release
-
-clone_depth: 50
-
-install: git submodule update --init
-
-init:
-- ps: |
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-        throw "There are newer queued builds for this pull request, failing early." }
-
-before_build:
-- ps: |
-    $env:PATH = $env:PATH -replace "C:\\Program Files\\Git\\usr\\bin",""
-    if (-not (Test-Path env:wxUSE_STL)) { $env:wxUSE_STL = '0' }
-    if (-not (Test-Path env:wxUSE_WEBVIEW_EDGE)) { $env:wxUSE_WEBVIEW_EDGE = '0' }
-    if (($env:TOOLSET -ne "msys2") -and ($env:TOOLSET -ne "cygwin")) {
-      $txt = gc include\wx\msw\setup.h
-      Write-Output $txt |
-      %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} |
-      %{$_ -replace "define wxUSE_WEBVIEW_EDGE 0", "define wxUSE_WEBVIEW_EDGE $env:wxUSE_WEBVIEW_EDGE"} |
-      sc include\wx\msw\setup.h
-    }
-
-build_script: c:\projects\wxwidgets\build\tools\appveyor.bat
-
-before_test:
-- ps: |
-    Write-Output "Getting and launching httpbin."
-    $env:PATH = "C:\Python35;C:\Python35\Scripts;" + $env:PATH
-    pip.exe --disable-pip-version-check install httpbin
-    Start-Job -Name wx_httpbin { python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log }
-    Start-Sleep -Seconds 5
-    curl.exe -s http://127.0.0.1:5000/ip > $null
-    if ($lastExitCode -eq "0") {
-        $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000"
-    }
-    else {
-        Write-Error "Disabling wxWebRequest tests as launching httpbin failed."
-        $env:WX_TEST_WEBREQUEST_URL="0"
-    }
-
-test_script: c:\projects\wxwidgets\build\tools\appveyor-test.bat
-
-after_test:
-- ps: |
-    Stop-Job -Name wx_httpbin

art/addbookm.xpm

@@ -1,24 +1,24 @@
-/* XPM */
+/* XPM */
-static const char *const addbookm_xpm[] = {
+static const char *const addbookm_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 3 1",
+"16 15 3 1",
-". c Black",
+". c Black",
-"X c #00C000",
+"X c #00C000",
-"  c None",
+"  c None",
-/* pixels */
+/* pixels */
-"        ....... ",
+"        ....... ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
-"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
-" ...... .XXXXX. ",
+" ...... .XXXXX. ",
-" ...... .XXXXX. ",
+" ...... .XXXXX. ",
-"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
-"   ..   .XXXXX. ",
+"   ..   .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XX.XX. ",
+"        .XX.XX. ",
-"        .X. .X. ",
+"        .X. .X. ",
-"        ..   .. "
+"        ..   .. "
-};
+};

art/back.xpm

@@ -1,21 +1,21 @@
-/* XPM */
+/* XPM */
-static const char *const back_xpm[] = {
+static const char *const back_xpm[] = {
-"16 15 3 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c Gray100",
+"X	c Gray100",
-"                ",
+"                ",
-"                ",
+"                ",
-"      .         ",
+"      .         ",
-"     ..         ",
+"     ..         ",
-"    .X.         ",
+"    .X.         ",
-"   .XX........  ",
+"   .XX........  ",
-"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
-" .XXXXXXXXXXX.  ",
+" .XXXXXXXXXXX.  ",
-" .XXXXXXXXXXX.  ",
+" .XXXXXXXXXXX.  ",
-"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
-"   .XX........  ",
+"   .XX........  ",
-"    .X.         ",
+"    .X.         ",
-"     ..         ",
+"     ..         ",
-"      .         ",
+"      .         ",
-"                "};
+"                "};

art/cdrom.xpm

@@ -1,57 +1,57 @@
-/* XPM */
+/* XPM */
-static const char *const cdrom_xpm[] = {
+static const char *const cdrom_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 36 1",
+"16 15 36 1",
-"= c #9BACC2",
+"= c #9BACC2",
-"y c #547B99",
+"y c #547B99",
-"$ c #FFFFFF",
+"$ c #FFFFFF",
-"@ c #839CB5",
+"@ c #839CB5",
-"o c #547897",
+"o c #547897",
-"4 c #4D7492",
+"4 c #4D7492",
-"% c #F1F4F7",
+"% c #F1F4F7",
-"X c #5A809C",
+"X c #5A809C",
-"< c #8497A5",
+"< c #8497A5",
-"0 c #7898AD",
+"0 c #7898AD",
-"+ c #CAD2DC",
+"+ c #CAD2DC",
-"r c #ACAEB2",
+"r c #ACAEB2",
-"2 c #BECAD9",
+"2 c #BECAD9",
-"* c #65839D",
+"* c #65839D",
-"e c #DCE2EA",
+"e c #DCE2EA",
-"- c #ADBED2",
+"- c #ADBED2",
-"t c #597B9A",
+"t c #597B9A",
-"  c None",
+"  c None",
-"1 c #467291",
+"1 c #467291",
-"9 c #D6DFE7",
+"9 c #D6DFE7",
-"O c #7393AB",
+"O c #7393AB",
-"u c #49708B",
+"u c #49708B",
-"5 c #A0BACB",
+"5 c #A0BACB",
-"& c #AABFCD",
+"& c #AABFCD",
-"8 c #B9CBD5",
+"8 c #B9CBD5",
-"; c #B4C4D3",
+"; c #B4C4D3",
-": c #6F90A6",
+": c #6F90A6",
-"3 c #A8B6CA",
+"3 c #A8B6CA",
-"# c #ADBACE",
+"# c #ADBACE",
-"w c #E4E9ED",
+"w c #E4E9ED",
-". c #8EA9BC",
+". c #8EA9BC",
-"> c #B3BFD1",
+"> c #B3BFD1",
-", c #C2CBDB",
+", c #C2CBDB",
-"6 c #C0D1DC",
+"6 c #C0D1DC",
-"7 c #A2B3C5",
+"7 c #A2B3C5",
-"q c #5D7C93",
+"q c #5D7C93",
-/* pixels */
+/* pixels */
-"     .XooOo+    ",
+"     .XooOo+    ",
-"    X@#$$$%o&   ",
+"    X@#$$$%o&   ",
-"   *=-;$$$$$o+  ",
+"   *=-;$$$$$o+  ",
-"  +O#;-$$$$$$:  ",
+"  +O#;-$$$$$$:  ",
-"  o=>,-<1<$2-o  ",
+"  o=>,-<1<$2-o  ",
-"  o3>--1$122-*  ",
+"  o3>--1$122-*  ",
-"  o=--$<4<22-X  ",
+"  o=--$<4<22-X  ",
-"  o5$$$$$26;7*  ",
+"  o5$$$$$26;7*  ",
-"   X%$$$$2;-X8  ",
+"   X%$$$$2;-X8  ",
-"  90*9$$$-7Xqo  ",
+"  90*9$$$-7Xqo  ",
-" wXwe@O44X4<r<o ",
+" wXwe@O44X4<r<o ",
-" X8628>22222<<*4",
+" X8628>22222<<*4",
-" ttyyyoo4441uuuo",
+" ttyyyoo4441uuuo",
-" t>$$$$$$$$$$$>o",
+" t>$$$$$$$$$$$>o",
-" XXXtyyyoo44411u"
+" XXXtyyyoo44411u"
-};
+};

art/copy.xpm

@@ -1,44 +1,44 @@
-/* XPM */
+/* XPM */
-static const char *const copy_xpm[] = {
+static const char *const copy_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 15 23 1",
-"o c #97C4E7",
+"o c #97C4E7",
-"* c #FFFFFF",
+"* c #FFFFFF",
-"@ c #60A9DA",
+"@ c #60A9DA",
-"= c #D1E5F5",
+"= c #D1E5F5",
-"& c #C3DDF1",
+"& c #C3DDF1",
-". c #7EA6C0",
+". c #7EA6C0",
-"  c None",
+"  c None",
-"X c #2F93CD",
+"X c #2F93CD",
-"O c #85BBE2",
+"O c #85BBE2",
-", c #EFF6FC",
+", c #EFF6FC",
-"; c #DEEDF8",
+"; c #DEEDF8",
-"+ c #72B2DD",
+"+ c #72B2DD",
-"3 c #F7FBFD",
+"3 c #F7FBFD",
-"4 c #FAFCFE",
+"4 c #FAFCFE",
-": c #DAEAF7",
+": c #DAEAF7",
-"< c #E9F3FA",
+"< c #E9F3FA",
-"1 c #E2EFF8",
+"1 c #E2EFF8",
-"- c #FDFDFE",
+"- c #FDFDFE",
-"% c #B6D5EE",
+"% c #B6D5EE",
-"$ c #A5CCEA",
+"$ c #A5CCEA",
-"> c #E5F0F9",
+"> c #E5F0F9",
-"# c #AFD1EC",
+"# c #AFD1EC",
-"2 c #F4F9FD",
+"2 c #F4F9FD",
-/* pixels */
+/* pixels */
-" .....XX        ",
+" .....XX        ",
-" .oO+@X#X       ",
+" .oO+@X#X       ",
-" .$oO+X##X      ",
+" .$oO+X##X      ",
-" .%$o........   ",
+" .%$o........   ",
-" .&%$.*=&#o.-.  ",
+" .&%$.*=&#o.-.  ",
-" .=&%.*;=&#.--. ",
+" .=&%.*;=&#.--. ",
-" .:=&.*>;=&.... ",
+" .:=&.*>;=&.... ",
-" .>:=.*,>;=&#o. ",
+" .>:=.*,>;=&#o. ",
-" .<1:.*2,>:=&#. ",
+" .<1:.*2,>:=&#. ",
-" .2<1.*32,>:=&. ",
+" .2<1.*32,>:=&. ",
-" .32<.*432,>:=. ",
+" .32<.*432,>:=. ",
-" .32<.*-432,>:. ",
+" .32<.*-432,>:. ",
-" .....**-432,>. ",
+" .....**-432,>. ",
-"     .***-432,. ",
+"     .***-432,. ",
-"     .......... "
+"     .......... "
-};
+};

art/cross.xpm

@@ -1,17 +1,17 @@
-/* XPM */
+/* XPM */
-static const char *const cross_xpm[] = {
+static const char *const cross_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"10 10 2 1",
+"10 10 2 1",
-"  c Gray0",
+"  c Gray0",
-"# c None",
+"# c None",
-/* pixels */
+/* pixels */
-" ######## ",
+" ######## ",
-"   ####   ",
+"   ####   ",
-"#   ##   #",
+"#   ##   #",
-"##      ##",
+"##      ##",
-"###    ###",
+"###    ###",
-"###    ###",
+"###    ###",
-"##      ##",
+"##      ##",
-"#   ##   #",
+"#   ##   #",
-"   ####   ",
+"   ####   ",
-"  ######  "};
+"  ######  "};

art/cut.xpm

@@ -1,46 +1,46 @@
-/* XPM */
+/* XPM */
-static const char *const cut_xpm[] = {
+static const char *const cut_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 15 25 1",
-"6 c #D8BDC0",
+"6 c #D8BDC0",
-": c #C3C3C4",
+": c #C3C3C4",
-"- c #FFFFFF",
+"- c #FFFFFF",
-". c #6C6D70",
+". c #6C6D70",
-"2 c #AD3A45",
+"2 c #AD3A45",
-"o c #DBDBDB",
+"o c #DBDBDB",
-"# c #939495",
+"# c #939495",
-"< c #E42234",
+"< c #E42234",
-"& c #C3C5C8",
+"& c #C3C5C8",
-"; c #C6CCD3",
+"; c #C6CCD3",
-"% c #B7B7B8",
+"% c #B7B7B8",
-"  c None",
+"  c None",
-"* c #DFE0E2",
+"* c #DFE0E2",
-"5 c #B69596",
+"5 c #B69596",
-"3 c #9C2A35",
+"3 c #9C2A35",
-"1 c #CFCFD0",
+"1 c #CFCFD0",
-", c #AB5C64",
+", c #AB5C64",
-"+ c #D2D3D4",
+"+ c #D2D3D4",
-"$ c #BCBDBE",
+"$ c #BCBDBE",
-"@ c #C6C8CA",
+"@ c #C6C8CA",
-"> c #CDC0C1",
+"> c #CDC0C1",
-"O c #826F72",
+"O c #826F72",
-"X c #979BA0",
+"X c #979BA0",
-"4 c #9B8687",
+"4 c #9B8687",
-"= c #9FA0A0",
+"= c #9FA0A0",
-/* pixels */
+/* pixels */
-"   .X     .o    ",
+"   .X     .o    ",
-"   O.+   @.     ",
+"   O.+   @.     ",
-"    O.   ..     ",
+"    O.   ..     ",
-"    O#$ %.&     ",
+"    O#$ %.&     ",
-"     O.*..      ",
+"     O.*..      ",
-"     #%#..      ",
+"     #%#..      ",
-"     O=-..      ",
+"     O=-..      ",
-"     #%#;.      ",
+"     #%#;.      ",
-"     OO:=O      ",
+"     OO:=O      ",
-"  >,,<, ,<,,1   ",
+"  >,,<, ,<,,1   ",
-" ><23<1 1<32<1  ",
+" ><23<1 1<32<1  ",
-" ,2 4<   <5 2,  ",
+" ,2 4<   <5 2,  ",
-" <, ,2   2, ,<  ",
+" <, ,2   2, ,<  ",
-" 23,<5   5<,32  ",
+" 23,<5   5<,32  ",
-" 6225     522>  "
+" 6225     522>  "
-};
+};

art/deffile.xpm

@@ -1,54 +1,54 @@
-/* XPM */
+/* XPM */
-static const char *const deffile_xpm[] = {
+static const char *const deffile_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 16 32 1",
+"16 16 32 1",
-"= c #97C4E7",
+"= c #97C4E7",
-": c #72A8D2",
+": c #72A8D2",
-"1 c #FFFFFF",
+"1 c #FFFFFF",
-"w c #839CB5",
+"w c #839CB5",
-"X c #6B98B8",
+"X c #6B98B8",
-". c #5A89A6",
+". c #5A89A6",
-"@ c #3A749C",
+"@ c #3A749C",
-", c #D1E5F5",
+", c #D1E5F5",
-"< c #67A1CF",
+"< c #67A1CF",
-"> c #F1F4F7",
+"> c #F1F4F7",
-"e c #85A7BC",
+"e c #85A7BC",
-"% c #C3DDF1",
+"% c #C3DDF1",
-"0 c #749BB4",
+"0 c #749BB4",
-"2 c #7EA6C0",
+"2 c #7EA6C0",
-"; c #5F9BC8",
+"; c #5F9BC8",
-"  c None",
+"  c None",
-"O c #538DB3",
+"O c #538DB3",
-"- c #85BBE2",
+"- c #85BBE2",
-"$ c #D6DFE7",
+"$ c #D6DFE7",
-"9 c #EFF6FC",
+"9 c #EFF6FC",
-"o c #6591AE",
+"o c #6591AE",
-"4 c #F7FBFD",
+"4 c #F7FBFD",
-"8 c #FAFCFE",
+"8 c #FAFCFE",
-"6 c #DAEAF7",
+"6 c #DAEAF7",
-"7 c #E9F3FA",
+"7 c #E9F3FA",
-"q c #FDFDFE",
+"q c #FDFDFE",
-"3 c #E2EFF8",
+"3 c #E2EFF8",
-"# c #8EA9BC",
+"# c #8EA9BC",
-"& c #B6D5EE",
+"& c #B6D5EE",
-"* c #A5CCEA",
+"* c #A5CCEA",
-"5 c #F4F9FD",
+"5 c #F4F9FD",
-"+ c #4581AA",
+"+ c #4581AA",
-/* pixels */
+/* pixels */
-"  ..XooO+@#$    ",
+"  ..XooO+@#$    ",
-"  .%%&*=-;:;>   ",
+"  .%%&*=-;:;>   ",
-"  .,,%&*=<1=X>  ",
+"  .,,%&*=<1=X>  ",
-"  #%%%%&*211=X  ",
+"  #%%%%&*211=X  ",
-"  #3-----<oXoO  ",
+"  #3-----<oXoO  ",
-"  #3456,%&*=-O  ",
+"  #3456,%&*=-O  ",
-"  #3--------=O  ",
+"  #3--------=O  ",
-"  #355736,%&*o  ",
+"  #355736,%&*o  ",
-"  #3--------&o  ",
+"  #3--------&o  ",
-"  #38459736,%X  ",
+"  #38459736,%X  ",
-"  #3--------,0  ",
+"  #3--------,0  ",
-"  #31q84597360  ",
+"  #31q84597360  ",
-"  #3--------3w  ",
+"  #3--------3w  ",
-"  #3111q84597e  ",
+"  #3111q84597e  ",
-"  ##########e#  ",
+"  ##########e#  ",
-"                "
+"                "
-};
+};

art/delbookm.xpm

@@ -1,24 +1,24 @@
-/* XPM */
+/* XPM */
-static const char *const delbookm_xpm[] = {
+static const char *const delbookm_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 3 1",
+"16 15 3 1",
-". c Black",
+". c Black",
-"  c None",
+"  c None",
-"X c #FF4040",
+"X c #FF4040",
-/* pixels */
+/* pixels */
-"        ....... ",
+"        ....... ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"  .   . .XXXXX. ",
+"  .   . .XXXXX. ",
-"  .. .. .XXXXX. ",
+"  .. .. .XXXXX. ",
-"   ...  .XXXXX. ",
+"   ...  .XXXXX. ",
-"    .   .XXXXX. ",
+"    .   .XXXXX. ",
-"   ...  .XXXXX. ",
+"   ...  .XXXXX. ",
-"  .. .. .XXXXX. ",
+"  .. .. .XXXXX. ",
-"  .   . .XXXXX. ",
+"  .   . .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XXXXX. ",
+"        .XXXXX. ",
-"        .XX.XX. ",
+"        .XX.XX. ",
-"        .X. .X. ",
+"        .X. .X. ",
-"        ..   .. "
+"        ..   .. "
-};
+};

art/delete.xpm

@@ -1,42 +1,42 @@
-/* XPM */
+/* XPM */
-static const char *const delete_xpm[] = {
+static const char *const delete_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 21 1",
+"16 15 21 1",
-"2 c #A5AEBD",
+"2 c #A5AEBD",
-"* c #5478B4",
+"* c #5478B4",
-"< c #95A3BB",
+"< c #95A3BB",
-"O c #9AA7BC",
+"O c #9AA7BC",
-"; c #758EB7",
+"; c #758EB7",
-"$ c #6986B6",
+"$ c #6986B6",
-"# c #4971B2",
+"# c #4971B2",
-"& c #8A9CBA",
+"& c #8A9CBA",
-"X c #8598B9",
+"X c #8598B9",
-"  c None",
+"  c None",
-"o c #ABB2BE",
+"o c #ABB2BE",
-"- c #7F95B9",
+"- c #7F95B9",
-"= c #4E74B3",
+"= c #4E74B3",
-"1 c #A0ABBC",
+"1 c #A0ABBC",
-"+ c #6F8AB7",
+"+ c #6F8AB7",
-". c #B5B9BF",
+". c #B5B9BF",
-"@ c #3E69B1",
+"@ c #3E69B1",
-", c #90A0BA",
+", c #90A0BA",
-": c #6483B5",
+": c #6483B5",
-"> c #5A7BB4",
+"> c #5A7BB4",
-"% c #5F7FB5",
+"% c #5F7FB5",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-"    .Xo      OO ",
+"    .Xo      OO ",
-"    +@#.    $@% ",
+"    +@#.    $@% ",
-"    &@@X  .*@*o ",
+"    &@@X  .*@*o ",
-"     =@= .*@*.  ",
+"     =@= .*@*.  ",
-"     -@@X*@*.   ",
+"     -@@X*@*.   ",
-"     .#@@@$.    ",
+"     .#@@@$.    ",
-"      ;@@:      ",
+"      ;@@:      ",
-"     ;@@@+      ",
+"     ;@@@+      ",
-"   .>@#%@@.     ",
+"   .>@#%@@.     ",
-"  o*@*oO@@,     ",
+"  o*@*oO@@,     ",
-" <#@*. .@@=     ",
+" <#@*. .@@=     ",
-"&@@$    :@@1    ",
+"&@@$    :@@1    ",
-";#&     2#>.    ",
+";#&     2#>.    ",
-"                "
+"                "
-};
+};

art/dir_up.xpm

@@ -1,52 +1,52 @@
-/* XPM */
+/* XPM */
-static const char *const dir_up_xpm[] = {
+static const char *const dir_up_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 31 1",
+"16 15 31 1",
-"6 c #9BACC2",
+"6 c #9BACC2",
-"o c #9AEA53",
+"o c #9AEA53",
-"7 c #94A5BD",
+"7 c #94A5BD",
-"8 c #547897",
+"8 c #547897",
-"5 c #839CB5",
+"5 c #839CB5",
-"@ c #376485",
+"@ c #376485",
-"$ c #5A809C",
+"$ c #5A809C",
-"# c #7F99B4",
+"# c #7F99B4",
-": c #D1D9E5",
+": c #D1D9E5",
-"< c #EAEDF3",
+"< c #EAEDF3",
-"& c #446A8C",
+"& c #446A8C",
-"q c #65839D",
+"q c #65839D",
-"> c #DCE2EA",
+"> c #DCE2EA",
-", c #E1E6EE",
+", c #E1E6EE",
-"2 c #F5F6F7",
+"2 c #F5F6F7",
-"O c #8DA0B9",
+"O c #8DA0B9",
-"  c None",
+"  c None",
-"% c #467291",
+"% c #467291",
-". c #305F81",
+". c #305F81",
-"X c #7393AB",
+"X c #7393AB",
-"+ c #6A89A2",
+"+ c #6A89A2",
-"4 c #A8B6CA",
+"4 c #A8B6CA",
-"1 c #EEF1F3",
+"1 c #EEF1F3",
-"3 c #F8F9FA",
+"3 c #F8F9FA",
-"0 c #215579",
+"0 c #215579",
-"9 c #7F97B0",
+"9 c #7F97B0",
-"* c #B3BFD1",
+"* c #B3BFD1",
-"w c #7A90AC",
+"w c #7A90AC",
-"- c #C2CBDB",
+"- c #C2CBDB",
-"; c #CAD6E1",
+"; c #CAD6E1",
-"= c #BBC4D6",
+"= c #BBC4D6",
-/* pixels */
+/* pixels */
-"         ..     ",
+"         ..     ",
-"        X.o.    ",
+"        X.o.    ",
-"....   X.ooo.   ",
+"....   X.ooo.   ",
-".OO+....ooooo.  ",
+".OO+....ooooo.  ",
-".OOOOOO@@ooo..  ",
+".OOOOOO@@ooo..  ",
-".OOOO#OO@ooo.$  ",
+".OOOO#OO@ooo.$  ",
-".OOOOOOO@ooo.$  ",
+".OOOOOOO@ooo.$  ",
-".O%............&",
+".O%............&",
-".O&*=-;:>,<1231.",
+".O&*=-;:>,<1231.",
-".+.4*=-;:>,<12$.",
+".+.4*=-;:>,<12$.",
-"..564*=-;:>,<1. ",
+"..564*=-;:>,<1. ",
-".@O764*=-;:>,<. ",
+".@O764*=-;:>,<. ",
-".89O764*=-;:>$$ ",
+".89O764*=-;:>$$ ",
-"0qw9O764*=-;:.  ",
+"0qw9O764*=-;:.  ",
-"0.............  "
+"0.............  "
-};
+};

art/down.xpm

@@ -1,21 +1,21 @@
-/* XPM */
+/* XPM */
-static const char *const down_xpm[] = {
+static const char *const down_xpm[] = {
-"16 15 3 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c Gray100",
+"X	c Gray100",
-"                ",
+"                ",
-"     ......     ",
+"     ......     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"  ....XXXX....  ",
+"  ....XXXX....  ",
-"   .XXXXXXXX.   ",
+"   .XXXXXXXX.   ",
-"    .XXXXXX.    ",
+"    .XXXXXX.    ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"      .XX.      ",
+"      .XX.      ",
-"       ..       ",
+"       ..       ",
-"                "};
+"                "};

art/edit.xpm

@@ -1,22 +0,0 @@
-/* XPM */
-static const char* const edit_xpm[] = {
-"16 16 3 1",
-"   c None",
-".  c #000000",
-"+  c #00007F",
-"                ",
-"                ",
-"      .. ..     ",
-"        .       ",
-"        .       ",
-"  ++++  .  ++++ ",
-"     ++ . ++  ++",
-"  +++++ . ++++++",
-" ++  ++ . ++    ",
-" ++  ++ . ++  ++",
-"  +++++ .  ++++ ",
-"        .       ",
-"        .       ",
-"      .. ..     ",
-"                ",
-"                "};

art/exefile.xpm

@@ -1,73 +1,73 @@
-/* XPM */
+/* XPM */
-static const char *const exefile_xpm[] = {
+static const char *const exefile_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 16 51 1",
+"16 16 51 1",
-"% c #E8E8EC",
+"% c #E8E8EC",
-"= c #E8E8ED",
+"= c #E8E8ED",
-"z c #CACAD4",
+"z c #CACAD4",
-"8 c #D9D9E1",
+"8 c #D9D9E1",
-"p c #D2D2DA",
+"p c #D2D2DA",
-"u c #E1E1E7",
+"u c #E1E1E7",
-"a c #D2D2DB",
+"a c #D2D2DB",
-"< c #E9E9ED",
+"< c #E9E9ED",
-"q c #DADAE1",
+"q c #DADAE1",
-"+ c #F1F1F4",
+"+ c #F1F1F4",
-"g c #D3D3DB",
+"g c #D3D3DB",
-"1 c #E2E2E8",
+"1 c #E2E2E8",
-"x c #D3D3DC",
+"x c #D3D3DC",
-"5 c #00A5FF",
+"5 c #00A5FF",
-"$ c #EAEAEE",
+"$ c #EAEAEE",
-"4 c #DBDBE2",
+"4 c #DBDBE2",
-"h c #CCCCD6",
+"h c #CCCCD6",
-"y c #D4D4DC",
+"y c #D4D4DC",
-"r c #E3E3E9",
+"r c #E3E3E9",
-"d c #D4D4DD",
+"d c #D4D4DD",
-"7 c #DCDCE2",
+"7 c #DCDCE2",
-": c #EBEBEF",
+": c #EBEBEF",
-"0 c #DCDCE3",
+"0 c #DCDCE3",
-"  c None",
+"  c None",
-"O c #F3F3F5",
+"O c #F3F3F5",
-"> c #E4E4E9",
+"> c #E4E4E9",
-"& c #F3F3F6",
+"& c #F3F3F6",
-"j c #D5D5DD",
+"j c #D5D5DD",
-"6 c #E4E4EA",
+"6 c #E4E4EA",
-". c #C6C6D5",
+". c #C6C6D5",
-"# c #ECECF0",
+"# c #ECECF0",
-"f c #CECED7",
+"f c #CECED7",
-"l c #CECED8",
+"l c #CECED8",
-"e c #D6D6DE",
+"e c #D6D6DE",
-"; c #EDEDF0",
+"; c #EDEDF0",
-"3 c #DEDEE4",
+"3 c #DEDEE4",
-", c #EDEDF1",
+", c #EDEDF1",
-"c c #CFCFD8",
+"c c #CFCFD8",
-"o c #F5F5F7",
+"o c #F5F5F7",
-"- c #E6E6EB",
+"- c #E6E6EB",
-"w c #D7D7DF",
+"w c #D7D7DF",
-"v c #C8C8D3",
+"v c #C8C8D3",
-"i c #DFDFE5",
+"i c #DFDFE5",
-"@ c #EEEEF2",
+"@ c #EEEEF2",
-"s c #D0D0D9",
+"s c #D0D0D9",
-"X c #9494AD",
+"X c #9494AD",
-"9 c #D8D8DF",
+"9 c #D8D8DF",
-"t c #D8D8E0",
+"t c #D8D8E0",
-"* c #EFEFF2",
+"* c #EFEFF2",
-"2 c #E0E0E6",
+"2 c #E0E0E6",
-"k c #D1D1DA",
+"k c #D1D1DA",
-/* pixels */
+/* pixels */
-"  ........X     ",
+"  ........X     ",
-"  .oO+@#$%XX    ",
+"  .oO+@#$%XX    ",
-"  .&+*#$=-XXX   ",
+"  .&+*#$=-XXX   ",
-"  .+*;:=->XXXX  ",
+"  .+*;:=->XXXX  ",
-"  .*,:<->1234X  ",
+"  .*,:<->1234X  ",
-"  .,5:5612378X  ",
+"  .,5:5612378X  ",
-"  5,5559530qwX  ",
+"  5,5559530qwX  ",
-"  55555550q9eX  ",
+"  55555550q9eX  ",
-" 5555r5555teyX  ",
+" 5555r5555teyX  ",
-"  55rui559eypX  ",
+"  55rui559eypX  ",
-" 5555i5555yasX  ",
+" 5555i5555yasX  ",
-"  5555555dasfX  ",
+"  5555555dasfX  ",
-"  5355595gsfhX  ",
+"  5355595gsfhX  ",
-"  .3595jgklhzX  ",
+"  .3595jgklhzX  ",
-"  .0qwjxkchzvX  ",
+"  .0qwjxkchzvX  ",
-"  XXXXXXXXXXXX  "
+"  XXXXXXXXXXXX  "
-};
+};

art/fileopen.xpm

@@ -1,57 +1,57 @@
-/* XPM */
+/* XPM */
-static const char *const fileopen_xpm[] = {
+static const char *const fileopen_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 36 1",
+"16 15 36 1",
-"6 c #9BACC2",
+"6 c #9BACC2",
-"< c #9AEA53",
+"< c #9AEA53",
-"9 c #94A5BD",
+"9 c #94A5BD",
-"5 c #839CB5",
+"5 c #839CB5",
-"; c #4D7492",
+"; c #4D7492",
-". c #376485",
+". c #376485",
-"$ c #7F99B4",
+"$ c #7F99B4",
-"r c #D1D9E5",
+"r c #D1D9E5",
-"7 c #EAEDF3",
+"7 c #EAEDF3",
-"@ c #CAD2DC",
+"@ c #CAD2DC",
-"% c #718BA7",
+"% c #718BA7",
-"t c #BECAD9",
+"t c #BECAD9",
-"& c #65839D",
+"& c #65839D",
-"0 c #DCE2EA",
+"0 c #DCE2EA",
-"4 c #F5F6F7",
+"4 c #F5F6F7",
-"w c #597B9A",
+"w c #597B9A",
-"O c #8DA0B9",
+"O c #8DA0B9",
-"  c None",
+"  c None",
-"+ c #467291",
+"+ c #467291",
-"u c #305F81",
+"u c #305F81",
-"= c #B4C4D3",
+"= c #B4C4D3",
-"# c #CAE2AA",
+"# c #CAE2AA",
-"1 c #FAFCFE",
+"1 c #FAFCFE",
-"3 c #A8B6CA",
+"3 c #A8B6CA",
-"q c #E4E9ED",
+"q c #E4E9ED",
-"8 c #EEF1F3",
+"8 c #EEF1F3",
-"X c #215579",
+"X c #215579",
-"2 c #7F97B0",
+"2 c #7F97B0",
-": c #B3BFD1",
+": c #B3BFD1",
-"y c #7A90AC",
+"y c #7A90AC",
-", c #C2CBDB",
+", c #C2CBDB",
-"- c #ADD668",
+"- c #ADD668",
-"* c #B6D791",
+"* c #B6D791",
-"e c #CAD6E1",
+"e c #CAD6E1",
-"o c #DFF0D0",
+"o c #DFF0D0",
-"> c #BBC4D6",
+"> c #BBC4D6",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-"     ....       ",
+"     ....       ",
-"XXXXX .oo.      ",
+"XXXXX .oo.      ",
-"XOOOO+@.#o.     ",
+"XOOOO+@.#o.     ",
-"XOOOO$%&.*oXXX  ",
+"XOOOO$%&.*oXXX  ",
-"XOOOOOOO.*oX=X  ",
+"XOOOOOOO.*oX=X  ",
-"XOXXXX...-oXXXX;",
+"XOXXXX...-oXXXX;",
-"XOX:>,.<<<<<oX1;",
+"XOX:>,.<<<<<oX1;",
-"X2X3:>,.<<<oX4=;",
+"X2X3:>,.<<<oX4=;",
-"XX563:>>.<oX78; ",
+"XX563:>>.<oX78; ",
-"XXO963:>>.X0q7; ",
+"XXO963:>>.X0q7; ",
-"Xw2O963:>>er0t; ",
+"Xw2O963:>>er0t; ",
-"X&y2O963:>,er;  ",
+"X&y2O963:>,er;  ",
-"uXXXXXXXXXXXX;  ",
+"uXXXXXXXXXXXX;  ",
-"                "
+"                "
-};
+};

art/filesave.xpm

@@ -1,42 +1,42 @@
-/* XPM */
+/* XPM */
-static const char *const filesave_xpm[] = {
+static const char *const filesave_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 21 1",
+"16 15 21 1",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"> c #D5D6D8",
+"> c #D5D6D8",
-"; c #446A8C",
+"; c #446A8C",
-"1 c #CAD2DC",
+"1 c #CAD2DC",
-": c #C0C7D1",
+": c #C0C7D1",
-"  c #5F666D",
+"  c #5F666D",
-"% c #A5B0BA",
+"% c #A5B0BA",
-"o c #65839D",
+"o c #65839D",
-", c #DCE2EA",
+", c #DCE2EA",
-"< c #C3C5C8",
+"< c #C3C5C8",
-"- c #E1E6EE",
+"- c #E1E6EE",
-"* c #C6CCD3",
+"* c #C6CCD3",
-". c None",
+". c None",
-"$ c #305F81",
+"$ c #305F81",
-"2 c #D6DFE7",
+"2 c #D6DFE7",
-"= c #D2D9E0",
+"= c #D2D9E0",
-"& c #B7BFC7",
+"& c #B7BFC7",
-"X c #1B4467",
+"X c #1B4467",
-"# c #BCBDBE",
+"# c #BCBDBE",
-"@ c #7A90AC",
+"@ c #7A90AC",
-"+ c #5D7C93",
+"+ c #5D7C93",
-/* pixels */
+/* pixels */
-"               .",
+"               .",
-" XoOOOOOOOOO+X .",
+" XoOOOOOOOOO+X .",
-" @oO#######O+@ .",
+" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
+" @oOOOOOOOOO+@ .",
-" @oO#######O+@ .",
+" @oO#######O+@ .",
-" @oOOOOOOOOO+@ .",
+" @oOOOOOOOOO+@ .",
-" @@+++++++++@@ .",
+" @@+++++++++@@ .",
-" @@@@@@@@@@@@@ .",
+" @@@@@@@@@@@@@ .",
-" @@@$$$$$$$$@@ .",
+" @@@$$$$$$$$@@ .",
-" @@$%%%&*=-O$@ .",
+" @@$%%%&*=-O$@ .",
-" @@$%X;;*=-O$@ .",
+" @@$%X;;*=-O$@ .",
-" @@$%X;;:>,O$@ .",
+" @@$%X;;:>,O$@ .",
-" @@$%X;;<12O$@ .",
+" @@$%X;;<12O$@ .",
-" @@$<<2OOOOO$@ .",
+" @@$<<2OOOOO$@ .",
-".             .."
+".             .."
-};
+};

art/filesaveas.xpm

@@ -1,44 +1,44 @@
-/* XPM */
+/* XPM */
-static const char *const filesaveas_xpm[] = {
+static const char *const filesaveas_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 15 23 1",
-"X c Black",
+"X c Black",
-"+ c #FFFFFF",
+"+ c #FFFFFF",
-"< c #D5D6D8",
+"< c #D5D6D8",
-"> c #446A8C",
+"> c #446A8C",
-"3 c #CAD2DC",
+"3 c #CAD2DC",
-", c #C0C7D1",
+", c #C0C7D1",
-"  c #5F666D",
+"  c #5F666D",
-"* c #A5B0BA",
+"* c #A5B0BA",
-"O c #65839D",
+"O c #65839D",
-"1 c #DCE2EA",
+"1 c #DCE2EA",
-"2 c #C3C5C8",
+"2 c #C3C5C8",
-": c #E1E6EE",
+": c #E1E6EE",
-". c #FFFF00",
+". c #FFFF00",
-"- c #C6CCD3",
+"- c #C6CCD3",
-"@ c None",
+"@ c None",
-"& c #305F81",
+"& c #305F81",
-"4 c #D6DFE7",
+"4 c #D6DFE7",
-"; c #D2D9E0",
+"; c #D2D9E0",
-"= c #B7BFC7",
+"= c #B7BFC7",
-"o c #1B4467",
+"o c #1B4467",
-"$ c #BCBDBE",
+"$ c #BCBDBE",
-"# c #7A90AC",
+"# c #7A90AC",
-"% c #5D7C93",
+"% c #5D7C93",
-/* pixels */
+/* pixels */
-"         .X .XX.",
+"         .X .XX.",
-" oO+++++++.X.X.@",
+" oO+++++++.X.X.@",
-" #O+$$$$$XX...XX",
+" #O+$$$$$XX...XX",
-" #O++++++.......",
+" #O++++++.......",
-" #O+$$$$$XX...XX",
+" #O+$$$$$XX...XX",
-" #O+++++++.X.X.@",
+" #O+++++++.X.X.@",
-" ##%%%%%%.X%.X .",
+" ##%%%%%%.X%.X .",
-" ############# @",
+" ############# @",
-" ###&&&&&&&&## @",
+" ###&&&&&&&&## @",
-" ##&***=-;:+&# @",
+" ##&***=-;:+&# @",
-" ##&*o>>-;:+&# @",
+" ##&*o>>-;:+&# @",
-" ##&*o>>,<1+&# @",
+" ##&*o>>,<1+&# @",
-" ##&*o>>234+&# @",
+" ##&*o>>234+&# @",
-" ##&224+++++&# @",
+" ##&224+++++&# @",
-"@             @@"
+"@             @@"
-};
+};

art/find.xpm

@@ -1,62 +1,62 @@
-/* XPM */
+/* XPM */
-static const char *const find_xpm[] = {
+static const char *const find_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 41 1",
+"16 15 41 1",
-"y c #A06959",
+"y c #A06959",
-"9 c #A7DAF2",
+"9 c #A7DAF2",
-"$ c #B5CAD7",
+"$ c #B5CAD7",
-"> c #35B4E1",
+"> c #35B4E1",
-"t c #6B98B8",
+"t c #6B98B8",
-"w c #B6E0F4",
+"w c #B6E0F4",
-"q c #AEC9D7",
+"q c #AEC9D7",
-"1 c #5A89A6",
+"1 c #5A89A6",
-"+ c #98B3C6",
+"+ c #98B3C6",
-"4 c #EAF6FC",
+"4 c #EAF6FC",
-"3 c #DEF1FA",
+"3 c #DEF1FA",
-"= c #4CBCE3",
+"= c #4CBCE3",
-"d c #DB916B",
+"d c #DB916B",
-"X c #85A7BC",
+"X c #85A7BC",
-"s c #D8BCA4",
+"s c #D8BCA4",
-"o c #749BB4",
+"o c #749BB4",
-"e c #BCD9EF",
+"e c #BCD9EF",
-"* c #62B4DD",
+"* c #62B4DD",
-"< c #91D2EF",
+"< c #91D2EF",
-"a c #E6DED2",
+"a c #E6DED2",
-"0 c #E9F4FB",
+"0 c #E9F4FB",
-"  c None",
+"  c None",
-"@ c #A0BACB",
+"@ c #A0BACB",
-"O c #AABFCD",
+"O c #AABFCD",
-"i c #6591AE",
+"i c #6591AE",
-": c #B9CBD5",
+": c #B9CBD5",
-"- c #71C5E7",
+"- c #71C5E7",
-"5 c #D3ECF8",
+"5 c #D3ECF8",
-"% c #81A3B9",
+"% c #81A3B9",
-"6 c #8AD0EE",
+"6 c #8AD0EE",
-"8 c #FDFDFE",
+"8 c #FDFDFE",
-"p c #8EA9BC",
+"p c #8EA9BC",
-"r c #B6D5EE",
+"r c #B6D5EE",
-", c #81CCEB",
+", c #81CCEB",
-". c #ACC4D3",
+". c #ACC4D3",
-"; c #AFD1DE",
+"; c #AFD1DE",
-"7 c #EFF8FC",
+"7 c #EFF8FC",
-"u c #C2CBDB",
+"u c #C2CBDB",
-"# c #C0D1DC",
+"# c #C0D1DC",
-"2 c #CAD6E1",
+"2 c #CAD6E1",
-"& c #8FB0C3",
+"& c #8FB0C3",
-/* pixels */
+/* pixels */
-"       .XooXO   ",
+"       .XooXO   ",
-"      +@###$+%  ",
+"      +@###$+%  ",
-"     .&#*==-;@@ ",
+"     .&#*==-;@@ ",
-"     o:*>,<--:X ",
+"     o:*>,<--:X ",
-"     12>-345-#% ",
+"     12>-345-#% ",
-"     12>678392% ",
+"     12>678392% ",
-"     %$*,3059q& ",
+"     %$*,3059q& ",
-"     @Oq,wwer@@ ",
+"     @Oq,wwer@@ ",
-"      t@q22q&+  ",
+"      t@q22q&+  ",
-"    yyui+%o%p   ",
+"    yyui+%o%p   ",
-"   yasy         ",
+"   yasy         ",
-"  yasdy         ",
+"  yasdy         ",
-" yasdy          ",
+" yasdy          ",
-" ysdy           ",
+" ysdy           ",
-"  yy            "
+"  yy            "
-};
+};

art/findrepl.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const findrepl_xpm[] = {
+static const char *const findrepl_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 42 1",
+"16 15 42 1",
-"y c #A06959",
+"y c #A06959",
-"9 c #A7DAF2",
+"9 c #A7DAF2",
-"$ c #B5CAD7",
+"$ c #B5CAD7",
-"> c #35B4E1",
+"> c #35B4E1",
-"t c #6B98B8",
+"t c #6B98B8",
-"w c #B6E0F4",
+"w c #B6E0F4",
-"q c #AEC9D7",
+"q c #AEC9D7",
-"1 c #5A89A6",
+"1 c #5A89A6",
-"+ c #98B3C6",
+"+ c #98B3C6",
-"4 c #EAF6FC",
+"4 c #EAF6FC",
-"d c #008000",
+"d c #008000",
-"3 c #DEF1FA",
+"3 c #DEF1FA",
-"= c #4CBCE3",
+"= c #4CBCE3",
-"f c #DB916B",
+"f c #DB916B",
-"X c #85A7BC",
+"X c #85A7BC",
-"s c #D8BCA4",
+"s c #D8BCA4",
-"o c #749BB4",
+"o c #749BB4",
-"e c #BCD9EF",
+"e c #BCD9EF",
-"* c #62B4DD",
+"* c #62B4DD",
-"< c #91D2EF",
+"< c #91D2EF",
-"a c #E6DED2",
+"a c #E6DED2",
-"0 c #E9F4FB",
+"0 c #E9F4FB",
-"  c None",
+"  c None",
-"@ c #A0BACB",
+"@ c #A0BACB",
-"O c #AABFCD",
+"O c #AABFCD",
-"i c #6591AE",
+"i c #6591AE",
-": c #B9CBD5",
+": c #B9CBD5",
-"- c #71C5E7",
+"- c #71C5E7",
-"5 c #D3ECF8",
+"5 c #D3ECF8",
-"% c #81A3B9",
+"% c #81A3B9",
-"6 c #8AD0EE",
+"6 c #8AD0EE",
-"8 c #FDFDFE",
+"8 c #FDFDFE",
-"p c #8EA9BC",
+"p c #8EA9BC",
-"r c #B6D5EE",
+"r c #B6D5EE",
-", c #81CCEB",
+", c #81CCEB",
-". c #ACC4D3",
+". c #ACC4D3",
-"; c #AFD1DE",
+"; c #AFD1DE",
-"7 c #EFF8FC",
+"7 c #EFF8FC",
-"u c #C2CBDB",
+"u c #C2CBDB",
-"# c #C0D1DC",
+"# c #C0D1DC",
-"2 c #CAD6E1",
+"2 c #CAD6E1",
-"& c #8FB0C3",
+"& c #8FB0C3",
-/* pixels */
+/* pixels */
-"      .XooXO    ",
+"      .XooXO    ",
-"     +@###$+%   ",
+"     +@###$+%   ",
-"    .&#*==-;@@  ",
+"    .&#*==-;@@  ",
-"    o:*>,<--:X  ",
+"    o:*>,<--:X  ",
-"    12>-345-#%  ",
+"    12>-345-#%  ",
-"    12>678392%  ",
+"    12>678392%  ",
-"    %$*,3059q&  ",
+"    %$*,3059q&  ",
-"    @Oq,wwer@@  ",
+"    @Oq,wwer@@  ",
-"     t@q22q&+   ",
+"     t@q22q&+   ",
-"   yyui+%o%p    ",
+"   yyui+%o%p    ",
-"  yasy   d   d  ",
+"  yasy   d   d  ",
-" yasfy  dd   dd ",
+" yasfy  dd   dd ",
-"yasfy  ddddddddd",
+"yasfy  ddddddddd",
-"ysfy    dd   dd ",
+"ysfy    dd   dd ",
-" yy      d   d  "
+" yy      d   d  "
-};
+};

art/floppy.xpm

@@ -1,39 +1,39 @@
-/* XPM */
+/* XPM */
-static const char *const floppy_xpm[] = {
+static const char *const floppy_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 18 1",
+"16 15 18 1",
-"& c #E3E4E6",
+"& c #E3E4E6",
-"+ c #FFFFFF",
+"+ c #FFFFFF",
-". c #446A8C",
+". c #446A8C",
-"o c #697787",
+"o c #697787",
-"> c #5F666D",
+"> c #5F666D",
-"* c #B2B3B3",
+"* c #B2B3B3",
-"  c None",
+"  c None",
-", c #4B4C4D",
+", c #4B4C4D",
-"= c #DCDBDA",
+"= c #DCDBDA",
-"$ c #1B4467",
+"$ c #1B4467",
-": c #E4E9ED",
+": c #E4E9ED",
-"@ c #979BA0",
+"@ c #979BA0",
-"X c #203646",
+"X c #203646",
-"O c #215579",
+"O c #215579",
-"- c #545B63",
+"- c #545B63",
-"; c #636465",
+"; c #636465",
-"# c #CAD6E1",
+"# c #CAD6E1",
-"% c #7F8286",
+"% c #7F8286",
-/* pixels */
+/* pixels */
-"  .XoooooooXO   ",
+"  .XoooooooXO   ",
-"  .o+++++++.O   ",
+"  .o+++++++.O   ",
-"  .o+OOOOO+.O   ",
+"  .o+OOOOO+.O   ",
-"  .o+++++++.O   ",
+"  .o+++++++.O   ",
-"  .o@@@@@@@.O   ",
+"  .o@@@@@@@.O   ",
-"  ..........O   ",
+"  ..........O   ",
-"  ..#+++++#.O   ",
+"  ..#+++++#.O   ",
-"  ..+$O+++#.O   ",
+"  ..+$O+++#.O   ",
-"  ..+$O+++#.O   ",
+"  ..+$O+++#.O   ",
-" %&.........*%  ",
+" %&.........*%  ",
-"%=+++++++++++&% ",
+"%=+++++++++++&% ",
-"--------------; ",
+"--------------; ",
-"-:::::::::::::- ",
+"-:::::::::::::- ",
-"-:X:XXXXXXXXX:> ",
+"-:X:XXXXXXXXX:> ",
-"-*************, "
+"-*************, "
-};
+};

art/folder.xpm

@@ -1,43 +1,43 @@
-/* XPM */
+/* XPM */
-static const char *const folder_xpm[] = {
+static const char *const folder_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 22 1",
+"16 15 22 1",
-"> c #9BACC2",
+"> c #9BACC2",
-". c #547897",
+". c #547897",
-"1 c #7F99B4",
+"1 c #7F99B4",
-"X c #D1D9E5",
+"X c #D1D9E5",
-"< c #EAEDF3",
+"< c #EAEDF3",
-"+ c #CAD2DC",
+"+ c #CAD2DC",
-"3 c #718BA7",
+"3 c #718BA7",
-"O c #BECAD9",
+"O c #BECAD9",
-"$ c #E1E6EE",
+"$ c #E1E6EE",
-"* c #F5F6F7",
+"* c #F5F6F7",
-", c #8DA0B9",
+", c #8DA0B9",
-"  c None",
+"  c None",
-"# c #D6DFE7",
+"# c #D6DFE7",
-"@ c #D2D9E0",
+"@ c #D2D9E0",
-"- c #FAFCFE",
+"- c #FAFCFE",
-"; c #ADBACE",
+"; c #ADBACE",
-"& c #EEF1F3",
+"& c #EEF1F3",
-"= c #F8F9FA",
+"= c #F8F9FA",
-"o c #B3BFD1",
+"o c #B3BFD1",
-"2 c #7A90AC",
+"2 c #7A90AC",
-": c #A2B3C5",
+": c #A2B3C5",
-"% c #E5EAF1",
+"% c #E5EAF1",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-" .....          ",
+" .....          ",
-" .XXXX.         ",
+" .XXXX.         ",
-" .............  ",
+" .............  ",
-" .oO+@#$%&*=-.  ",
+" .oO+@#$%&*=-.  ",
-" .oO+@#$%&*=-.  ",
+" .oO+@#$%&*=-.  ",
-" .;oO+X#$%&*=.  ",
+" .;oO+X#$%&*=.  ",
-" .:;oO+X#$%&*.  ",
+" .:;oO+X#$%&*.  ",
-" .>:;oO+X#$%&.  ",
+" .>:;oO+X#$%&.  ",
-" .,>:;oO+X#$<.  ",
+" .,>:;oO+X#$<.  ",
-" .1,>:;oO+X#$.  ",
+" .1,>:;oO+X#$.  ",
-" .21,>:;oO+X#.  ",
+" .21,>:;oO+X#.  ",
-" .321,>:;oO+X.  ",
+" .321,>:;oO+X.  ",
-" .............  ",
+" .............  ",
-"                "
+"                "
-};
+};

art/folder_open.xpm

@@ -1,52 +1,52 @@
-/* XPM */
+/* XPM */
-static const char *const folder_open_xpm[] = {
+static const char *const folder_open_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 31 1",
+"16 15 31 1",
-"6 c #9BACC2",
+"6 c #9BACC2",
-"w c #547B99",
+"w c #547B99",
-"5 c #94A5BD",
+"5 c #94A5BD",
-". c #376485",
+". c #376485",
-"; c #F1F4F7",
+"; c #F1F4F7",
-"o c #7F99B4",
+"o c #7F99B4",
-"2 c #D1D9E5",
+"2 c #D1D9E5",
-"- c #EAEDF3",
+"- c #EAEDF3",
-"O c #718BA7",
+"O c #718BA7",
-"0 c #65839D",
+"0 c #65839D",
-"* c #DCE2EA",
+"* c #DCE2EA",
-": c #F5F6F7",
+": c #F5F6F7",
-"7 c #597B9A",
+"7 c #597B9A",
-"X c #8DA0B9",
+"X c #8DA0B9",
-"  c None",
+"  c None",
-"+ c #467291",
+"+ c #467291",
-"q c #305F81",
+"q c #305F81",
-"& c #D6DFE7",
+"& c #D6DFE7",
-"3 c #6A89A2",
+"3 c #6A89A2",
-"1 c #A8B6CA",
+"1 c #A8B6CA",
-"= c #E4E9ED",
+"= c #E4E9ED",
-"> c #F8F9FA",
+"> c #F8F9FA",
-", c #FDFDFE",
+", c #FDFDFE",
-"9 c #215579",
+"9 c #215579",
-"8 c #7F97B0",
+"8 c #7F97B0",
-"@ c #B3BFD1",
+"@ c #B3BFD1",
-"< c #7A90AC",
+"< c #7A90AC",
-"$ c #C2CBDB",
+"$ c #C2CBDB",
-"4 c #A2B3C5",
+"4 c #A2B3C5",
-"% c #CAD6E1",
+"% c #CAD6E1",
-"# c #BBC4D6",
+"# c #BBC4D6",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-".....           ",
+".....           ",
-".XXXo.          ",
+".XXXo.          ",
-".XXXXO........  ",
+".XXXXO........  ",
-".XXXXXXXXXXXX.  ",
+".XXXXXXXXXXXX.  ",
-".XXXXXXXXXXXX.  ",
+".XXXXXXXXXXXX.  ",
-".X++++++++++++++",
+".X++++++++++++++",
-".X+@#$%&*=-;:>,+",
+".X+@#$%&*=-;:>,+",
-".<.1@#$%2*=-;:23",
+".<.1@#$%2*=-;:23",
-"..X41@#$%2*=-;3 ",
+"..X41@#$%2*=-;3 ",
-"..X561@#$%2*=-3 ",
+"..X561@#$%2*=-3 ",
-".78X561@#$%2*%3 ",
+".78X561@#$%2*%3 ",
-"90<8X561@#$%23  ",
+"90<8X561@#$%23  ",
-"q++++++++++++w  ",
+"q++++++++++++w  ",
-"                "
+"                "
-};
+};

art/forward.xpm

@@ -1,21 +1,21 @@
-/* XPM */
+/* XPM */
-static const char *const forward_xpm[] = {
+static const char *const forward_xpm[] = {
-"16 15 3 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c Gray100",
+"X	c Gray100",
-"                ",
+"                ",
-"                ",
+"                ",
-"         .      ",
+"         .      ",
-"         ..     ",
+"         ..     ",
-"         .X.    ",
+"         .X.    ",
-"  ........XX.   ",
+"  ........XX.   ",
-"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
-"  .XXXXXXXXXXX. ",
+"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXXX. ",
+"  .XXXXXXXXXXX. ",
-"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
-"  ........XX.   ",
+"  ........XX.   ",
-"         .X.    ",
+"         .X.    ",
-"         ..     ",
+"         ..     ",
-"         .      ",
+"         .      ",
-"                "};
+"                "};

art/fullscreen.xpm

@@ -1,70 +0,0 @@
-/* XPM */
-static const char *const fullscreen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 48 1",
-"  c #82837F",
-". c #3465A4",
-"X c #3566A4",
-"o c #3767A5",
-"O c #3B6AA7",
-"+ c #406EA9",
-"@ c #4370AA",
-"# c #4672AB",
-"$ c #4B76AE",
-"% c #4E78AE",
-"& c #577FB2",
-"* c #5F84B4",
-"= c #678BB9",
-"- c #6F91BD",
-"; c #7A98C0",
-": c #848681",
-"> c #888A85",
-", c #8BA6C9",
-"< c #90AACA",
-"1 c #99B0CC",
-"2 c #9EB5D1",
-"3 c #A0B4CF",
-"4 c #A2B6CF",
-"5 c #A6BAD4",
-"6 c #B7C7DB",
-"7 c #B9C7D8",
-"8 c #BDCBDC",
-"9 c #C7D2DF",
-"0 c #C9D3E0",
-"q c #CCD7E3",
-"w c #D3DBE6",
-"e c #D9E1EA",
-"r c #DBE2EA",
-"t c #EFEEEC",
-"y c #EFEFED",
-"u c #F0F0EF",
-"i c #F2F2F0",
-"p c #F3F3F1",
-"a c #F4F3F2",
-"s c #F4F4F2",
-"d c #F4F5F4",
-"f c #F7F6F6",
-"g c #F8F8F7",
-"h c #F8F9F8",
-"j c #FBFAFA",
-"k c #FBFBFA",
-"l c #FCFCFD",
-"z c #FFFFFF",
-/* pixels */
-">>>>>>>>>>>>>>>>",
-">zzzzzzzzzzzzzz>",
-">z..X.ttyy....z>",
-">z..Xttyyyy...z>",
-">z..#*uuss%+..z>",
-">z.y&,4uu1-&sOz>",
-">zuuy470w82asiz>",
-">zuiuu9usqsddsz>",
-">zsssfqsfrfhhfz>",
-">zhff<6wr95jjjz>",
-">z.h%=,fj4-$j.z>",
-">z..O#hhjj+O.Xz>",
-">z...jhhjjj...z>",
-">z....jjzl....z>",
-">zzzzzzzzzzzzzz>",
-":>>>>>>>>>>>>>> "
-};

art/gtk/error.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const error_xpm[] = {
+static const char *const error_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 4 1",
+"48 48 4 1",
-"  c None",
+"  c None",
-"X c #242424",
+"X c #242424",
-"o c #DCDF00",
+"o c #DCDF00",
-". c #C00000",
+". c #C00000",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                    .....                       ",
+"                    .....                       ",
-"                .............                   ",
+"                .............                   ",
-"              .................                 ",
+"              .................                 ",
-"             ...................                ",
+"             ...................                ",
-"           .......................              ",
+"           .......................              ",
-"          .........................             ",
+"          .........................             ",
-"         ...........................            ",
+"         ...........................            ",
-"         ...........................X           ",
+"         ...........................X           ",
-"        .............................X          ",
+"        .............................X          ",
-"       ...............................          ",
+"       ...............................          ",
-"       ...............................X         ",
+"       ...............................X         ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      .................................XX       ",
+"      .................................XX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"        .............................XXX        ",
+"        .............................XXX        ",
-"         ...........................XXXX        ",
+"         ...........................XXXX        ",
-"         ...........................XXX         ",
+"         ...........................XXX         ",
-"          .........................XXX          ",
+"          .........................XXX          ",
-"           .......................XXXX          ",
+"           .......................XXXX          ",
-"            X...................XXXXX           ",
+"            X...................XXXXX           ",
-"             X.................XXXXX            ",
+"             X.................XXXXX            ",
-"               X.............XXXXX              ",
+"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
+"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
+"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
+"                      XXXXX                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/info.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const info_xpm[] = {
+static const char *const info_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                     .....                      ",
+"                     .....                      ",
-"                   ..XXXXX..                    ",
+"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
+"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
+"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
+"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
+"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
+"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
+"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
+"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
+"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
+"                   .XXXXXo..                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                    @@@@@@@                     ",
+"                    @@@@@@@                     ",
-"                      ###                       ",
+"                      ###                       ",
-"                      $$$                       ",
+"                      $$$                       ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/question.xpm

@@ -1,75 +1,75 @@
-/* XPM */
+/* XPM */
-static const char *const question_xpm[] = {
+static const char *const question_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 21 1",
+"48 48 21 1",
-". c Black",
+". c Black",
-"> c #696969",
+"> c #696969",
-"O c #1F1F00",
+"O c #1F1F00",
-"+ c #181818",
+"+ c #181818",
-"o c #F6F900",
+"o c #F6F900",
-"; c #3F3F00",
+"; c #3F3F00",
-"$ c #111111",
+"$ c #111111",
-"  c None",
+"  c None",
-"& c #202020",
+"& c #202020",
-"X c #AAAA00",
+"X c #AAAA00",
-"@ c #949400",
+"@ c #949400",
-": c #303030",
+": c #303030",
-"1 c #383838",
+"1 c #383838",
-"% c #2A2A00",
+"% c #2A2A00",
-", c #404040",
+", c #404040",
-"= c #B4B400",
+"= c #B4B400",
-"- c #484848",
+"- c #484848",
-"# c #151500",
+"# c #151500",
-"< c #9F9F00",
+"< c #9F9F00",
-"2 c #6A6A00",
+"2 c #6A6A00",
-"* c #353500",
+"* c #353500",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .........                    ",
+"                   .........                    ",
-"                 ...XXXXXXX..                   ",
+"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
+"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
+"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
+"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
+"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
+"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
+"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
+"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
+"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
+"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
+"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
+"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
+"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
+"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
+"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
+"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
+"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
+"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
+"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
+"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
+"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
+"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
+"                  ...XXXXX..                    ",
-"                   ........                     ",
+"                   ........                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .......                      ",
+"                   .......                      ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                   .......                      ",
+"                   .......                      ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/gtk/warning.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const warning_xpm[] = {
+static const char *const warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"@ c Black",
+"@ c Black",
-"o c #A6A800",
+"o c #A6A800",
-"+ c #8A8C00",
+"+ c #8A8C00",
-"$ c #B8BA00",
+"$ c #B8BA00",
-"  c None",
+"  c None",
-"O c #6E7000",
+"O c #6E7000",
-"X c #DCDF00",
+"X c #DCDF00",
-". c #C00000",
+". c #C00000",
-"# c #373800",
+"# c #373800",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                      .                         ",
+"                      .                         ",
-"                     ...                        ",
+"                     ...                        ",
-"                     ...                        ",
+"                     ...                        ",
-"                    .....                       ",
+"                    .....                       ",
-"                   ...X..                       ",
+"                   ...X..                       ",
-"                   ..XXX..                      ",
+"                   ..XXX..                      ",
-"                  ...XXX...                     ",
+"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
+"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
+"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
+"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
+"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
+"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
+"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
+"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
+"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
+"       ..............................           ",
-"       ..............................           ",
+"       ..............................           ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/harddisk.xpm

@@ -1,60 +1,60 @@
-/* XPM */
+/* XPM */
-static const char *const harddisk_xpm[] = {
+static const char *const harddisk_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 39 1",
+"16 15 39 1",
-"7 c #E3E4E6",
+"7 c #E3E4E6",
-"4 c #FFFFFF",
+"4 c #FFFFFF",
-"5 c #839CB5",
+"5 c #839CB5",
-". c #547897",
+". c #547897",
-"1 c #4D7492",
+"1 c #4D7492",
-"@ c #376485",
+"@ c #376485",
-"o c #7A92A3",
+"o c #7A92A3",
-"u c #D1D9E5",
+"u c #D1D9E5",
-"y c #446A8C",
+"y c #446A8C",
-"i c #51B03D",
+"i c #51B03D",
-"> c #CAD2DC",
+"> c #CAD2DC",
-"O c #718BA7",
+"O c #718BA7",
-"2 c #65839D",
+"2 c #65839D",
-"6 c #DCE2EA",
+"6 c #DCE2EA",
-"0 c #C3C5C8",
+"0 c #C3C5C8",
-"9 c #F5F6F7",
+"9 c #F5F6F7",
-": c #EBEBEC",
+": c #EBEBEC",
-"< c #597B9A",
+"< c #597B9A",
-"t c #C6CCD3",
+"t c #C6CCD3",
-"  c None",
+"  c None",
-"* c #DFE0E2",
+"* c #DFE0E2",
-"e c #467291",
+"e c #467291",
-"a c #526E8B",
+"a c #526E8B",
-", c #7393AB",
+", c #7393AB",
-"p c #130A0B",
+"p c #130A0B",
-"# c #AABFCD",
+"# c #AABFCD",
-"r c #B4C4D3",
+"r c #B4C4D3",
-"; c #CFCFD0",
+"; c #CFCFD0",
-"X c #6F90A6",
+"X c #6F90A6",
-"+ c #6A89A2",
+"+ c #6A89A2",
-"- c #D2D3D4",
+"- c #D2D3D4",
-"= c #DCDBDA",
+"= c #DCDBDA",
-"w c #E4E9ED",
+"w c #E4E9ED",
-"q c #C6C8CA",
+"q c #C6C8CA",
-"% c #215579",
+"% c #215579",
-"$ c #E7E7E7",
+"$ c #E7E7E7",
-"3 c #7F97B0",
+"3 c #7F97B0",
-"8 c #C0D1DC",
+"8 c #C0D1DC",
-"& c #5D7C93",
+"& c #5D7C93",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-"   .XoooXO+@    ",
+"   .XoooXO+@    ",
-"  #$$%%%%$$$X   ",
+"  #$$%%%%$$$X   ",
-"  &$*==-;$$$&   ",
+"  &$*==-;$$$&   ",
-"  &:>+,<1234o5  ",
+"  &:>+,<1234o5  ",
-" ###+67;;78242  ",
+" ###+67;;78242  ",
-" &4,49*0q*9we4. ",
+" &4,49*0q*9we4. ",
-" &4+49*,,*9wo4. ",
+" &4+49*,,*9wo4. ",
-"&4%r,67;;782t%4.",
+"&4%r,67;;782t%4.",
-"&44468rrrr84444,",
+"&44468rrrr84444,",
-"y11111111111111e",
+"y11111111111111e",
-"1uu1:::::::::::1",
+"1uu1:::::::::::1",
-"1uu1::::::::ip:1",
+"1uu1::::::::ip:1",
-"auu&:::::::::::1",
+"auu&:::::::::::1",
-"1111111111111111"
+"1111111111111111"
-};
+};

art/helpicon.xpm

@@ -1,44 +1,44 @@
-/* XPM */
+/* XPM */
-static const char *const helpicon_xpm[] = {
+static const char *const helpicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"32 32 6 1",
+"32 32 6 1",
-"  c Gray0",
+"  c Gray0",
-". c Blue",
+". c Blue",
-"X c #808080808080",
+"X c #808080808080",
-"o c #c0c0c0c0c0c0",
+"o c #c0c0c0c0c0c0",
-"O c Gray100",
+"O c Gray100",
-"+ c None",
+"+ c None",
-/* pixels */
+/* pixels */
-"+++++++++++XXXXXXXX+++++++++++++",
+"+++++++++++XXXXXXXX+++++++++++++",
-"++++++++XXXoOOOOOOoXXX++++++++++",
+"++++++++XXXoOOOOOOoXXX++++++++++",
-"++++++XXoOOOOOOOOOOOOoXX++++++++",
+"++++++XXoOOOOOOOOOOOOoXX++++++++",
-"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
+"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
-"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
+"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
-"+++XOOOOOOOo......oOOOOOOO +++++",
+"+++XOOOOOOOo......oOOOOOOO +++++",
-"++XOOOOOOOo.oOO....oOOOOOOO ++++",
+"++XOOOOOOOo.oOO....oOOOOOOO ++++",
-"+XoOOOOOOO..OOOO....OOOOOOOo +++",
+"+XoOOOOOOO..OOOO....OOOOOOOo +++",
-"+XOOOOOOOO....OO....OOOOOOOO X++",
+"+XOOOOOOOO....OO....OOOOOOOO X++",
-"XoOOOOOOOO....Oo....OOOOOOOOo X+",
+"XoOOOOOOOO....Oo....OOOOOOOOo X+",
-"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
+"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
-"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
+"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
-"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
+"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
-"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
+"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
-"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
+"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
-"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
+"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
-"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
+"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
-"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
+"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
-"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
+"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
-"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
+"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
-"++++++  oOOOOOOOOOOOOo  XXXX++++",
+"++++++  oOOOOOOOOOOOOo  XXXX++++",
-"+++++++X   oOOOOOOo   XXXXX+++++",
+"+++++++X   oOOOOOOo   XXXXX+++++",
-"++++++++XXX   oOOO XXXXXXX++++++",
+"++++++++XXX   oOOO XXXXXXX++++++",
-"++++++++++XXXX OOO XXXXX++++++++",
+"++++++++++XXXX OOO XXXXX++++++++",
-"+++++++++++++X OOO XX+++++++++++",
+"+++++++++++++X OOO XX+++++++++++",
-"+++++++++++++++ OO XX+++++++++++",
+"+++++++++++++++ OO XX+++++++++++",
-"++++++++++++++++ O XX+++++++++++",
+"++++++++++++++++ O XX+++++++++++",
-"+++++++++++++++++  XX+++++++++++",
+"+++++++++++++++++  XX+++++++++++",
-"++++++++++++++++++XXX+++++++++++",
+"++++++++++++++++++XXX+++++++++++",
-"+++++++++++++++++++XX+++++++++++"
+"+++++++++++++++++++XX+++++++++++"
-};
+};

art/home.xpm

@@ -1,24 +1,24 @@
-/* XPM */
+/* XPM */
-static const char *const home_xpm[] = {
+static const char *const home_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 3 1",
+"16 15 3 1",
-". c Black",
+". c Black",
-"X c #FFFFFF",
+"X c #FFFFFF",
-"  c None",
+"  c None",
-/* pixels */
+/* pixels */
-"      ....      ",
+"      ....      ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"    .XXXXXX.    ",
+"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
+"   .XXXXXXXX.   ",
-"  .XXXXXXXXXX.  ",
+"  .XXXXXXXXXX.  ",
-" .............. ",
+" .............. ",
-" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
-" .XXXXXXXXXXXX. ",
+" .XXXXXXXXXXXX. ",
-" .X.....X....X. ",
+" .X.....X....X. ",
-" .X.   .X.  .X. ",
+" .X.   .X.  .X. ",
-" .X.   .X.  .X. ",
+" .X.   .X.  .X. ",
-" .X.....X.  .X. ",
+" .X.....X.  .X. ",
-" .XXXXXXX.  .X. ",
+" .XXXXXXX.  .X. ",
-" .........  ... "
+" .........  ... "
-};
+};

art/htmbook.xpm

@@ -1,25 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const htmbook_xpm[] = {
+static const char *const htmbook_xpm[] = {
-"16 16 6 1",
+"16 16 6 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c #000080",
+"X	c #000080",
-"o	c #c0c0c0",
+"o	c #c0c0c0",
-"O	c #808080",
+"O	c #808080",
-"+	c Gray100",
+"+	c Gray100",
-"                ",
+"                ",
-"       ..       ",
+"       ..       ",
-"     ..XX.      ",
+"     ..XX.      ",
-"   ..XXXXX.     ",
+"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
+" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
+".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
+".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
+".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
+".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
+".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
+" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
+"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
+"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
+"    .XX.o+o..   ",
-"     .X.o..     ",
+"     .X.o..     ",
-"      ...       "};
+"      ...       "};

art/htmfoldr.xpm

@@ -1,25 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const htmfoldr_xpm[] = {
+static const char *const htmfoldr_xpm[] = {
-"16 16 6 1",
+"16 16 6 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c #000080",
+"X	c #000080",
-"o	c #c0c0c0",
+"o	c #c0c0c0",
-"O	c #808080",
+"O	c #808080",
-"+	c Gray100",
+"+	c Gray100",
-"                ",
+"                ",
-"       ..       ",
+"       ..       ",
-"     ..XX.      ",
+"     ..XX.      ",
-"   ..XXXXX.     ",
+"   ..XXXXX.     ",
-" ..XXXXXXXX.    ",
+" ..XXXXXXXX.    ",
-".oXXXXXXXXXX.   ",
+".oXXXXXXXXXX.   ",
-".XoXXXXXXXXXX.  ",
+".XoXXXXXXXXXX.  ",
-".XXoXXXXXXXXXX. ",
+".XXoXXXXXXXXXX. ",
-".XXXoXXXXXXXXX..",
+".XXXoXXXXXXXXX..",
-".XXXXoXXXXXX..O ",
+".XXXXoXXXXXX..O ",
-" .XXXXoXXX..O+O ",
+" .XXXXoXXX..O+O ",
-"  .XXXXo..O++o..",
+"  .XXXXo..O++o..",
-"   .XXX.O+++o.. ",
+"   .XXX.O+++o.. ",
-"    .XX.o+o..   ",
+"    .XX.o+o..   ",
-"     .X.o..     ",
+"     .X.o..     ",
-"      ...       "};
+"      ...       "};

art/htmoptns.xpm

@@ -1,20 +1,20 @@
-/* XPM */
+/* XPM */
-static const char *const htmoptns_xpm[] = {
+static const char *const htmoptns_xpm[] = {
-"16 15 2 1",
+"16 15 2 1",
-" 	c None",
+" 	c None",
-".	c #000000",
+".	c #000000",
-"                ",
+"                ",
-"      ..        ",
+"      ..        ",
-"      ...       ",
+"      ...       ",
-"     ....       ",
+"     ....       ",
-"     . ...      ",
+"     . ...      ",
-"    .. ...      ",
+"    .. ...      ",
-"    .   ..      ",
+"    .   ..      ",
-"   ..   ...     ",
+"   ..   ...     ",
-"   .     ..     ",
+"   .     ..     ",
-"   .........    ",
+"   .........    ",
-"  ..     ...    ",
+"  ..     ...    ",
-"  .       ...   ",
+"  .       ...   ",
-" ..       ...   ",
+" ..       ...   ",
-" ....   ....... ",
+" ....   ....... ",
-"                "};
+"                "};

art/htmpage.xpm

@@ -1,23 +1,23 @@
-/* XPM */
+/* XPM */
-static const char *const htmpage_xpm[] = {
+static const char *const htmpage_xpm[] = {
-"16 16 4 1",
+"16 16 4 1",
-" 	c None",
+" 	c None",
-".	c #808080",
+".	c #808080",
-"X	c Gray100",
+"X	c Gray100",
-"o	c Black",
+"o	c Black",
-"                ",
+"                ",
-"  ..........    ",
+"  ..........    ",
-"  .XXXXXXXX..   ",
+"  .XXXXXXXX..   ",
-"  .XXXXXXXXooo  ",
+"  .XXXXXXXXooo  ",
-"  .X......XXXo  ",
+"  .X......XXXo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .X........Xo  ",
+"  .X........Xo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  .XXXXXXXXXXo  ",
+"  .XXXXXXXXXXo  ",
-"  oooooooooooo  "};
+"  oooooooooooo  "};

art/htmsidep.xpm

@@ -1,27 +1,27 @@
-/* XPM */
+/* XPM */
-static const char *const htmsidep_xpm[] = {
+static const char *const htmsidep_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 6 1",
+"16 15 6 1",
-". c Black",
+". c Black",
-"X c #FFFFFF",
+"X c #FFFFFF",
-"+ c #808080",
+"+ c #808080",
-"  c None",
+"  c None",
-"O c #0000C0",
+"O c #0000C0",
-"o c #C0C0C0",
+"o c #C0C0C0",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-" .............. ",
+" .............. ",
-" .XXXX.ooooooo. ",
+" .XXXX.ooooooo. ",
-" .XOXX.oo...oo. ",
+" .XOXX.oo...oo. ",
-" .XXOX.ooooooo. ",
+" .XXOX.ooooooo. ",
-" .OOOO.o...+.o. ",
+" .OOOO.o...+.o. ",
-" .XXOX.ooooooo. ",
+" .XXOX.ooooooo. ",
-" .XOXX.ooooooo. ",
+" .XOXX.ooooooo. ",
-" .XXXX.o..+ooo. ",
+" .XXXX.o..+ooo. ",
-" .XXOX.ooooooo. ",
+" .XXOX.ooooooo. ",
-" .XOXX.o...+.o. ",
+" .XOXX.o...+.o. ",
-" .OOOO.ooooooo. ",
+" .OOOO.ooooooo. ",
-" .XOXX.o.+...o. ",
+" .XOXX.o.+...o. ",
-" .XXOX.ooooooo. ",
+" .XXOX.ooooooo. ",
-" .............. "
+" .............. "
-};
+};

art/listview.xpm

@@ -1,25 +1,25 @@
-/* XPM */
+/* XPM */
-static const char *const listview_xpm[] = {
+static const char *const listview_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 4 1",
+"16 15 4 1",
-"  c Black",
+"  c Black",
-". c #FFFFFF",
+". c #FFFFFF",
-"X c #000084",
+"X c #000084",
-"o c #848484",
+"o c #848484",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-" .............. ",
+" .............. ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .XXX.  o   o . ",
+" .XXX.  o   o . ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .............. ",
+" .............. ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .XXX.   o    . ",
+" .XXX.   o    . ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .............. ",
+" .............. ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .XXX. o    o . ",
+" .XXX. o    o . ",
-" .XXX.......... ",
+" .XXX.......... ",
-" .............. ",
+" .............. ",
-"                "
+"                "
-};
+};

art/missimg.xpm

@@ -1,43 +1,43 @@
-/* XPM */
+/* XPM */
-static const char *const missimg_xpm[] = {
+static const char *const missimg_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"32 32 5 1",
+"32 32 5 1",
-"X c Black",
+"X c Black",
-"o c #FFFFFF",
+"o c #FFFFFF",
-"  c None",
+"  c None",
-". c #C0C0C0",
+". c #C0C0C0",
-"O c #E0E0E0",
+"O c #E0E0E0",
-/* pixels */
+/* pixels */
-" .............................X ",
+" .............................X ",
-" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
-" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
+" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
-"    XXXXX    XOOOOOOOOOOOOOOooX ",
+"    XXXXX    XOOOOOOOOOOOOOOooX ",
-"              XOOOXXXOOOOOOOooX ",
+"              XOOOXXXOOOOOOOooX ",
-"               XXX   XXOOOOOooX ",
+"               XXX   XXOOOOOooX ",
-"                       XOOOOooX ",
+"                       XOOOOooX ",
-" .                      XOOOooX ",
+" .                      XOOOooX ",
-" ..                      XXOooX ",
+" ..                      XXOooX ",
-" .o..                      XooX ",
+" .o..                      XooX ",
-" .ooO...                    XXX ",
+" .ooO...                    XXX ",
-" .ooOOOO..........              ",
+" .ooOOOO..........              ",
-" .ooOOOOOOOOOOOOOO..            ",
+" .ooOOOOOOOOOOOOOO..            ",
-" .ooOOOOOOOOOOOOOOOO..          ",
+" .ooOOOOOOOOOOOOOOOO..          ",
-" .ooOOOOOOOOOOOOOOOOOO......... ",
+" .ooOOOOOOOOOOOOOOOOOO......... ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
+" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
-" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
-" .ooooooooooooooooooooooooooooX ",
+" .ooooooooooooooooooooooooooooX ",
-" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
+" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
-};
+};

art/motif/error.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const error_xpm[] = {
+static const char *const error_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 4 1",
+"48 48 4 1",
-"  c None",
+"  c None",
-"X c #242424",
+"X c #242424",
-"o c #DCDF00",
+"o c #DCDF00",
-". c #C00000",
+". c #C00000",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                    .....                       ",
+"                    .....                       ",
-"                .............                   ",
+"                .............                   ",
-"              .................                 ",
+"              .................                 ",
-"             ...................                ",
+"             ...................                ",
-"           .......................              ",
+"           .......................              ",
-"          .........................             ",
+"          .........................             ",
-"         ...........................            ",
+"         ...........................            ",
-"         ...........................X           ",
+"         ...........................X           ",
-"        .............................X          ",
+"        .............................X          ",
-"       ...............................          ",
+"       ...............................          ",
-"       ...............................X         ",
+"       ...............................X         ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................X        ",
+"      .................................X        ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      ...ooooooooooooooooooooooooooo...XX       ",
+"      ...ooooooooooooooooooooooooooo...XX       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....X       ",
+"     ....ooooooooooooooooooooooooooo....X       ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"     ....ooooooooooooooooooooooooooo....XX      ",
+"     ....ooooooooooooooooooooooooooo....XX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      ...ooooooooooooooooooooooooooo...XXX      ",
+"      ...ooooooooooooooooooooooooooo...XXX      ",
-"      .................................XX       ",
+"      .................................XX       ",
-"      .................................XX       ",
+"      .................................XX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"       ...............................XXX       ",
+"       ...............................XXX       ",
-"        .............................XXX        ",
+"        .............................XXX        ",
-"         ...........................XXXX        ",
+"         ...........................XXXX        ",
-"         ...........................XXX         ",
+"         ...........................XXX         ",
-"          .........................XXX          ",
+"          .........................XXX          ",
-"           .......................XXXX          ",
+"           .......................XXXX          ",
-"            X...................XXXXX           ",
+"            X...................XXXXX           ",
-"             X.................XXXXX            ",
+"             X.................XXXXX            ",
-"               X.............XXXXX              ",
+"               X.............XXXXX              ",
-"                XXXX.....XXXXXXXX               ",
+"                XXXX.....XXXXXXXX               ",
-"                  XXXXXXXXXXXXX                 ",
+"                  XXXXXXXXXXXXX                 ",
-"                      XXXXX                     ",
+"                      XXXXX                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/info.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const info_xpm[] = {
+static const char *const info_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                     .....                      ",
+"                     .....                      ",
-"                   ..XXXXX..                    ",
+"                   ..XXXXX..                    ",
-"                 ..XXXXXXXXo..                  ",
+"                 ..XXXXXXXXo..                  ",
-"                .XXXOXXXXXXXoo.                 ",
+"                .XXXOXXXXXXXoo.                 ",
-"                .XOOXXX+XXXXXo.                 ",
+"                .XOOXXX+XXXXXo.                 ",
-"               .XOOOXX+++XXXXoo.                ",
+"               .XOOOXX+++XXXXoo.                ",
-"               .XOOXXX+++XXXXXo.                ",
+"               .XOOXXX+++XXXXXo.                ",
-"              .XOOOXXX+++XXXXXXo.               ",
+"              .XOOOXXX+++XXXXXXo.               ",
-"              .XOOXXXX+++XXXXXXo.               ",
+"              .XOOXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXXX.               ",
+"              .XXXXXXX+++XXXXXXX.               ",
-"              .XXXXXXX+++XXXXXXo.               ",
+"              .XXXXXXX+++XXXXXXo.               ",
-"              .XXXXXXX+++XXXXXoo.               ",
+"              .XXXXXXX+++XXXXXoo.               ",
-"               .XXXXXX+++XXXXXo.                ",
+"               .XXXXXX+++XXXXXo.                ",
-"               .XXXXXXX+XXXXXXo.                ",
+"               .XXXXXXX+XXXXXXo.                ",
-"                .XXXXXXXXXXXXo.                 ",
+"                .XXXXXXXXXXXXo.                 ",
-"                .XXXXX+++XXXoo.                 ",
+"                .XXXXX+++XXXoo.                 ",
-"                 .XXXX+++XXoo.                  ",
+"                 .XXXX+++XXoo.                  ",
-"                  .XXXXXXXXo.                   ",
+"                  .XXXXXXXXo.                   ",
-"                  ..XXXXXXo..                   ",
+"                  ..XXXXXXo..                   ",
-"                   .XXXXXo..                    ",
+"                   .XXXXXo..                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                   @@@@@@@@@                    ",
+"                   @@@@@@@@@                    ",
-"                   @#######@                    ",
+"                   @#######@                    ",
-"                    @@@@@@@                     ",
+"                    @@@@@@@                     ",
-"                      ###                       ",
+"                      ###                       ",
-"                      $$$                       ",
+"                      $$$                       ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/question.xpm

@@ -1,75 +1,75 @@
-/* XPM */
+/* XPM */
-static const char *const question_xpm[] = {
+static const char *const question_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 21 1",
+"48 48 21 1",
-". c Black",
+". c Black",
-"> c #696969",
+"> c #696969",
-"O c #1F1F00",
+"O c #1F1F00",
-"+ c #181818",
+"+ c #181818",
-"o c #F6F900",
+"o c #F6F900",
-"; c #3F3F00",
+"; c #3F3F00",
-"$ c #111111",
+"$ c #111111",
-"  c None",
+"  c None",
-"& c #202020",
+"& c #202020",
-"X c #AAAA00",
+"X c #AAAA00",
-"@ c #949400",
+"@ c #949400",
-": c #303030",
+": c #303030",
-"1 c #383838",
+"1 c #383838",
-"% c #2A2A00",
+"% c #2A2A00",
-", c #404040",
+", c #404040",
-"= c #B4B400",
+"= c #B4B400",
-"- c #484848",
+"- c #484848",
-"# c #151500",
+"# c #151500",
-"< c #9F9F00",
+"< c #9F9F00",
-"2 c #6A6A00",
+"2 c #6A6A00",
-"* c #353500",
+"* c #353500",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .........                    ",
+"                   .........                    ",
-"                 ...XXXXXXX..                   ",
+"                 ...XXXXXXX..                   ",
-"               ..XXXXoooooXXXO+                 ",
+"               ..XXXXoooooXXXO+                 ",
-"             ..XXooooooooooooX@..               ",
+"             ..XXooooooooooooX@..               ",
-"            ..XoooooooooooooooXX#.              ",
+"            ..XoooooooooooooooXX#.              ",
-"           $%XoooooooooooooooooXX#.             ",
+"           $%XoooooooooooooooooXX#.             ",
-"          &.XoooooooXXXXXXooooooXX..            ",
+"          &.XoooooooXXXXXXooooooXX..            ",
-"          .XooooooXX.$...$XXoooooX*.            ",
+"          .XooooooXX.$...$XXoooooX*.            ",
-"         $.XoooooX%.$     .*oooooo=..           ",
+"         $.XoooooX%.$     .*oooooo=..           ",
-"         .XooooooX..      -.XoooooX..           ",
+"         .XooooooX..      -.XoooooX..           ",
-"         .XoooooX..+       .XoooooX;.           ",
+"         .XoooooX..+       .XoooooX;.           ",
-"         ...XXXX..:        .XoooooX;.           ",
+"         ...XXXX..:        .XoooooX;.           ",
-"          ........        >.XoooooX;.           ",
+"          ........        >.XoooooX;.           ",
-"                          +.XoooooX..           ",
+"                          +.XoooooX..           ",
-"                         ,.Xoooooo<..           ",
+"                         ,.Xoooooo<..           ",
-"                        1#XooooooXO..           ",
+"                        1#XooooooXO..           ",
-"                       &#XooooooX2..            ",
+"                       &#XooooooX2..            ",
-"                      $%XooooooXX..             ",
+"                      $%XooooooXX..             ",
-"                     $%XooooooXX..              ",
+"                     $%XooooooXX..              ",
-"                    $%XooooooXX..               ",
+"                    $%XooooooXX..               ",
-"                   &.XooooooXX..                ",
+"                   &.XooooooXX..                ",
-"                   .XooooooXX..                 ",
+"                   .XooooooXX..                 ",
-"                  &.XoooooXX..                  ",
+"                  &.XoooooXX..                  ",
-"                  ..XooooXX..                   ",
+"                  ..XooooXX..                   ",
-"                  ..XooooX...                   ",
+"                  ..XooooX...                   ",
-"                  ..XXooXX..&                   ",
+"                  ..XXooXX..&                   ",
-"                  ...XXXXX..                    ",
+"                  ...XXXXX..                    ",
-"                   ........                     ",
+"                   ........                     ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                   .......                      ",
+"                   .......                      ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XoooooX..                    ",
+"                 ..XoooooX..                    ",
-"                 ..XXoooXX..                    ",
+"                 ..XXoooXX..                    ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                   .......                      ",
+"                   .......                      ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/motif/warning.xpm

@@ -1,63 +1,63 @@
-/* XPM */
+/* XPM */
-static const char *const warning_xpm[] = {
+static const char *const warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"48 48 9 1",
+"48 48 9 1",
-"@ c Black",
+"@ c Black",
-"o c #A6A800",
+"o c #A6A800",
-"+ c #8A8C00",
+"+ c #8A8C00",
-"$ c #B8BA00",
+"$ c #B8BA00",
-"  c None",
+"  c None",
-"O c #6E7000",
+"O c #6E7000",
-"X c #DCDF00",
+"X c #DCDF00",
-". c #C00000",
+". c #C00000",
-"# c #373800",
+"# c #373800",
-/* pixels */
+/* pixels */
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                      .                         ",
+"                      .                         ",
-"                     ...                        ",
+"                     ...                        ",
-"                     ...                        ",
+"                     ...                        ",
-"                    .....                       ",
+"                    .....                       ",
-"                   ...X..                       ",
+"                   ...X..                       ",
-"                   ..XXX..                      ",
+"                   ..XXX..                      ",
-"                  ...XXX...                     ",
+"                  ...XXX...                     ",
-"                  ..XXXXX..                     ",
+"                  ..XXXXX..                     ",
-"                 ..XXXXXX...                    ",
+"                 ..XXXXXX...                    ",
-"                ...XXoO+XX..                    ",
+"                ...XXoO+XX..                    ",
-"                ..XXXO@#XXX..                   ",
+"                ..XXXO@#XXX..                   ",
-"               ..XXXXO@#XXX...                  ",
+"               ..XXXXO@#XXX...                  ",
-"              ...XXXXO@#XXXX..                  ",
+"              ...XXXXO@#XXXX..                  ",
-"              ..XXXXXO@#XXXX...                 ",
+"              ..XXXXXO@#XXXX...                 ",
-"             ...XXXXXo@OXXXXX..                 ",
+"             ...XXXXXo@OXXXXX..                 ",
-"            ...XXXXXXo@OXXXXXX..                ",
+"            ...XXXXXXo@OXXXXXX..                ",
-"            ..XXXXXXX$@OXXXXXX...               ",
+"            ..XXXXXXX$@OXXXXXX...               ",
-"           ...XXXXXXXX@XXXXXXXX..               ",
+"           ...XXXXXXXX@XXXXXXXX..               ",
-"          ...XXXXXXXXXXXXXXXXXX...              ",
+"          ...XXXXXXXXXXXXXXXXXX...              ",
-"          ..XXXXXXXXXXOXXXXXXXXX..              ",
+"          ..XXXXXXXXXXOXXXXXXXXX..              ",
-"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
+"         ...XXXXXXXXXO@#XXXXXXXXX..             ",
-"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
+"         ..XXXXXXXXXXX#XXXXXXXXXX...            ",
-"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
+"        ...XXXXXXXXXXXXXXXXXXXXXXX..            ",
-"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
+"       ...XXXXXXXXXXXXXXXXXXXXXXXX...           ",
-"       ..............................           ",
+"       ..............................           ",
-"       ..............................           ",
+"       ..............................           ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                ",
+"                                                ",
-"                                                "
+"                                                "
-};
+};

art/new.xpm

@@ -1,50 +1,50 @@
-/* XPM */
+/* XPM */
-static const char *const new_xpm[] = {
+static const char *const new_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 29 1",
+"16 15 29 1",
-"* c #97C4E7",
+"* c #97C4E7",
-"- c #72A8D2",
+"- c #72A8D2",
-": c #FFFFFF",
+": c #FFFFFF",
-"9 c #839CB5",
+"9 c #839CB5",
-"o c #6B98B8",
+"o c #6B98B8",
-"X c #5A89A6",
+"X c #5A89A6",
-"# c #3A749C",
+"# c #3A749C",
-", c #D1E5F5",
+", c #D1E5F5",
-"0 c #85A7BC",
+"0 c #85A7BC",
-"$ c #C3DDF1",
+"$ c #C3DDF1",
-"8 c #749BB4",
+"8 c #749BB4",
-"; c #5F9BC8",
+"; c #5F9BC8",
-"  c None",
+"  c None",
-"+ c #538DB3",
+"+ c #538DB3",
-"= c #85BBE2",
+"= c #85BBE2",
-"3 c #EFF6FC",
+"3 c #EFF6FC",
-"O c #6591AE",
+"O c #6591AE",
-"5 c #F7FBFD",
+"5 c #F7FBFD",
-"7 c #FAFCFE",
+"7 c #FAFCFE",
-"< c #DAEAF7",
+"< c #DAEAF7",
-"4 c #E9F3FA",
+"4 c #E9F3FA",
-"6 c #FDFDFE",
+"6 c #FDFDFE",
-"1 c #E2EFF8",
+"1 c #E2EFF8",
-". c #8EA9BC",
+". c #8EA9BC",
-"% c #B6D5EE",
+"% c #B6D5EE",
-"& c #A5CCEA",
+"& c #A5CCEA",
-"> c #ACE95B",
+"> c #ACE95B",
-"2 c #F4F9FD",
+"2 c #F4F9FD",
-"@ c #4581AA",
+"@ c #4581AA",
-/* pixels */
+/* pixels */
-"   .XoOO+@#.    ",
+"   .XoOO+@#.    ",
-"   .$$%&*=O-;   ",
+"   .$$%&*=O-;   ",
-"  @@@@$%&*O:*o  ",
+"  @@@@$%&*O:*o  ",
-"  @>>@$$%&O::*o ",
+"  @>>@$$%&O::*o ",
-"@@@>>@@@$%OOoO+ ",
+"@@@>>@@@$%OOoO+ ",
-"@>>>>>>@,$%&*=+ ",
+"@>>>>>>@,$%&*=+ ",
-"@>>>>>>@<,$%&*+ ",
+"@>>>>>>@<,$%&*+ ",
-"@@@>>@@@1<,$%&O ",
+"@@@>>@@@1<,$%&O ",
-"  @>>@2341<,$%O ",
+"  @>>@2341<,$%O ",
-"  @@@@52341<,$o ",
+"  @@@@52341<,$o ",
-"   .:6752341<,8 ",
+"   .:6752341<,8 ",
-"   .::6752341<8 ",
+"   .::6752341<8 ",
-"   .:::67523419 ",
+"   .:::67523419 ",
-"   .::::6752340 ",
+"   .::::6752340 ",
-"   ............ "
+"   ............ "
-};
+};

art/new_dir.xpm

@@ -1,43 +1,43 @@
-/* XPM */
+/* XPM */
-static const char *const new_dir_xpm[] = {
+static const char *const new_dir_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 22 1",
+"16 15 22 1",
-"X c Black",
+"X c Black",
-"> c #9BACC2",
+"> c #9BACC2",
-"o c #547897",
+"o c #547897",
-"1 c #7F99B4",
+"1 c #7F99B4",
-"O c #D1D9E5",
+"O c #D1D9E5",
-"< c #EAEDF3",
+"< c #EAEDF3",
-"# c #CAD2DC",
+"# c #CAD2DC",
-"3 c #718BA7",
+"3 c #718BA7",
-"@ c #BECAD9",
+"@ c #BECAD9",
-"& c #E1E6EE",
+"& c #E1E6EE",
-"; c #F5F6F7",
+"; c #F5F6F7",
-". c #FFFF00",
+". c #FFFF00",
-", c #8DA0B9",
+", c #8DA0B9",
-"  c None",
+"  c None",
-"% c #D6DFE7",
+"% c #D6DFE7",
-"$ c #D2D9E0",
+"$ c #D2D9E0",
-"- c #ADBACE",
+"- c #ADBACE",
-"= c #EEF1F3",
+"= c #EEF1F3",
-"+ c #B3BFD1",
+"+ c #B3BFD1",
-"2 c #7A90AC",
+"2 c #7A90AC",
-": c #A2B3C5",
+": c #A2B3C5",
-"* c #E5EAF1",
+"* c #E5EAF1",
-/* pixels */
+/* pixels */
-"         .X .XX.",
+"         .X .XX.",
-" ooooo    .X.X. ",
+" ooooo    .X.X. ",
-" oOOOOo  XX...XX",
+" oOOOOo  XX...XX",
-" oooooooo.......",
+" oooooooo.......",
-" o+@#$%&*XX...XX",
+" o+@#$%&*XX...XX",
-" o+@#$%&*=.X.X. ",
+" o+@#$%&*=.X.X. ",
-" o-+@#O%&.X;.X .",
+" o-+@#O%&.X;.X .",
-" o:-+@#O%&*=;o  ",
+" o:-+@#O%&*=;o  ",
-" o>:-+@#O%&*=o  ",
+" o>:-+@#O%&*=o  ",
-" o,>:-+@#O%&<o  ",
+" o,>:-+@#O%&<o  ",
-" o1,>:-+@#O%&o  ",
+" o1,>:-+@#O%&o  ",
-" o21,>:-+@#O%o  ",
+" o21,>:-+@#O%o  ",
-" o321,>:-+@#Oo  ",
+" o321,>:-+@#Oo  ",
-" ooooooooooooo  ",
+" ooooooooooooo  ",
-"                "
+"                "
-};
+};

art/osx/README

@@ -0,0 +1,2 @@
+The files in this directory are the sources which were converted by
+misc/scripts/png2c.py and included in src/osx/carbon/renderer.cpp.

art/paste.xpm

@@ -1,46 +1,46 @@
-/* XPM */
+/* XPM */
-static const char *const paste_xpm[] = {
+static const char *const paste_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 25 1",
+"16 15 25 1",
-"< c #FEECE4",
+"< c #FEECE4",
-"> c #FEE3D7",
+"> c #FEE3D7",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"o c #7B767D",
+"o c #7B767D",
-"% c #F79586",
+"% c #F79586",
-"& c #CAE1F3",
+"& c #CAE1F3",
-"@ c #F08B62",
+"@ c #F08B62",
-"# c #FCCBB8",
+"# c #FCCBB8",
-"- c #FDD8C9",
+"- c #FDD8C9",
-"4 c #FFF8F4",
+"4 c #FFF8F4",
-"5 c #FFF5F0",
+"5 c #FFF5F0",
-"  c None",
+"  c None",
-"$ c #F8AA8F",
+"$ c #F8AA8F",
-", c #EFF6FC",
+", c #EFF6FC",
-"1 c #F7FBFD",
+"1 c #F7FBFD",
-"2 c #FAFCFE",
+"2 c #FAFCFE",
-"; c #DAEAF7",
+"; c #DAEAF7",
-": c #E9F3FA",
+": c #E9F3FA",
-"6 c #FFFAF8",
+"6 c #FFFAF8",
-". c #3C78A6",
+". c #3C78A6",
-"3 c #FFF1ED",
+"3 c #FFF1ED",
-"X c #9B8687",
+"X c #9B8687",
-"+ c #FBBCA4",
+"+ c #FBBCA4",
-"* c #B6D5EE",
+"* c #B6D5EE",
-"= c #F4F9FD",
+"= c #F4F9FD",
-/* pixels */
+/* pixels */
-"   ......       ",
+"   ......       ",
-" .XoOOOOoo.     ",
+" .XoOOOOoo.     ",
-".+XOOOOOOX@.    ",
+".+XOOOOOOX@.    ",
-".+XXXXXXXX@.    ",
+".+XXXXXXXX@.    ",
-".#++$$%@.....   ",
+".#++$$%@.....   ",
-".##++$$%.&*.=.  ",
+".##++$$%.&*.=.  ",
-".-##++$$.;&.==. ",
+".-##++$$.;&.==. ",
-".--##++$.:;.... ",
+".--##++$.:;.... ",
-".>--##++.,:;&*. ",
+".>--##++.,:;&*. ",
-".<>--##+.1,:;&. ",
+".<>--##+.1,:;&. ",
-".<<>--##.21,:;. ",
+".<<>--##.21,:;. ",
-".3<<>--#.O21=:. ",
+".3<<>--#.O21=:. ",
-".45<<>--....... ",
+".45<<>--....... ",
-".6453<>----.    ",
+".6453<>----.    ",
-"............    "
+"............    "
-};
+};

art/print.xpm

@@ -1,60 +1,60 @@
-/* XPM */
+/* XPM */
-static const char *const print_xpm[] = {
+static const char *const print_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 39 1",
+"16 15 39 1",
-"< c #E3E4E6",
+"< c #E3E4E6",
-"+ c #C3C3C4",
+"+ c #C3C3C4",
-"i c #FFFFFF",
+"i c #FFFFFF",
-": c #74879B",
+": c #74879B",
-"# c #5A89A6",
+"# c #5A89A6",
-"a c #F1F4F7",
+"a c #F1F4F7",
-"r c #5A809C",
+"r c #5A809C",
-"@ c #BDCCD9",
+"@ c #BDCCD9",
-"e c #7A92A4",
+"e c #7A92A4",
-"% c #3F6F93",
+"% c #3F6F93",
-"t c #9FA2A6",
+"t c #9FA2A6",
-"3 c #939495",
+"3 c #939495",
-"w c #5F666D",
+"w c #5F666D",
-"9 c #65839E",
+"9 c #65839E",
-"5 c #4A7291",
+"5 c #4A7291",
-"$ c #4B7F9E",
+"$ c #4B7F9E",
-"  c None",
+"  c None",
-"O c #DFE0E2",
+"O c #DFE0E2",
-"o c #F3F3F3",
+"o c #F3F3F3",
-"; c #84A5BB",
+"; c #84A5BB",
-"& c #467291",
+"& c #467291",
-". c #7897AD",
+". c #7897AD",
-"* c #407598",
+"* c #407598",
-"4 c #CFCFD0",
+"4 c #CFCFD0",
-"7 c #6F90A6",
+"7 c #6F90A6",
-"y c #6A89A2",
+"y c #6A89A2",
-"0 c #AAADB2",
+"0 c #AAADB2",
-"1 c #D2D3D4",
+"1 c #D2D3D4",
-"u c #4F7592",
+"u c #4F7592",
-", c #BCBDBE",
+", c #BCBDBE",
-"p c #57778E",
+"p c #57778E",
-"q c #979BA0",
+"q c #979BA0",
-"2 c #ABABAC",
+"2 c #ABABAC",
-"- c #E7E7E7",
+"- c #E7E7E7",
-"= c #D6DEE6",
+"= c #D6DEE6",
-"> c #9FA0A0",
+"> c #9FA0A0",
-"8 c #829EB5",
+"8 c #829EB5",
-"X c #8FB0C3",
+"X c #8FB0C3",
-"6 c #5D7C93",
+"6 c #5D7C93",
-/* pixels */
+/* pixels */
-"   .XXXXXXXX    ",
+"   .XXXXXXXX    ",
-"   .oooooooX    ",
+"   .oooooooX    ",
-"   .OOOOOOOX    ",
+"   .OOOOOOOX    ",
-"   .+++++++X    ",
+"   .+++++++X    ",
-"@##$%&&&&&%*##@ ",
+"@##$%&&&&&%*##@ ",
-"$=-;:>,<123$-=$ ",
+"$=-;:>,<123$-=$ ",
-".44.5678.96$44. ",
+".44.5678.96$44. ",
-"7,,,,,,,,,,,,,7 ",
+"7,,,,,,,,,,,,,7 ",
-"900qwwwwwwwe009 ",
+"900qwwwwwwwe009 ",
-"rtt9ryyyyyyuttr ",
+"rtt9ryyyyyyuttr ",
-"6qq6iiiiiii%qq6 ",
+"6qq6iiiiiii%qq6 ",
-"633paiiiiii%336 ",
+"633paiiiiii%336 ",
-"XXX*iiiiiii%XXX ",
+"XXX*iiiiiii%XXX ",
-"   6iiiiiii%    ",
+"   6iiiiiii%    ",
-"   $XXXXXXX#    "
+"   $XXXXXXX#    "
-};
+};

art/quit.xpm

@@ -1,90 +1,90 @@
-/* XPM */
+/* XPM */
-static const char *const quit_xpm[] = {
+static const char *const quit_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 69 1",
+"16 15 69 1",
-"@ c Black",
+"@ c Black",
-"i c #9AEA53",
+"i c #9AEA53",
-"D c #7E9BB1",
+"D c #7E9BB1",
-"H c #839FB4",
+"H c #839FB4",
-", c #B7C7D3",
+", c #B7C7D3",
-"8 c #BCCBD6",
+"8 c #BCCBD6",
-"7 c #C1CFDA",
+"7 c #C1CFDA",
-"v c #92ABBD",
+"v c #92ABBD",
-"- c #D0DBE2",
+"- c #D0DBE2",
-"O c #547897",
+"O c #547897",
-"+ c #376485",
+"+ c #376485",
-"L c #7090A8",
+"L c #7090A8",
-"t c #AEC0CE",
+"t c #AEC0CE",
-"g c #B3C4D1",
+"g c #B3C4D1",
-"S c #84A0B4",
+"S c #84A0B4",
-"G c #89A4B8",
+"G c #89A4B8",
-"> c #BDCCD7",
+"> c #BDCCD7",
-"F c #5A809C",
+"F c #5A809C",
-"2 c #C2D0DA",
+"2 c #C2D0DA",
-"k c #93ACBE",
+"k c #93ACBE",
-"= c #D6E0E6",
+"= c #D6E0E6",
-"* c #446A8C",
+"* c #446A8C",
-"z c #A5B9C8",
+"z c #A5B9C8",
-"# c #DEE5EB",
+"# c #DEE5EB",
-"0 c #AFC1CE",
+"0 c #AFC1CE",
-"r c #B4C5D2",
+"r c #B4C5D2",
-"p c #B9C9D5",
+"p c #B9C9D5",
-"A c #8AA5B8",
+"A c #8AA5B8",
-"M c #92AABD",
+"M c #92AABD",
-"j c #A6BAC9",
+"j c #A6BAC9",
-"K c #7796AC",
+"K c #7796AC",
-"l c #ABBECC",
+"l c #ABBECC",
-"o c #E4EAEF",
+"o c #E4EAEF",
-"9 c #B5C6D2",
+"9 c #B5C6D2",
-"  c None",
+"  c None",
-"; c #C9D6DF",
+"; c #C9D6DF",
-"X c #305F81",
+"X c #305F81",
-"m c #98AFC0",
+"m c #98AFC0",
-"V c #9DB3C3",
+"V c #9DB3C3",
-"% c #D1DBE3",
+"% c #D1DBE3",
-"u c #A2B7C6",
+"u c #A2B7C6",
-"y c #A7BBCA",
+"y c #A7BBCA",
-"h c #ACBFCD",
+"h c #ACBFCD",
-"4 c #B6C7D3",
+"4 c #B6C7D3",
-"w c #C0CFD9",
+"w c #C0CFD9",
-"d c #982106",
+"d c #982106",
-"B c #85A0B5",
+"B c #85A0B5",
-"6 c #C8D4DE",
+"6 c #C8D4DE",
-"c c #99B0C1",
+"c c #99B0C1",
-"x c #9EB4C4",
+"x c #9EB4C4",
-"$ c #D7E0E7",
+"$ c #D7E0E7",
-"q c #A8BCCA",
+"q c #A8BCCA",
-"s c #ADC0CD",
+"s c #ADC0CD",
-"3 c #BCCCD7",
+"3 c #BCCCD7",
-"N c #8BA5B9",
+"N c #8BA5B9",
-": c #C4D1DB",
+": c #C4D1DB",
-"1 c #C9D5DE",
+"1 c #C9D5DE",
-"f c #9AB1C2",
+"f c #9AB1C2",
-"n c #A4B9C8",
+"n c #A4B9C8",
-"a c #B3C5D1",
+"a c #B3C5D1",
-". c #215579",
+". c #215579",
-"J c #7D9AB0",
+"J c #7D9AB0",
-"& c #829EB5",
+"& c #829EB5",
-"e c #BBCAD6",
+"e c #BBCAD6",
-"b c #8CA6B9",
+"b c #8CA6B9",
-"Z c #91AABC",
+"Z c #91AABC",
-"C c #96AEC0",
+"C c #96AEC0",
-"< c #CFDAE2",
+"< c #CFDAE2",
-"5 c #AFC2CF",
+"5 c #AFC2CF",
-/* pixels */
+/* pixels */
-" ..XXXXXXXXXX   ",
+" ..XXXXXXXXXX   ",
-" XoO+X@@@@@@X   ",
+" XoO+X@@@@@@X   ",
-" X#$%&X*@@@@X   ",
+" X#$%&X*@@@@X   ",
-" X=-;:>,X@@@X   ",
+" X=-;:>,X@@@X   ",
-" X<12345X@@@X   ",
+" X<12345X@@@X   ",
-" X67890qX@XXX   ",
+" X67890qX@XXX   ",
-" XwertyuX@XiX   ",
+" XwertyuX@XiX   ",
-" XpasddfX++iiX  ",
+" XpasddfX++iiX  ",
-" XghjddkXiiiiiX ",
+" XghjddkXiiiiiX ",
-" XlzxcvbXiiiiiiX",
+" XlzxcvbXiiiiiiX",
-" XnxmMNBXiiiiiX ",
+" XnxmMNBXiiiiiX ",
-" XVCZASDXXXiiX  ",
+" XVCZASDXXXiiX  ",
-" XXFGHJKX XiX   ",
+" XXFGHJKX XiX   ",
-"   FXXFLX XX    ",
+"   FXXFLX XX    ",
-"      XX*       "
+"      XX*       "
-};
+};

art/redo.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const redo_xpm[] = {
+static const char *const redo_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 37 1",
+"16 15 37 1",
-"4 c #9BACC2",
+"4 c #9BACC2",
-"; c #4C7398",
+"; c #4C7398",
-"3 c #547B99",
+"3 c #547B99",
-"* c #547897",
+"* c #547897",
-"# c #5A89A6",
+"# c #5A89A6",
-"8 c #3A749C",
+"8 c #3A749C",
-"5 c #5A809C",
+"5 c #5A809C",
-", c #7F99B4",
+", c #7F99B4",
-"& c #3F6F93",
+"& c #3F6F93",
-"9 c #85A7BC",
+"9 c #85A7BC",
-"+ c #749BB4",
+"+ c #749BB4",
-"> c #718BA7",
+"> c #718BA7",
-"e c #A5B3C8",
+"e c #A5B3C8",
-"w c #BECAD9",
+"w c #BECAD9",
-": c #65839D",
+": c #65839D",
-"u c #E1E6EE",
+"u c #E1E6EE",
-"o c #236289",
+"o c #236289",
-"r c #ADBED2",
+"r c #ADBED2",
-"= c #597B9A",
+"= c #597B9A",
-"2 c #8DA0B9",
+"2 c #8DA0B9",
-"  c None",
+"  c None",
-"% c #467291",
+"% c #467291",
-"1 c #7393AB",
+"1 c #7393AB",
-"i c #4C809F",
+"i c #4C809F",
-"- c #A0BACB",
+"- c #A0BACB",
-"O c #6591AE",
+"O c #6591AE",
-"X c #407598",
+"X c #407598",
-"6 c #6F90A6",
+"6 c #6F90A6",
-"t c #D2D9E0",
+"t c #D2D9E0",
-"7 c #ADBACE",
+"7 c #ADBACE",
-"@ c #326A8F",
+"@ c #326A8F",
-"0 c #467A9C",
+"0 c #467A9C",
-". c #ACC4D3",
+". c #ACC4D3",
-"< c #7F97B0",
+"< c #7F97B0",
-"y c #B3BFD1",
+"y c #B3BFD1",
-"q c #A2B3C5",
+"q c #A2B3C5",
-"$ c #8FB0C3",
+"$ c #8FB0C3",
-/* pixels */
+/* pixels */
-"   .XoooO       ",
+"   .XoooO       ",
-"  +o@@@@@o#    +",
+"  +o@@@@@o#    +",
-" $@%%&@&%%&@  +o",
+" $@%%&@&%%&@  +o",
-" X*=@+-+@*=;@#&@",
+" X*=@+-+@*=;@#&@",
-" @:=+    @=:=*:@",
+" @:=+    @=:=*:@",
-" &>:$     @:>>>@",
+" &>:$     @:>>>@",
-" &,<X     X>,,,&",
+" &,<X     X>,,,&",
-" +123    @<2222&",
+" +123    @<2222&",
-"  X44X  #@56<44X",
+"  X44X  #@56<44X",
-"  O1748    .9#&o",
+"  O1748    .9#&o",
-"   0qwe8        ",
+"   0qwe8        ",
-"    8rty8       ",
+"    8rty8       ",
-"     8wu+       ",
+"     8wu+       ",
-"      i##       ",
+"      i##       ",
-"                "
+"                "
-};
+};

art/removable.xpm

@@ -1,44 +1,44 @@
-/* XPM */
+/* XPM */
-static const char *const removable_xpm[] = {
+static const char *const removable_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 23 1",
+"16 15 23 1",
-"@ c #C3C3C4",
+"@ c #C3C3C4",
-"4 c #FFFFFF",
+"4 c #FFFFFF",
-"o c #D5D6D8",
+"o c #D5D6D8",
-"> c #7A92A3",
+"> c #7A92A3",
-". c #8497A5",
+". c #8497A5",
-"% c #ACAEB2",
+"% c #ACAEB2",
-"2 c #4A7898",
+"2 c #4A7898",
-": c #DCE2EA",
+": c #DCE2EA",
-", c #F5F6F7",
+", c #F5F6F7",
-"= c #EBEBEC",
+"= c #EBEBEC",
-"$ c #B7B7B8",
+"$ c #B7B7B8",
-"  c None",
+"  c None",
-"X c #DFE0E2",
+"X c #DFE0E2",
-"* c #A6A8AD",
+"* c #A6A8AD",
-"1 c #4C809F",
+"1 c #4C809F",
-"3 c #407598",
+"3 c #407598",
-"O c #CFCFD0",
+"O c #CFCFD0",
-"; c #9EA2A8",
+"; c #9EA2A8",
-"# c #BCBDBE",
+"# c #BCBDBE",
-"+ c #C6C8CA",
+"+ c #C6C8CA",
-"- c #979BA0",
+"- c #979BA0",
-"& c #E7E7E7",
+"& c #E7E7E7",
-"< c #8FB0C3",
+"< c #8FB0C3",
-/* pixels */
+/* pixels */
-"   .........    ",
+"   .........    ",
-"   .XoO+@#$%.   ",
+"   .XoO+@#$%.   ",
-"   .XoO+@#$%.   ",
+"   .XoO+@#$%.   ",
-"  .&XoO+@#$%*.  ",
+"  .&XoO+@#$%*.  ",
-"  .&XoO+@#$%*.  ",
+"  .&XoO+@#$%*.  ",
-" .=&XoO+@#$%*-. ",
+" .=&XoO+@#$%*-. ",
-" .=&XoO+@#$%*;. ",
+" .=&XoO+@#$%*;. ",
-".:=&XoO+@#$%*;>.",
+".:=&XoO+@#$%*;>.",
-".,=&XoO+@#$%*;-.",
+".,=&XoO+@#$%*;-.",
-"<..............<",
+"<..............<",
-"<,=&XoO+@#$%%%%.",
+"<,=&XoO+@#$%%%%.",
-"<O1111122233*4*.",
+"<O1111122233*4*.",
-"<OOOOOOOOOOO***.",
+"<OOOOOOOOOOO***.",
-" <<<<<<<<<<<<<< ",
+" <<<<<<<<<<<<<< ",
-"                "
+"                "
-};
+};

art/repview.xpm

@@ -1,24 +1,24 @@
-/* XPM */
+/* XPM */
-static const char *const repview_xpm[] = {
+static const char *const repview_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 3 1",
+"16 15 3 1",
-"  c Black",
+"  c Black",
-"X c #FFFFFF",
+"X c #FFFFFF",
-". c #C0C0C0",
+". c #C0C0C0",
-/* pixels */
+/* pixels */
-"                ",
+"                ",
-" .............. ",
+" .............. ",
-" .  .    .    . ",
+" .  .    .    . ",
-" .............. ",
+" .............. ",
-" .............. ",
+" .............. ",
-" XXXXXXXXXXXXXX ",
+" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
+" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
+" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
+" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
+" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
+" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
+" XXXXXXXXXXXXXX ",
-" X  X    X    X ",
+" X  X    X    X ",
-" XXXXXXXXXXXXXX ",
+" XXXXXXXXXXXXXX ",
-"                "
+"                "
-};
+};

art/tango/fullscreen.h

@@ -1,206 +0,0 @@
-/* fullscreen.png - 650 bytes */
-static const unsigned char full_screen_16x16_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
-  0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
-  0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
-  0x07, 0xd6, 0x03, 0x10, 0x13, 0x0d, 0x35, 0xe2,
-  0x77, 0xdf, 0x9a, 0x00, 0x00, 0x00, 0x35, 0x74,
-  0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
-  0x6e, 0x74, 0x00, 0x28, 0x63, 0x29, 0x20, 0x32,
-  0x30, 0x30, 0x34, 0x20, 0x4a, 0x61, 0x6b, 0x75,
-  0x62, 0x20, 0x53, 0x74, 0x65, 0x69, 0x6e, 0x65,
-  0x72, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74,
-  0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
-  0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50,
-  0x90, 0xd9, 0x8b, 0x6f, 0x00, 0x00, 0x01, 0xd6,
-  0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93,
-  0x3b, 0x68, 0x93, 0x51, 0x14, 0xc7, 0x7f, 0xff,
-  0x9b, 0x1b, 0x35, 0x15, 0x69, 0xd3, 0x25, 0x48,
-  0xf1, 0x05, 0x71, 0x08, 0x08, 0x82, 0x20, 0x94,
-  0x2a, 0x76, 0x2a, 0x14, 0x5f, 0x50, 0xc5, 0xc9,
-  0xc7, 0xe0, 0xd0, 0xc1, 0x2a, 0xd5, 0xc5, 0x41,
-  0x70, 0x70, 0x48, 0xf9, 0x9a, 0xe0, 0xa8, 0x60,
-  0x06, 0xc1, 0x41, 0x50, 0x02, 0xed, 0xe0, 0xb3,
-  0x56, 0x51, 0x74, 0x50, 0x71, 0x0d, 0x2d, 0x8a,
-  0x25, 0x2d, 0x16, 0x45, 0x6a, 0x4d, 0x53, 0x15,
-  0x4d, 0x4c, 0xfb, 0x75, 0xf8, 0x92, 0xd8, 0xbc,
-  0x1c, 0x72, 0xe0, 0xc0, 0x85, 0x73, 0xcf, 0xef,
-  0xfe, 0xcf, 0xb9, 0xe7, 0xc8, 0x89, 0x45, 0x6f,
-  0x00, 0xfd, 0x34, 0x67, 0x09, 0x9c, 0x58, 0xd4,
-  0x6d, 0xd6, 0x9c, 0x58, 0xd4, 0xb5, 0x25, 0xd4,
-  0xee, 0xfe, 0xdb, 0x15, 0xe8, 0x27, 0xc3, 0xbd,
-  0x00, 0x48, 0x06, 0x70, 0xe9, 0xb9, 0xf8, 0xa8,
-  0x22, 0xfe, 0x2e, 0x71, 0x1c, 0x00, 0x53, 0xad,
-  0xc9, 0x18, 0xfd, 0x4b, 0x06, 0x24, 0x90, 0xc4,
-  0xd3, 0xf8, 0x7e, 0x8c, 0x51, 0x4d, 0x0d, 0xa6,
-  0x3a, 0x79, 0x43, 0xc0, 0xcf, 0x85, 0xeb, 0x6f,
-  0xbc, 0x97, 0x65, 0x50, 0xd1, 0x4f, 0x39, 0x2f,
-  0x68, 0x59, 0x6b, 0xb1, 0x3e, 0xd5, 0x07, 0x48,
-  0x30, 0xe6, 0xf4, 0xb2, 0xb1, 0x3d, 0x40, 0xb8,
-  0xa3, 0x95, 0x7b, 0xaf, 0x67, 0x90, 0x3c, 0x19,
-  0x77, 0x9e, 0x7f, 0x64, 0xc7, 0xd6, 0x76, 0x42,
-  0xc1, 0x00, 0xe3, 0xf1, 0x83, 0xf8, 0x56, 0x29,
-  0x29, 0xf7, 0x60, 0x3c, 0x76, 0x00, 0x80, 0x6b,
-  0x83, 0x7b, 0x19, 0x7d, 0x35, 0x4d, 0x28, 0x18,
-  0xe0, 0xfd, 0xa7, 0x45, 0xac, 0x35, 0x84, 0x3b,
-  0xda, 0x58, 0x63, 0x7d, 0x5c, 0x3a, 0xb1, 0x0b,
-  0x17, 0xf1, 0xec, 0xea, 0xa1, 0x5a, 0x80, 0xe4,
-  0x55, 0x2d, 0xa0, 0x6f, 0xdf, 0x36, 0x26, 0xa6,
-  0x33, 0x44, 0xb6, 0xb4, 0x61, 0x64, 0xf8, 0x30,
-  0xbb, 0x40, 0x67, 0x24, 0x5c, 0xbe, 0xe7, 0xae,
-  0xaa, 0xbc, 0x0c, 0xb0, 0xb6, 0x74, 0xf4, 0x20,
-  0x7e, 0xbf, 0xc5, 0xfa, 0xfc, 0xc8, 0x88, 0xf5,
-  0x2d, 0xeb, 0xf0, 0x59, 0x0b, 0x12, 0xc2, 0x05,
-  0x57, 0xf5, 0x7a, 0x60, 0x90, 0x84, 0x91, 0x21,
-  0xf1, 0x60, 0x82, 0xb9, 0x85, 0x3f, 0x4c, 0x7d,
-  0xce, 0x32, 0x3b, 0xf7, 0x93, 0xec, 0xaf, 0x3c,
-  0x23, 0x2f, 0xa7, 0x8a, 0xbf, 0x62, 0x4a, 0x72,
-  0x2b, 0x01, 0xdd, 0xe7, 0x47, 0x91, 0x0c, 0xc7,
-  0xae, 0x3c, 0x66, 0x72, 0x26, 0x43, 0x2a, 0xfd,
-  0x9d, 0xed, 0x9b, 0x82, 0x6c, 0x0e, 0xb5, 0x92,
-  0x4a, 0xcf, 0xf3, 0x76, 0xf2, 0x2b, 0x47, 0x2e,
-  0x3f, 0x04, 0x60, 0xcf, 0xd9, 0x64, 0x2d, 0xc0,
-  0x75, 0xa1, 0x7b, 0x70, 0x84, 0xcc, 0x8f, 0x1c,
-  0xe9, 0x2f, 0x8b, 0x9c, 0x3b, 0xba, 0x13, 0x49,
-  0x48, 0xe2, 0x64, 0x4f, 0x84, 0x54, 0x7a, 0x9e,
-  0x6f, 0xd9, 0xdf, 0x74, 0x0d, 0x24, 0x1b, 0xcf,
-  0xc1, 0xb2, 0x0b, 0xb9, 0xbf, 0x4b, 0xdc, 0x77,
-  0x0e, 0x7b, 0x9d, 0x28, 0x02, 0x24, 0x31, 0x16,
-  0xef, 0x63, 0x69, 0xd9, 0xfd, 0xff, 0x20, 0x95,
-  0xac, 0x6b, 0x20, 0x89, 0x31, 0xc2, 0xc8, 0x73,
-  0x64, 0xe8, 0x3c, 0x73, 0xb7, 0xee, 0x36, 0xd9,
-  0xea, 0xd9, 0x6e, 0x64, 0x8d, 0xe2, 0xb6, 0x50,
-  0x28, 0xdc, 0x1c, 0x8e, 0x0f, 0x9d, 0x6e, 0x66,
-  0x97, 0xf3, 0xb9, 0xfc, 0xad, 0x15, 0x8e, 0xd3,
-  0xb9, 0x9f, 0x51, 0xdb, 0x23, 0xbd, 0x00, 0x00,
-  0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
-  0x60, 0x82};
-
-/* full_screen.png - 949 bytes */
-static const unsigned char full_screen_24x24_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-  0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
-  0xf8, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
-  0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
-  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
-  0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
-  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
-  0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
-  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
-  0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
-  0x9d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5,
-  0x94, 0x4d, 0x48, 0x54, 0x51, 0x14, 0xc7, 0x7f,
-  0xe7, 0xcc, 0x94, 0x4c, 0x5a, 0x3a, 0x03, 0x21,
-  0xe1, 0x47, 0x06, 0x4a, 0x08, 0x42, 0xab, 0x20,
-  0x2c, 0xd2, 0x8d, 0x20, 0x7d, 0x81, 0x45, 0x6d,
-  0xa2, 0x16, 0x2d, 0x0c, 0xb2, 0xb0, 0x16, 0x49,
-  0x10, 0x2d, 0x5a, 0x18, 0xe3, 0x0c, 0x2d, 0x0b,
-  0x12, 0x0a, 0x5a, 0x04, 0x85, 0x60, 0x8b, 0x3e,
-  0xcd, 0xa2, 0x68, 0x53, 0xd1, 0x56, 0x92, 0x40,
-  0x11, 0xed, 0x8b, 0x32, 0xf3, 0x23, 0x25, 0x67,
-  0x1c, 0xe7, 0xb5, 0x78, 0xf7, 0xbd, 0x79, 0x33,
-  0xce, 0xe4, 0x04, 0xb6, 0xe8, 0xc0, 0x7d, 0xe7,
-  0xde, 0x77, 0xef, 0xfb, 0xff, 0xcf, 0x39, 0xf7,
-  0x7f, 0x1e, 0xfc, 0xef, 0x26, 0xce, 0x24, 0x1c,
-  0xe9, 0xbc, 0x06, 0xb4, 0xae, 0x10, 0x6e, 0xf7,
-  0xb9, 0x8e, 0xf3, 0xc7, 0xd3, 0xde, 0x84, 0x23,
-  0x9d, 0xd6, 0x4a, 0x59, 0x38, 0xd2, 0x69, 0x39,
-  0xb8, 0xfe, 0x4c, 0xea, 0xad, 0xad, 0xb7, 0xd2,
-  0xd6, 0x4f, 0xba, 0x9a, 0xb3, 0xe4, 0x2d, 0x08,
-  0x02, 0x58, 0x34, 0x75, 0x3c, 0x4a, 0xdb, 0x7a,
-  0xdb, 0x7d, 0x38, 0x6d, 0xad, 0xb9, 0x72, 0x54,
-  0x15, 0x17, 0x5c, 0xcc, 0x43, 0x10, 0x44, 0x6c,
-  0x68, 0x11, 0x10, 0x11, 0x9e, 0x46, 0x77, 0xa1,
-  0x2a, 0xe4, 0xc4, 0xc9, 0x05, 0xbe, 0x36, 0xb0,
-  0x8a, 0x33, 0x57, 0x5f, 0x23, 0xa2, 0x20, 0x8a,
-  0xa0, 0xa0, 0x86, 0x40, 0xd4, 0x1d, 0x47, 0xc3,
-  0x2f, 0x58, 0x53, 0xe0, 0xc7, 0xef, 0x93, 0xfc,
-  0x08, 0x44, 0xa0, 0x2f, 0xdc, 0xcc, 0x86, 0x50,
-  0x80, 0xea, 0xb2, 0x62, 0xee, 0xbd, 0x1a, 0xb5,
-  0xa3, 0x55, 0x50, 0x71, 0x08, 0xec, 0x8c, 0x6e,
-  0x3f, 0x1f, 0xa2, 0xae, 0x2a, 0x44, 0x69, 0x30,
-  0x40, 0x7f, 0x74, 0x0f, 0xbe, 0x2c, 0x99, 0x2c,
-  0x21, 0xe8, 0x8f, 0xec, 0x46, 0x44, 0xb9, 0xd2,
-  0xbe, 0x83, 0x8a, 0xf5, 0x45, 0x94, 0x06, 0x03,
-  0xbc, 0xff, 0x30, 0x63, 0x47, 0x8c, 0xd8, 0xf5,
-  0x17, 0x61, 0xe8, 0xd3, 0x0c, 0xd5, 0x65, 0x25,
-  0xd4, 0x94, 0x17, 0x73, 0xfd, 0x6c, 0x23, 0x88,
-  0xf2, 0xec, 0xf2, 0xde, 0xfc, 0x32, 0x10, 0x73,
-  0x89, 0x2d, 0x3b, 0x37, 0xb1, 0xae, 0xb0, 0x80,
-  0xda, 0x8d, 0x25, 0x28, 0x02, 0x2a, 0x26, 0x0b,
-  0x65, 0x73, 0x79, 0x09, 0xc1, 0xa2, 0xd5, 0x1c,
-  0x6a, 0xac, 0x46, 0x10, 0x54, 0xb0, 0xd3, 0xcc,
-  0x30, 0xff, 0x52, 0x02, 0xc5, 0x08, 0x04, 0x15,
-  0xa8, 0xab, 0x0a, 0xd9, 0xac, 0x0e, 0xb9, 0x65,
-  0x2e, 0x5c, 0x84, 0xcd, 0x95, 0x21, 0x23, 0x02,
-  0xc1, 0x12, 0x50, 0x8b, 0x7c, 0x08, 0x4c, 0x1d,
-  0x1d, 0xa7, 0xae, 0x84, 0x10, 0x0b, 0x2c, 0xc3,
-  0x2f, 0x9e, 0x68, 0x6d, 0x62, 0xc9, 0x2a, 0x99,
-  0x2c, 0x04, 0x4e, 0x4c, 0xce, 0xc2, 0x72, 0x37,
-  0xc4, 0xb3, 0xef, 0xac, 0xdd, 0xef, 0x34, 0x75,
-  0x74, 0x99, 0x3b, 0x70, 0x54, 0x62, 0x03, 0x0c,
-  0x8e, 0x4d, 0x21, 0xa4, 0x2e, 0x18, 0x51, 0xb7,
-  0x17, 0xc6, 0xbe, 0xcd, 0xda, 0x73, 0x55, 0x57,
-  0xbe, 0x79, 0x10, 0xd8, 0x87, 0x55, 0x94, 0xee,
-  0x07, 0xef, 0x18, 0x9f, 0x9a, 0x67, 0xf8, 0xf3,
-  0xb4, 0xfb, 0x4e, 0x4c, 0x10, 0x1f, 0xc7, 0x67,
-  0x99, 0x9e, 0x8b, 0xd3, 0xfb, 0x72, 0x38, 0x55,
-  0x32, 0xc9, 0x43, 0xa6, 0x0d, 0xa7, 0xef, 0x22,
-  0xa2, 0x1c, 0xbc, 0xf8, 0x98, 0xc1, 0xd1, 0x49,
-  0x06, 0x46, 0x7e, 0x50, 0x53, 0x11, 0x74, 0x01,
-  0x9c, 0x68, 0x2b, 0x4b, 0x8b, 0x19, 0x18, 0x99,
-  0xe0, 0xcd, 0xe0, 0x57, 0xf6, 0x5f, 0x78, 0x08,
-  0xc0, 0xf6, 0x93, 0x3d, 0xcb, 0x13, 0x58, 0x16,
-  0x34, 0xb4, 0xf7, 0x32, 0xf9, 0x33, 0xc6, 0xc8,
-  0x97, 0x19, 0x4e, 0x1d, 0xd8, 0xe2, 0x96, 0xcd,
-  0x91, 0xb0, 0xd3, 0x0b, 0x47, 0x9a, 0x6a, 0x19,
-  0x18, 0x99, 0xe0, 0xfb, 0xf4, 0x2f, 0xea, 0xdb,
-  0x96, 0x82, 0x67, 0x25, 0x00, 0x48, 0x5a, 0x10,
-  0x5b, 0x58, 0xe4, 0x7e, 0x78, 0x5f, 0x5a, 0x73,
-  0x89, 0xa8, 0xa7, 0x9b, 0xed, 0xd1, 0x17, 0x6d,
-  0x61, 0x31, 0x69, 0x65, 0x83, 0x91, 0x9c, 0x04,
-  0x8e, 0xd5, 0xb7, 0xf5, 0xa0, 0x4e, 0x73, 0xa1,
-  0xa9, 0x26, 0x34, 0x44, 0x88, 0xb2, 0xed, 0xc4,
-  0x9d, 0x5c, 0x9f, 0xfb, 0x20, 0x8b, 0x4c, 0x33,
-  0x7f, 0xb7, 0xcb, 0xd9, 0x1f, 0xce, 0x4b, 0x1a,
-  0x41, 0x22, 0x91, 0xb8, 0xd1, 0x15, 0xbd, 0x74,
-  0xec, 0xaf, 0xd0, 0x73, 0x58, 0x3c, 0x16, 0xbf,
-  0x99, 0xc6, 0xe2, 0x49, 0x29, 0x00, 0x14, 0x1a,
-  0xef, 0x37, 0x25, 0xf4, 0x7b, 0xe6, 0xce, 0x00,
-  0x48, 0x9a, 0xb1, 0x00, 0x24, 0x8c, 0x8f, 0x03,
-  0xf3, 0xc0, 0x1c, 0x10, 0x03, 0x92, 0x99, 0xc2,
-  0xf5, 0x02, 0x8a, 0x07, 0x50, 0x3c, 0xde, 0xe7,
-  0x21, 0xb0, 0x80, 0x45, 0x8f, 0x4f, 0x1a, 0xbf,
-  0x60, 0xe6, 0xff, 0xde, 0x7e, 0x03, 0x3e, 0xaa,
-  0xe6, 0xa9, 0x1d, 0x34, 0x13, 0x4f, 0x00, 0x00,
-  0x00, 0x35, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x28, 0x63,
-  0x29, 0x20, 0x32, 0x30, 0x30, 0x34, 0x20, 0x4a,
-  0x61, 0x6b, 0x75, 0x62, 0x20, 0x53, 0x74, 0x65,
-  0x69, 0x6e, 0x65, 0x72, 0x0a, 0x0a, 0x43, 0x72,
-  0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69,
-  0x74, 0x68, 0x20, 0x54, 0x68, 0x65, 0x20, 0x47,
-  0x49, 0x4d, 0x50, 0x90, 0xd9, 0x8b, 0x6f, 0x00,
-  0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74, 0x64,
-  0x61, 0x74, 0x65, 0x3a, 0x63, 0x72, 0x65, 0x61,
-  0x74, 0x65, 0x00, 0x32, 0x30, 0x31, 0x30, 0x2d,
-  0x30, 0x37, 0x2d, 0x31, 0x35, 0x54, 0x30, 0x30,
-  0x3a, 0x35, 0x34, 0x3a, 0x31, 0x34, 0x2b, 0x30,
-  0x32, 0x3a, 0x30, 0x30, 0x27, 0xe8, 0x22, 0xef,
-  0x00, 0x00, 0x00, 0x25, 0x74, 0x45, 0x58, 0x74,
-  0x64, 0x61, 0x74, 0x65, 0x3a, 0x6d, 0x6f, 0x64,
-  0x69, 0x66, 0x79, 0x00, 0x32, 0x30, 0x30, 0x36,
-  0x2d, 0x30, 0x33, 0x2d, 0x31, 0x36, 0x54, 0x32,
-  0x30, 0x3a, 0x31, 0x36, 0x3a, 0x30, 0x38, 0x2b,
-  0x30, 0x31, 0x3a, 0x30, 0x30, 0x33, 0x6a, 0x31,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
-  0x44, 0xae, 0x42, 0x60, 0x82};

art/tick.xpm

@@ -1,17 +1,17 @@
-/* XPM */
+/* XPM */
-static const char *const tick_xpm[] = {
+static const char *const tick_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"10 10 2 1",
+"10 10 2 1",
-". c Gray0",
+". c Gray0",
-"  c None",
+"  c None",
-/* pixels */
+/* pixels */
-"          ",
+"          ",
-"        ..",
+"        ..",
-"       ...",
+"       ...",
-"      ... ",
+"      ... ",
-"..   ...  ",
+"..   ...  ",
-"... ...   ",
+"... ...   ",
-" .....    ",
+" .....    ",
-"  ...     ",
+"  ...     ",
-"   .      ",
+"   .      ",
-"          "};
+"          "};

art/tipicon.xpm

@@ -1,47 +1,47 @@
-/* XPM */
+/* XPM */
-static const char *const tipicon_xpm[] = {
+static const char *const tipicon_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"32 32 9 1",
+"32 32 9 1",
-"$ c Black",
+"$ c Black",
-"O c #FFFFFF",
+"O c #FFFFFF",
-"@ c #808080",
+"@ c #808080",
-"+ c #000080",
+"+ c #000080",
-"o c #E8EB01",
+"o c #E8EB01",
-"  c None",
+"  c None",
-"X c #FFFF40",
+"X c #FFFF40",
-"# c #C0C0C0",
+"# c #C0C0C0",
-". c #ABAD01",
+". c #ABAD01",
-/* pixels */
+/* pixels */
-"                                ",
+"                                ",
-"             .....              ",
+"             .....              ",
-"           ..XXXXX..            ",
+"           ..XXXXX..            ",
-"         ..XXXXXXXXo..          ",
+"         ..XXXXXXXXo..          ",
-"        .XXXOXXXXXXXoo.         ",
+"        .XXXOXXXXXXXoo.         ",
-"        .XOOXXX+XXXXXo.         ",
+"        .XOOXXX+XXXXXo.         ",
-"       .XOOOXX+++XXXXoo.        ",
+"       .XOOOXX+++XXXXoo.        ",
-"       .XOOXXX+++XXXXXo.        ",
+"       .XOOXXX+++XXXXXo.        ",
-"      .XOOOXXX+++XXXXXXo.       ",
+"      .XOOOXXX+++XXXXXXo.       ",
-"      .XOOXXXX+++XXXXXXo.       ",
+"      .XOOXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXXX.       ",
+"      .XXXXXXX+++XXXXXXX.       ",
-"      .XXXXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXXo.       ",
-"      .XXXXXXX+++XXXXXoo.       ",
+"      .XXXXXXX+++XXXXXoo.       ",
-"       .XXXXXX+++XXXXXo.        ",
+"       .XXXXXX+++XXXXXo.        ",
-"       .XXXXXXX+XXXXXXo.        ",
+"       .XXXXXXX+XXXXXXo.        ",
-"        .XXXXXXXXXXXXo.         ",
+"        .XXXXXXXXXXXXo.         ",
-"        .XXXXX+++XXXoo.         ",
+"        .XXXXX+++XXXoo.         ",
-"         .XXXX+++XXoo.          ",
+"         .XXXX+++XXoo.          ",
-"          .XXXXXXXXo.           ",
+"          .XXXXXXXXo.           ",
-"          ..XXXXXXo..           ",
+"          ..XXXXXXo..           ",
-"           .XXXXXo..            ",
+"           .XXXXXo..            ",
-"           @#######@            ",
+"           @#######@            ",
-"           @@@@@@@@@            ",
+"           @@@@@@@@@            ",
-"           @#######@            ",
+"           @#######@            ",
-"           @@@@@@@@@            ",
+"           @@@@@@@@@            ",
-"           @#######@            ",
+"           @#######@            ",
-"            @@@@@@@             ",
+"            @@@@@@@             ",
-"              ###               ",
+"              ###               ",
-"              $$$               ",
+"              $$$               ",
-"                                ",
+"                                ",
-"                                ",
+"                                ",
-"                                "
+"                                "
-};
+};

art/toparent.xpm

@@ -1,21 +1,21 @@
-/* XPM */
+/* XPM */
-static const char *const toparent_xpm[] = {
+static const char *const toparent_xpm[] = {
-"16 15 3 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c Gray100",
+"X	c Gray100",
-"                ",
+"                ",
-"      ..        ",
+"      ..        ",
-"     .XX.       ",
+"     .XX.       ",
-"    .XXXX.      ",
+"    .XXXX.      ",
-"   .XXXXXX.     ",
+"   .XXXXXX.     ",
-"  .XXXXXXXX.    ",
+"  .XXXXXXXX.    ",
-" ....XXXX....   ",
+" ....XXXX....   ",
-"    .XXXX.      ",
+"    .XXXX.      ",
-"    .XXXX.....  ",
+"    .XXXX.....  ",
-"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
-"    .XXXXXXXX.  ",
+"    .XXXXXXXX.  ",
-"    ..........  ",
+"    ..........  ",
-"                "};
+"                "};

art/undo.xpm

@@ -1,58 +1,58 @@
-/* XPM */
+/* XPM */
-static const char *const undo_xpm[] = {
+static const char *const undo_xpm[] = {
-/* columns rows colors chars-per-pixel */
+/* columns rows colors chars-per-pixel */
-"16 15 37 1",
+"16 15 37 1",
-"4 c #9BACC2",
+"4 c #9BACC2",
-"* c #4C7398",
+"* c #4C7398",
-"2 c #547B99",
+"2 c #547B99",
-"- c #547897",
+"- c #547897",
-"@ c #5A89A6",
+"@ c #5A89A6",
-"8 c #3A749C",
+"8 c #3A749C",
-"6 c #5A809C",
+"6 c #5A809C",
-", c #7F99B4",
+", c #7F99B4",
-"$ c #3F6F93",
+"$ c #3F6F93",
-"7 c #85A7BC",
+"7 c #85A7BC",
-"+ c #749BB4",
+"+ c #749BB4",
-"> c #718BA7",
+"> c #718BA7",
-"0 c #A5B3C8",
+"0 c #A5B3C8",
-"q c #BECAD9",
+"q c #BECAD9",
-": c #65839D",
+": c #65839D",
-"u c #E1E6EE",
+"u c #E1E6EE",
-"X c #236289",
+"X c #236289",
-"y c #ADBED2",
+"y c #ADBED2",
-"= c #597B9A",
+"= c #597B9A",
-"1 c #8DA0B9",
+"1 c #8DA0B9",
-"  c None",
+"  c None",
-"% c #467291",
+"% c #467291",
-"3 c #7393AB",
+"3 c #7393AB",
-"i c #4C809F",
+"i c #4C809F",
-"; c #A0BACB",
+"; c #A0BACB",
-". c #6591AE",
+". c #6591AE",
-"o c #407598",
+"o c #407598",
-"5 c #6F90A6",
+"5 c #6F90A6",
-"t c #D2D9E0",
+"t c #D2D9E0",
-"9 c #ADBACE",
+"9 c #ADBACE",
-"# c #326A8F",
+"# c #326A8F",
-"e c #467A9C",
+"e c #467A9C",
-"O c #ACC4D3",
+"O c #ACC4D3",
-"< c #7F97B0",
+"< c #7F97B0",
-"r c #B3BFD1",
+"r c #B3BFD1",
-"w c #A2B3C5",
+"w c #A2B3C5",
-"& c #8FB0C3",
+"& c #8FB0C3",
-/* pixels */
+/* pixels */
-"       .XXXoO   ",
+"       .XXXoO   ",
-"+    @X#####X+  ",
+"+    @X#####X+  ",
-"X+  #$%%$#$%%#& ",
+"X+  #$%%$#$%%#& ",
-"#$@#*=-#+;+#=-o ",
+"#$@#*=-#+;+#=-o ",
-"#:-=:=#    +=:# ",
+"#:-=:=#    +=:# ",
-"#>>>:#     &:>$ ",
+"#>>>:#     &:>$ ",
-"$,,,>o     o<,$ ",
+"$,,,>o     o<,$ ",
-"$1111<#    213+ ",
+"$1111<#    213+ ",
-"o44<56#@  o44o  ",
+"o44<56#@  o44o  ",
-"X$@7O    8493.  ",
+"X$@7O    8493.  ",
-"        80qwe   ",
+"        80qwe   ",
-"       8rty8    ",
+"       8rty8    ",
-"       +uq8     ",
+"       +uq8     ",
-"       @@i      ",
+"       @@i      ",
-"                "
+"                "
-};
+};

art/up.xpm

@@ -1,21 +1,21 @@
-/* XPM */
+/* XPM */
-static const char *const up_xpm[] = {
+static const char *const up_xpm[] = {
-"16 15 3 1",
+"16 15 3 1",
-" 	c None",
+" 	c None",
-".	c Black",
+".	c Black",
-"X	c Gray100",
+"X	c Gray100",
-"                ",
+"                ",
-"       ..       ",
+"       ..       ",
-"      .XX.      ",
+"      .XX.      ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"    .XXXXXX.    ",
+"    .XXXXXX.    ",
-"   .XXXXXXXX.   ",
+"   .XXXXXXXX.   ",
-"  ....XXXX....  ",
+"  ....XXXX....  ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     .XXXX.     ",
+"     .XXXX.     ",
-"     ......     ",
+"     ......     ",
-"                "};
+"                "};

art/wxwin16x16.xpm

@@ -1,161 +1,161 @@
-/* XPM */
+/* XPM */
-static const char *const wxwin16x16_xpm[] = {
+static const char *const wxwin16x16_xpm[] = {
-"16 16 142 2",
+"16 16 142 2",
-"  	c None",
+"  	c None",
-". 	c #7171C0",
+". 	c #7171C0",
-"+ 	c #7D7DC7",
+"+ 	c #7D7DC7",
-"@ 	c #8181CE",
+"@ 	c #8181CE",
-"# 	c #7979CE",
+"# 	c #7979CE",
-"$ 	c #7171CE",
+"$ 	c #7171CE",
-"% 	c #6868CD",
+"% 	c #6868CD",
-"& 	c #5050C0",
+"& 	c #5050C0",
-"* 	c #7C7CCB",
+"* 	c #7C7CCB",
-"= 	c #D3D3FC",
+"= 	c #D3D3FC",
-"- 	c #C0C0FF",
+"- 	c #C0C0FF",
-"; 	c #B1B1FF",
+"; 	c #B1B1FF",
-"> 	c #A4A4FF",
+"> 	c #A4A4FF",
-", 	c #9696FF",
+", 	c #9696FF",
-"' 	c #6B6BE3",
+"' 	c #6B6BE3",
-") 	c #3E3EC0",
+") 	c #3E3EC0",
-"! 	c #7B7BD3",
+"! 	c #7B7BD3",
-"~ 	c #CFCFFF",
+"~ 	c #CFCFFF",
-"{ 	c #A7A7FF",
+"{ 	c #A7A7FF",
-"] 	c #8989FF",
+"] 	c #8989FF",
-"^ 	c #7B7BFF",
+"^ 	c #7B7BFF",
-"/ 	c #5E5EEB",
+"/ 	c #5E5EEB",
-"( 	c #3333BF",
+"( 	c #3333BF",
-"_ 	c #6969D3",
+"_ 	c #6969D3",
-": 	c #BEBEFF",
+": 	c #BEBEFF",
-"< 	c #8E8EFF",
+"< 	c #8E8EFF",
-"[ 	c #5E5EFF",
+"[ 	c #5E5EFF",
-"} 	c #4C4CFD",
+"} 	c #4C4CFD",
-"| 	c #6464C6",
+"| 	c #6464C6",
-"1 	c #A4A478",
+"1 	c #A4A478",
-"2 	c #BFBF63",
+"2 	c #BFBF63",
-"3 	c #BFBF5C",
+"3 	c #BFBF5C",
-"4 	c #BFBF56",
+"4 	c #BFBF56",
-"5 	c #BFBF51",
+"5 	c #BFBF51",
-"6 	c #C17474",
+"6 	c #C17474",
-"7 	c #BF7070",
+"7 	c #BF7070",
-"8 	c #BF6969",
+"8 	c #BF6969",
-"9 	c #BF6363",
+"9 	c #BF6363",
-"0 	c #544AC7",
+"0 	c #544AC7",
-"a 	c #A8A8FF",
+"a 	c #A8A8FF",
-"b 	c #7070FF",
+"b 	c #7070FF",
-"c 	c #5050FF",
+"c 	c #5050FF",
-"d 	c #3F3FFF",
+"d 	c #3F3FFF",
-"e 	c #8C8CBA",
+"e 	c #8C8CBA",
-"f 	c #F6F6C8",
+"f 	c #F6F6C8",
-"g 	c #FBFBBB",
+"g 	c #FBFBBB",
-"h 	c #FBFBAE",
+"h 	c #FBFBAE",
-"i 	c #FBFBA1",
+"i 	c #FBFBA1",
-"j 	c #F9F993",
+"j 	c #F9F993",
-"k 	c #D7D760",
+"k 	c #D7D760",
-"l 	c #D28D8D",
+"l 	c #D28D8D",
-"m 	c #EEB8B8",
+"m 	c #EEB8B8",
-"n 	c #EFAAAA",
+"n 	c #EFAAAA",
-"o 	c #EF9E9E",
+"o 	c #EF9E9E",
-"p 	c #7C5ABC",
+"p 	c #7C5ABC",
-"q 	c #8D8DFF",
+"q 	c #8D8DFF",
-"r 	c #4747FF",
+"r 	c #4747FF",
-"s 	c #3535FF",
+"s 	c #3535FF",
-"t 	c #2B2BFF",
+"t 	c #2B2BFF",
-"u 	c #AAAAA7",
+"u 	c #AAAAA7",
-"v 	c #FFFFD2",
+"v 	c #FFFFD2",
-"w 	c #FFFFA9",
+"w 	c #FFFFA9",
-"x 	c #FFFF9A",
+"x 	c #FFFF9A",
-"y 	c #FFFF8D",
+"y 	c #FFFF8D",
-"z 	c #FFFF80",
+"z 	c #FFFF80",
-"A 	c #E4E45B",
+"A 	c #E4E45B",
-"B 	c #E39F9F",
+"B 	c #E39F9F",
-"C 	c #FFCCCC",
+"C 	c #FFCCCC",
-"D 	c #FFA9A9",
+"D 	c #FFA9A9",
-"E 	c #FF9C9C",
+"E 	c #FF9C9C",
-"F 	c #B469A0",
+"F 	c #B469A0",
-"G 	c #3E3DE7",
+"G 	c #3E3DE7",
-"H 	c #2828EF",
+"H 	c #2828EF",
-"I 	c #1E1EEF",
+"I 	c #1E1EEF",
-"J 	c #1515EF",
+"J 	c #1515EF",
-"K 	c #A5A595",
+"K 	c #A5A595",
-"L 	c #FFFFC2",
+"L 	c #FFFFC2",
-"M 	c #FFFF8F",
+"M 	c #FFFF8F",
-"N 	c #F7F765",
+"N 	c #F7F765",
-"O 	c #F2F251",
+"O 	c #F2F251",
-"P 	c #DBDB3A",
+"P 	c #DBDB3A",
-"Q 	c #E48E8E",
+"Q 	c #E48E8E",
-"R 	c #FFBABA",
+"R 	c #FFBABA",
-"S 	c #FF8E8E",
+"S 	c #FF8E8E",
-"T 	c #FF8181",
+"T 	c #FF8181",
-"U 	c #FF6868",
+"U 	c #FF6868",
-"V 	c #E54D60",
+"V 	c #E54D60",
-"W 	c #AC2E56",
+"W 	c #AC2E56",
-"X 	c #0B0BBF",
+"X 	c #0B0BBF",
-"Y 	c #0606BF",
+"Y 	c #0606BF",
-"Z 	c #C8C85D",
+"Z 	c #C8C85D",
-"` 	c #FEFEB1",
+"` 	c #FEFEB1",
-" .	c #FEFE74",
+" .	c #FEFE74",
-"..	c #F4F456",
+"..	c #F4F456",
-"+.	c #EFEF42",
+"+.	c #EFEF42",
-"@.	c #EFEF38",
+"@.	c #EFEF38",
-"#.	c #D7D725",
+"#.	c #D7D725",
-"$.	c #E47676",
+"$.	c #E47676",
-"%.	c #FFA8A8",
+"%.	c #FFA8A8",
-"&.	c #FF7373",
+"&.	c #FF7373",
-"*.	c #FF5555",
+"*.	c #FF5555",
-"=.	c #FF4343",
+"=.	c #FF4343",
-"-.	c #FF3939",
+"-.	c #FF3939",
-";.	c #DA2323",
+";.	c #DA2323",
-">.	c #CFCF3C",
+">.	c #CFCF3C",
-",.	c #F6F694",
+",.	c #F6F694",
-"'.	c #F0F047",
+"'.	c #F0F047",
-").	c #EFEF2E",
+").	c #EFEF2E",
-"!.	c #EFEF24",
+"!.	c #EFEF24",
-"~.	c #D7D715",
+"~.	c #D7D715",
-"{.	c #E45757",
+"{.	c #E45757",
-"].	c #FF8888",
+"].	c #FF8888",
-"^.	c #FF4646",
+"^.	c #FF4646",
-"/.	c #FF2F2F",
+"/.	c #FF2F2F",
-"(.	c #FF2525",
+"(.	c #FF2525",
-"_.	c #DA1414",
+"_.	c #DA1414",
-":.	c #C3C328",
+":.	c #C3C328",
-"<.	c #EBEB55",
+"<.	c #EBEB55",
-"[.	c #ECEC2F",
+"[.	c #ECEC2F",
-"}.	c #ECEC24",
+"}.	c #ECEC24",
-"|.	c #ECEC1A",
+"|.	c #ECEC1A",
-"1.	c #EBEB10",
+"1.	c #EBEB10",
-"2.	c #CDCD06",
+"2.	c #CDCD06",
-"3.	c #DD3A3A",
+"3.	c #DD3A3A",
-"4.	c #FF6060",
+"4.	c #FF6060",
-"5.	c #FF1B1B",
+"5.	c #FF1B1B",
-"6.	c #FE1111",
+"6.	c #FE1111",
-"7.	c #D10707",
+"7.	c #D10707",
-"8.	c #B8B819",
+"8.	c #B8B819",
-"9.	c #B7B715",
+"9.	c #B7B715",
-"0.	c #B7B710",
+"0.	c #B7B710",
-"a.	c #B7B70B",
+"a.	c #B7B70B",
-"b.	c #B7B706",
+"b.	c #B7B706",
-"c.	c #B7B701",
+"c.	c #B7B701",
-"d.	c #B7B700",
+"d.	c #B7B700",
-"e.	c #BF1A1A",
+"e.	c #BF1A1A",
-"f.	c #CC1919",
+"f.	c #CC1919",
-"g.	c #CE1414",
+"g.	c #CE1414",
-"h.	c #CE0E0E",
+"h.	c #CE0E0E",
-"i.	c #CE0808",
+"i.	c #CE0808",
-"j.	c #C90202",
+"j.	c #C90202",
-"k.	c #C00000",
+"k.	c #C00000",
-"                                ",
+"                                ",
-"                                ",
+"                                ",
-"        . + @ # $ % &           ",
+"        . + @ # $ % &           ",
-"        * = - ; > , ' )         ",
+"        * = - ; > , ' )         ",
-"        ! ~ { , ] ^ / (         ",
+"        ! ~ { , ] ^ / (         ",
-"        _ : < ^ [ } | 1 2 3 4 5 ",
+"        _ : < ^ [ } | 1 2 3 4 5 ",
-"6 7 8 9 0 a b c d e f g h i j k ",
+"6 7 8 9 0 a b c d e f g h i j k ",
-"l m n o p q r s t u v w x y z A ",
+"l m n o p q r s t u v w x y z A ",
-"B C D E F G H I J K L M z N O P ",
+"B C D E F G H I J K L M z N O P ",
-"Q R S T U V W X Y Z `  ...+.@.#.",
+"Q R S T U V W X Y Z `  ...+.@.#.",
-"$.%.&.*.=.-.;.    >.,.'.@.).!.~.",
+"$.%.&.*.=.-.;.    >.,.'.@.).!.~.",
-"{.].^.-./.(._.    :.<.[.}.|.1.2.",
+"{.].^.-./.(._.    :.<.[.}.|.1.2.",
-"3.4./.(.5.6.7.    8.9.0.a.b.c.d.",
+"3.4./.(.5.6.7.    8.9.0.a.b.c.d.",
-"e.f.g.h.i.j.k.                  ",
+"e.f.g.h.i.j.k.                  ",
-"                                ",
+"                                ",
-"                                "};
+"                                "};

art/wxwin32x32.xpm

@@ -1,442 +1,442 @@
-/* XPM */
+/* XPM */
-static const char *const wxwin32x32_xpm[] = {
+static const char *const wxwin32x32_xpm[] = {
-"32 32 407 2",
+"32 32 407 2",
-"  	c None",
+"  	c None",
-". 	c #7373C1",
+". 	c #7373C1",
-"+ 	c #6E6EBF",
+"+ 	c #6E6EBF",
-"@ 	c #6B6BBF",
+"@ 	c #6B6BBF",
-"# 	c #6868BF",
+"# 	c #6868BF",
-"$ 	c #6464BF",
+"$ 	c #6464BF",
-"% 	c #6161BF",
+"% 	c #6161BF",
-"& 	c #5E5EBF",
+"& 	c #5E5EBF",
-"* 	c #5A5ABF",
+"* 	c #5A5ABF",
-"= 	c #5959C0",
+"= 	c #5959C0",
-"- 	c #7171C0",
+"- 	c #7171C0",
-"; 	c #7272C1",
+"; 	c #7272C1",
-"> 	c #8686CE",
+"> 	c #8686CE",
-", 	c #8686D0",
+", 	c #8686D0",
-"' 	c #8282D0",
+"' 	c #8282D0",
-") 	c #7D7DD0",
+") 	c #7D7DD0",
-"! 	c #7979D0",
+"! 	c #7979D0",
-"~ 	c #7575D0",
+"~ 	c #7575D0",
-"{ 	c #7171D0",
+"{ 	c #7171D0",
-"] 	c #6D6DD0",
+"] 	c #6D6DD0",
-"^ 	c #6666CD",
+"^ 	c #6666CD",
-"/ 	c #5151C1",
+"/ 	c #5151C1",
-"( 	c #4C4CBF",
+"( 	c #4C4CBF",
-"_ 	c #7171C1",
+"_ 	c #7171C1",
-": 	c #7272C2",
+": 	c #7272C2",
-"< 	c #C1C1F2",
+"< 	c #C1C1F2",
-"[ 	c #D7D7FF",
+"[ 	c #D7D7FF",
-"} 	c #C9C9FF",
+"} 	c #C9C9FF",
-"| 	c #C2C2FF",
+"| 	c #C2C2FF",
-"1 	c #BBBBFF",
+"1 	c #BBBBFF",
-"2 	c #B4B4FF",
+"2 	c #B4B4FF",
-"3 	c #AEAEFF",
+"3 	c #AEAEFF",
-"4 	c #A7A7FF",
+"4 	c #A7A7FF",
-"5 	c #A0A0FF",
+"5 	c #A0A0FF",
-"6 	c #9A9AFF",
+"6 	c #9A9AFF",
-"7 	c #8484F2",
+"7 	c #8484F2",
-"8 	c #4949C2",
+"8 	c #4949C2",
-"9 	c #4444C1",
+"9 	c #4444C1",
-"0 	c #6A6AC0",
+"0 	c #6A6AC0",
-"a 	c #8989D4",
+"a 	c #8989D4",
-"b 	c #DADAFF",
+"b 	c #DADAFF",
-"c 	c #C0C0FF",
+"c 	c #C0C0FF",
-"d 	c #9393FF",
+"d 	c #9393FF",
-"e 	c #8C8CFF",
+"e 	c #8C8CFF",
-"f 	c #8686FF",
+"f 	c #8686FF",
-"g 	c #5454D4",
+"g 	c #5454D4",
-"h 	c #3E3EC0",
+"h 	c #3E3EC0",
-"i 	c #6363BF",
+"i 	c #6363BF",
-"j 	c #8686D8",
+"j 	c #8686D8",
-"k 	c #D4D4FF",
+"k 	c #D4D4FF",
-"l 	c #D2D2FF",
+"l 	c #D2D2FF",
-"m 	c #7F7FFF",
+"m 	c #7F7FFF",
-"n 	c #7878FF",
+"n 	c #7878FF",
-"o 	c #4F4FD7",
+"o 	c #4F4FD7",
-"p 	c #3737BF",
+"p 	c #3737BF",
-"q 	c #5C5CBF",
+"q 	c #5C5CBF",
-"r 	c #7D7DD8",
+"r 	c #7D7DD8",
-"s 	c #CCCCFF",
+"s 	c #CCCCFF",
-"t 	c #CACAFF",
+"t 	c #CACAFF",
-"u 	c #A8A8FF",
+"u 	c #A8A8FF",
-"v 	c #7070FF",
+"v 	c #7070FF",
-"w 	c #6B6BFF",
+"w 	c #6B6BFF",
-"x 	c #4545D7",
+"x 	c #4545D7",
-"y 	c #3030BF",
+"y 	c #3030BF",
-"z 	c #5555BF",
+"z 	c #5555BF",
-"A 	c #7373D8",
+"A 	c #7373D8",
-"B 	c #C3C3FF",
+"B 	c #C3C3FF",
-"C 	c #9C9CFF",
+"C 	c #9C9CFF",
-"D 	c #8D8DFF",
+"D 	c #8D8DFF",
-"E 	c #7777FF",
+"E 	c #7777FF",
-"F 	c #6262FF",
+"F 	c #6262FF",
-"G 	c #5252FF",
+"G 	c #5252FF",
-"H 	c #4B4BFF",
+"H 	c #4B4BFF",
-"I 	c #4848FF",
+"I 	c #4848FF",
-"J 	c #3232D7",
+"J 	c #3232D7",
-"K 	c #2626BF",
+"K 	c #2626BF",
-"L 	c #4E4EBF",
+"L 	c #4E4EBF",
-"M 	c #6A6AD8",
+"M 	c #6A6AD8",
-"N 	c #B9B9FF",
+"N 	c #B9B9FF",
-"O 	c #9090FF",
+"O 	c #9090FF",
-"P 	c #6F6FFF",
+"P 	c #6F6FFF",
-"Q 	c #5555FF",
+"Q 	c #5555FF",
-"R 	c #4646FF",
+"R 	c #4646FF",
-"S 	c #4B4BF5",
+"S 	c #4B4BF5",
-"T 	c #8282B4",
+"T 	c #8282B4",
-"U 	c #93938E",
+"U 	c #93938E",
-"V 	c #B1B173",
+"V 	c #B1B173",
-"W 	c #BFBF68",
+"W 	c #BFBF68",
-"X 	c #BFBF65",
+"X 	c #BFBF65",
-"Y 	c #BFBF62",
+"Y 	c #BFBF62",
-"Z 	c #BFBF5E",
+"Z 	c #BFBF5E",
-"` 	c #BFBF5B",
+"` 	c #BFBF5B",
-" .	c #BFBF57",
+" .	c #BFBF57",
-"..	c #BFBF54",
+"..	c #BFBF54",
-"+.	c #BFBF51",
+"+.	c #BFBF51",
-"@.	c #5858D8",
+"@.	c #5858D8",
-"#.	c #B2B2FF",
+"#.	c #B2B2FF",
-"$.	c #B1B1FF",
+"$.	c #B1B1FF",
-"%.	c #8484FF",
+"%.	c #8484FF",
-"&.	c #7272FF",
+"&.	c #7272FF",
-"*.	c #6767FF",
+"*.	c #6767FF",
-"=.	c #4F4FFF",
+"=.	c #4F4FFF",
-"-.	c #4747FF",
+"-.	c #4747FF",
-";.	c #4242FF",
+";.	c #4242FF",
-">.	c #4141FA",
+">.	c #4141FA",
-",.	c #ABAB8A",
+",.	c #ABAB8A",
-"'.	c #E4E4AA",
+"'.	c #E4E4AA",
-").	c #F5F5C3",
+").	c #F5F5C3",
-"!.	c #F6F6BE",
+"!.	c #F6F6BE",
-"~.	c #F6F6B7",
+"~.	c #F6F6B7",
-"{.	c #F6F6B1",
+"{.	c #F6F6B1",
-"].	c #F6F6AB",
+"].	c #F6F6AB",
-"^.	c #F6F6A5",
+"^.	c #F6F6A5",
-"/.	c #F6F69E",
+"/.	c #F6F69E",
-"(.	c #F6F698",
+"(.	c #F6F698",
-"_.	c #F1F18C",
+"_.	c #F1F18C",
-":.	c #D0D05F",
+":.	c #D0D05F",
-"<.	c #BFBF48",
+"<.	c #BFBF48",
-"[.	c #C17474",
+"[.	c #C17474",
-"}.	c #C07171",
+"}.	c #C07171",
-"|.	c #BF6E6E",
+"|.	c #BF6E6E",
-"1.	c #BF6B6B",
+"1.	c #BF6B6B",
-"2.	c #BF6868",
+"2.	c #BF6868",
-"3.	c #BF6464",
+"3.	c #BF6464",
-"4.	c #BF6161",
+"4.	c #BF6161",
-"5.	c #7C498C",
+"5.	c #7C498C",
-"6.	c #4242D8",
+"6.	c #4242D8",
-"7.	c #A4A4FF",
+"7.	c #A4A4FF",
-"8.	c #5959FF",
+"8.	c #5959FF",
-"9.	c #3D3DFF",
+"9.	c #3D3DFF",
-"0.	c #3838FF",
+"0.	c #3838FF",
-"a.	c #6666CA",
+"a.	c #6666CA",
-"b.	c #DCDC98",
+"b.	c #DCDC98",
-"c.	c #FFFFDD",
+"c.	c #FFFFDD",
-"d.	c #FFFFD7",
+"d.	c #FFFFD7",
-"e.	c #FFFFC0",
+"e.	c #FFFFC0",
-"f.	c #FFFFB8",
+"f.	c #FFFFB8",
-"g.	c #FFFFB2",
+"g.	c #FFFFB2",
-"h.	c #FFFFAB",
+"h.	c #FFFFAB",
-"i.	c #FFFFA4",
+"i.	c #FFFFA4",
-"j.	c #FFFF9D",
+"j.	c #FFFF9D",
-"k.	c #FFFF97",
+"k.	c #FFFF97",
-"l.	c #FFFF90",
+"l.	c #FFFF90",
-"m.	c #FBFB85",
+"m.	c #FBFB85",
-"n.	c #C2C244",
+"n.	c #C2C244",
-"o.	c #C37676",
+"o.	c #C37676",
-"p.	c #DA9B9B",
+"p.	c #DA9B9B",
-"q.	c #DF9F9F",
+"q.	c #DF9F9F",
-"r.	c #DF9A9A",
+"r.	c #DF9A9A",
-"s.	c #DF9494",
+"s.	c #DF9494",
-"t.	c #DF8F8F",
+"t.	c #DF8F8F",
-"u.	c #DF8A8A",
+"u.	c #DF8A8A",
-"v.	c #B47094",
+"v.	c #B47094",
-"w.	c #3B3BD8",
+"w.	c #3B3BD8",
-"x.	c #9292FF",
+"x.	c #9292FF",
-"y.	c #5656FF",
+"y.	c #5656FF",
-"z.	c #3333FF",
+"z.	c #3333FF",
-"A.	c #2E2EFF",
+"A.	c #2E2EFF",
-"B.	c #7070B6",
+"B.	c #7070B6",
-"C.	c #E7E79F",
+"C.	c #E7E79F",
-"D.	c #FFFFDE",
+"D.	c #FFFFDE",
-"E.	c #FFFFCF",
+"E.	c #FFFFCF",
-"F.	c #FFFFB5",
+"F.	c #FFFFB5",
-"G.	c #FFFF9E",
+"G.	c #FFFF9E",
-"H.	c #FFFF8A",
+"H.	c #FFFF8A",
-"I.	c #FFFF83",
+"I.	c #FFFF83",
-"J.	c #FFFF7C",
+"J.	c #FFFF7C",
-"K.	c #C8C843",
+"K.	c #C8C843",
-"L.	c #C06D6D",
+"L.	c #C06D6D",
-"M.	c #F1BEBE",
+"M.	c #F1BEBE",
-"N.	c #FFDBDB",
+"N.	c #FFDBDB",
-"O.	c #FFCBCB",
+"O.	c #FFCBCB",
-"P.	c #FFC0C0",
+"P.	c #FFC0C0",
-"Q.	c #FFBABA",
+"Q.	c #FFBABA",
-"R.	c #FFB3B3",
+"R.	c #FFB3B3",
-"S.	c #FFACAC",
+"S.	c #FFACAC",
-"T.	c #CE89AC",
+"T.	c #CE89AC",
-"U.	c #3333D7",
+"U.	c #3333D7",
-"V.	c #8787FF",
+"V.	c #8787FF",
-"W.	c #4D4DFF",
+"W.	c #4D4DFF",
-"X.	c #2929FF",
+"X.	c #2929FF",
-"Y.	c #2424FF",
+"Y.	c #2424FF",
-"Z.	c #6B6BB3",
+"Z.	c #6B6BB3",
-"`.	c #E7E795",
+"`.	c #E7E795",
-" +	c #FFFFC6",
+" +	c #FFFFC6",
-".+	c #FFFFA8",
+".+	c #FFFFA8",
-"++	c #FFFF76",
+"++	c #FFFF76",
-"@+	c #FFFF6F",
+"@+	c #FFFF6F",
-"#+	c #C8C83C",
+"#+	c #C8C83C",
-"$+	c #C77474",
+"$+	c #C77474",
-"%+	c #FFD3D3",
+"%+	c #FFD3D3",
-"&+	c #FFDEDE",
+"&+	c #FFDEDE",
-"*+	c #FFC4C4",
+"*+	c #FFC4C4",
-"=+	c #FFA6A6",
+"=+	c #FFA6A6",
-"-+	c #FF9F9F",
+"-+	c #FF9F9F",
-";+	c #F3929A",
+";+	c #F3929A",
-">+	c #2F29C3",
+">+	c #2F29C3",
-",+	c #4C4CFB",
+",+	c #4C4CFB",
-"'+	c #6868FF",
+"'+	c #6868FF",
-")+	c #3939FF",
+")+	c #3939FF",
-"!+	c #1F1FFF",
+"!+	c #1F1FFF",
-"~+	c #1A1AFF",
+"~+	c #1A1AFF",
-"{+	c #6666B0",
+"{+	c #6666B0",
-"]+	c #E7E78A",
+"]+	c #E7E78A",
-"^+	c #FFFFD0",
+"^+	c #FFFFD0",
-"/+	c #FFFFBD",
+"/+	c #FFFFBD",
-"(+	c #FFFF9B",
+"(+	c #FFFF9B",
-"_+	c #FFFF91",
+"_+	c #FFFF91",
-":+	c #FAFA6E",
+":+	c #FAFA6E",
-"<+	c #F5F55F",
+"<+	c #F5F55F",
-"[+	c #F5F558",
+"[+	c #F5F558",
-"}+	c #F7F756",
+"}+	c #F7F756",
-"|+	c #C7C732",
+"|+	c #C7C732",
-"1+	c #C86E6E",
+"1+	c #C86E6E",
-"2+	c #FFC9C9",
+"2+	c #FFC9C9",
-"3+	c #FFD7D7",
+"3+	c #FFD7D7",
-"4+	c #FFB8B8",
+"4+	c #FFB8B8",
-"5+	c #FF9898",
+"5+	c #FF9898",
-"6+	c #FF9292",
+"6+	c #FF9292",
-"7+	c #FF8B8B",
+"7+	c #FF8B8B",
-"8+	c #B16098",
+"8+	c #B16098",
-"9+	c #2420C6",
+"9+	c #2420C6",
-"0+	c #2222DD",
+"0+	c #2222DD",
-"a+	c #1F1FDF",
+"a+	c #1F1FDF",
-"b+	c #1B1BDF",
+"b+	c #1B1BDF",
-"c+	c #1818DF",
+"c+	c #1818DF",
-"d+	c #1414DF",
+"d+	c #1414DF",
-"e+	c #1010DF",
+"e+	c #1010DF",
-"f+	c #0C0CDF",
+"f+	c #0C0CDF",
-"g+	c #5F5F9C",
+"g+	c #5F5F9C",
-"h+	c #E7E77F",
+"h+	c #E7E77F",
-"i+	c #FFFFC9",
+"i+	c #FFFFC9",
-"j+	c #FFFFB4",
+"j+	c #FFFFB4",
-"k+	c #FFFF8E",
+"k+	c #FFFF8E",
-"l+	c #FFFF7D",
+"l+	c #FFFF7D",
-"m+	c #FEFE75",
+"m+	c #FEFE75",
-"n+	c #F4F45D",
+"n+	c #F4F45D",
-"o+	c #EFEF4F",
+"o+	c #EFEF4F",
-"p+	c #EFEF4A",
+"p+	c #EFEF4A",
-"q+	c #EFEF44",
+"q+	c #EFEF44",
-"r+	c #EFEF3F",
+"r+	c #EFEF3F",
-"s+	c #BFBF22",
+"s+	c #BFBF22",
-"t+	c #C86666",
+"t+	c #C86666",
-"u+	c #FFBFBF",
+"u+	c #FFBFBF",
-"v+	c #FFD0D0",
+"v+	c #FFD0D0",
-"w+	c #FFADAD",
+"w+	c #FFADAD",
-"x+	c #FF8484",
+"x+	c #FF8484",
-"y+	c #FF7E7E",
+"y+	c #FF7E7E",
-"z+	c #FF7373",
+"z+	c #FF7373",
-"A+	c #E75F70",
+"A+	c #E75F70",
-"B+	c #B0457F",
+"B+	c #B0457F",
-"C+	c #9A3776",
+"C+	c #9A3776",
-"D+	c #5F1D7C",
+"D+	c #5F1D7C",
-"E+	c #0C0CBF",
+"E+	c #0C0CBF",
-"F+	c #0909BF",
+"F+	c #0909BF",
-"G+	c #0707BF",
+"G+	c #0707BF",
-"H+	c #0404BF",
+"H+	c #0404BF",
-"I+	c #878766",
+"I+	c #878766",
-"J+	c #E6E674",
+"J+	c #E6E674",
-"K+	c #FFFFC2",
+"K+	c #FFFFC2",
-"L+	c #FFFF82",
+"L+	c #FFFF82",
-"M+	c #FEFE6E",
+"M+	c #FEFE6E",
-"N+	c #F3F355",
+"N+	c #F3F355",
-"O+	c #EFEF45",
+"O+	c #EFEF45",
-"P+	c #EFEF40",
+"P+	c #EFEF40",
-"Q+	c #EFEF3B",
+"Q+	c #EFEF3B",
-"R+	c #EFEF36",
+"R+	c #EFEF36",
-"S+	c #BFBF1C",
+"S+	c #BFBF1C",
-"T+	c #C85F5F",
+"T+	c #C85F5F",
-"U+	c #FFB4B4",
+"U+	c #FFB4B4",
-"V+	c #FFA2A2",
+"V+	c #FFA2A2",
-"W+	c #FF7575",
+"W+	c #FF7575",
-"X+	c #FF5E5E",
+"X+	c #FF5E5E",
-"Y+	c #FF5050",
+"Y+	c #FF5050",
-"Z+	c #FF4A4A",
+"Z+	c #FF4A4A",
-"`+	c #FF4545",
+"`+	c #FF4545",
-" @	c #E73535",
+" @	c #E73535",
-".@	c #BF2121",
+".@	c #BF2121",
-"+@	c #B7B733",
+"+@	c #B7B733",
-"@@	c #DCDC55",
+"@@	c #DCDC55",
-"#@	c #FDFDB7",
+"#@	c #FDFDB7",
-"$@	c #FFFFA2",
+"$@	c #FFFFA2",
-"%@	c #FFFF75",
+"%@	c #FFFF75",
-"&@	c #FCFC64",
+"&@	c #FCFC64",
-"*@	c #F2F24E",
+"*@	c #F2F24E",
-"=@	c #EFEF31",
+"=@	c #EFEF31",
-"-@	c #EFEF2C",
+"-@	c #EFEF2C",
-";@	c #BFBF16",
+";@	c #BFBF16",
-">@	c #C85656",
+">@	c #C85656",
-",@	c #FFAAAA",
+",@	c #FFAAAA",
-"'@	c #FFC2C2",
+"'@	c #FFC2C2",
-")@	c #FF9797",
+")@	c #FF9797",
-"!@	c #FF7777",
+"!@	c #FF7777",
-"~@	c #FF6E6E",
+"~@	c #FF6E6E",
-"{@	c #FF5454",
+"{@	c #FF5454",
-"]@	c #FF4040",
+"]@	c #FF4040",
-"^@	c #FF3B3B",
+"^@	c #FF3B3B",
-"/@	c #E72C2C",
+"/@	c #E72C2C",
-"(@	c #BF1919",
+"(@	c #BF1919",
-"_@	c #B7B72E",
+"_@	c #B7B72E",
-":@	c #DADA48",
+":@	c #DADA48",
-"<@	c #F7F7A6",
+"<@	c #F7F7A6",
-"[@	c #F6F689",
+"[@	c #F6F689",
-"}@	c #F2F254",
+"}@	c #F2F254",
-"|@	c #EFEF27",
+"|@	c #EFEF27",
-"1@	c #EFEF22",
+"1@	c #EFEF22",
-"2@	c #BFBF10",
+"2@	c #BFBF10",
-"3@	c #C84040",
+"3@	c #C84040",
-"4@	c #FF9A9A",
+"4@	c #FF9A9A",
-"5@	c #FFBBBB",
+"5@	c #FFBBBB",
-"6@	c #FF7171",
+"6@	c #FF7171",
-"7@	c #FF6666",
+"7@	c #FF6666",
-"8@	c #FF4E4E",
+"8@	c #FF4E4E",
-"9@	c #FF4646",
+"9@	c #FF4646",
-"0@	c #FF4141",
+"0@	c #FF4141",
-"a@	c #FF3C3C",
+"a@	c #FF3C3C",
-"b@	c #FF3737",
+"b@	c #FF3737",
-"c@	c #FF3232",
+"c@	c #FF3232",
-"d@	c #E72424",
+"d@	c #E72424",
-"e@	c #BF1414",
+"e@	c #BF1414",
-"f@	c #B7B729",
+"f@	c #B7B729",
-"g@	c #DADA3F",
+"g@	c #DADA3F",
-"h@	c #F7F7A1",
+"h@	c #F7F7A1",
-"i@	c #F4F480",
+"i@	c #F4F480",
-"j@	c #F0F047",
+"j@	c #F0F047",
-"k@	c #EFEF1D",
+"k@	c #EFEF1D",
-"l@	c #EFEF18",
+"l@	c #EFEF18",
-"m@	c #BFBF0B",
+"m@	c #BFBF0B",
-"n@	c #C83636",
+"n@	c #C83636",
-"o@	c #FFABAB",
+"o@	c #FFABAB",
-"p@	c #FF7676",
+"p@	c #FF7676",
-"q@	c #FF2D2D",
+"q@	c #FF2D2D",
-"r@	c #FF2828",
+"r@	c #FF2828",
-"s@	c #E71C1C",
+"s@	c #E71C1C",
-"t@	c #BF0F0F",
+"t@	c #BF0F0F",
-"u@	c #B7B724",
+"u@	c #B7B724",
-"v@	c #D1D132",
+"v@	c #D1D132",
-"w@	c #F4F478",
+"w@	c #F4F478",
-"x@	c #EFEF13",
+"x@	c #EFEF13",
-"y@	c #ECEC0E",
+"y@	c #ECEC0E",
-"z@	c #BABA05",
+"z@	c #BABA05",
-"A@	c #C83030",
+"A@	c #C83030",
-"B@	c #FF6161",
+"B@	c #FF6161",
-"C@	c #FF2323",
+"C@	c #FF2323",
-"D@	c #FF1E1E",
+"D@	c #FF1E1E",
-"E@	c #E71414",
+"E@	c #E71414",
-"F@	c #BF0A0A",
+"F@	c #BF0A0A",
-"G@	c #B8B820",
+"G@	c #B8B820",
-"H@	c #B9B91F",
+"H@	c #B9B91F",
-"I@	c #DADA2C",
+"I@	c #DADA2C",
-"J@	c #E9E931",
+"J@	c #E9E931",
-"K@	c #EAEA2A",
+"K@	c #EAEA2A",
-"L@	c #EAEA25",
+"L@	c #EAEA25",
-"M@	c #EAEA20",
+"M@	c #EAEA20",
-"N@	c #EAEA1C",
+"N@	c #EAEA1C",
-"O@	c #EAEA17",
+"O@	c #EAEA17",
-"P@	c #EAEA12",
+"P@	c #EAEA12",
-"Q@	c #EAEA0D",
+"Q@	c #EAEA0D",
-"R@	c #E5E508",
+"R@	c #E5E508",
-"S@	c #C7C703",
+"S@	c #C7C703",
-"T@	c #B7B701",
+"T@	c #B7B701",
-"U@	c #C52929",
+"U@	c #C52929",
-"V@	c #FF5858",
+"V@	c #FF5858",
-"W@	c #FF1919",
+"W@	c #FF1919",
-"X@	c #FF1414",
+"X@	c #FF1414",
-"Y@	c #E30C0C",
+"Y@	c #E30C0C",
-"Z@	c #BF0606",
+"Z@	c #BF0606",
-"`@	c #B8B819",
+"`@	c #B8B819",
-" #	c #B7B717",
+" #	c #B7B717",
-".#	c #B7B714",
+".#	c #B7B714",
-"+#	c #B7B711",
+"+#	c #B7B711",
-"@#	c #B7B70F",
+"@#	c #B7B70F",
-"##	c #B7B70C",
+"##	c #B7B70C",
-"$#	c #B7B70A",
+"$#	c #B7B70A",
-"%#	c #B7B707",
+"%#	c #B7B707",
-"&#	c #B7B705",
+"&#	c #B7B705",
-"*#	c #B7B702",
+"*#	c #B7B702",
-"=#	c #B7B700",
+"=#	c #B7B700",
-"-#	c #BF2020",
+"-#	c #BF2020",
-";#	c #E63131",
+";#	c #E63131",
-">#	c #FF5555",
+">#	c #FF5555",
-",#	c #FF3A3A",
+",#	c #FF3A3A",
-"'#	c #FF0F0F",
+"'#	c #FF0F0F",
-")#	c #FA0A0A",
+")#	c #FA0A0A",
-"!#	c #C90303",
+"!#	c #C90303",
-"~#	c #C00202",
+"~#	c #C00202",
-"{#	c #C01C1C",
+"{#	c #C01C1C",
-"]#	c #CB1B1B",
+"]#	c #CB1B1B",
-"^#	c #D01A1A",
+"^#	c #D01A1A",
-"/#	c #D01616",
+"/#	c #D01616",
-"(#	c #D01313",
+"(#	c #D01313",
-"_#	c #D01010",
+"_#	c #D01010",
-":#	c #D00D0D",
+":#	c #D00D0D",
-"<#	c #D00A0A",
+"<#	c #D00A0A",
-"[#	c #D00707",
+"[#	c #D00707",
-"}#	c #CF0303",
+"}#	c #CF0303",
-"|#	c #C30101",
+"|#	c #C30101",
-"1#	c #C00000",
+"1#	c #C00000",
-"2#	c #C21414",
+"2#	c #C21414",
-"3#	c #BF1111",
+"3#	c #BF1111",
-"4#	c #BF0E0E",
+"4#	c #BF0E0E",
-"5#	c #BF0C0C",
+"5#	c #BF0C0C",
-"6#	c #BF0909",
+"6#	c #BF0909",
-"7#	c #BF0707",
+"7#	c #BF0707",
-"8#	c #BF0404",
+"8#	c #BF0404",
-"9#	c #BF0202",
+"9#	c #BF0202",
-"0#	c #C50000",
+"0#	c #C50000",
-"                                                                ",
+"                                                                ",
-"                                                                ",
+"                                                                ",
-"                                                                ",
+"                                                                ",
-"                                                                ",
+"                                                                ",
-"                      . + @ # $ % & * =                         ",
+"                      . + @ # $ % & * =                         ",
-"                  - ; > , ' ) ! ~ { ] ^ / (                     ",
+"                  - ; > , ' ) ! ~ { ] ^ / (                     ",
-"                _ : < [ } | 1 2 3 4 5 6 7 8 9                   ",
+"                _ : < [ } | 1 2 3 4 5 6 7 8 9                   ",
-"                0 a b b c 2 3 4 5 6 d e f g h                   ",
+"                0 a b b c 2 3 4 5 6 d e f g h                   ",
-"                i j k l 2 4 5 6 d e f m n o p                   ",
+"                i j k l 2 4 5 6 d e f m n o p                   ",
-"                q r s t u 6 d e f m n v w x y                   ",
+"                q r s t u 6 d e f m n v w x y                   ",
-"                z A B | C D f m E F G H I J K                   ",
+"                z A B | C D f m E F G H I J K                   ",
-"                L M 1 N O m n P Q H R S T U V W X Y Z `  ...+.  ",
+"                L M 1 N O m n P Q H R S T U V W X Y Z `  ...+.  ",
-"                p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
+"                p @.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
-"  [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.",
+"  [.}.|.1.2.3.4.5.6.6 7.&.8.I ;.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.",
-"}.o.p.q.r.s.t.u.v.w.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.",
+"}.o.p.q.r.s.t.u.v.w.O x.y.;.9.0.z.A.B.C.D.E.F.h.i.G.k.l.H.I.J.K.",
-"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+",
+"L.M.N.O.P.Q.R.S.T.U.V.e W.0.z.A.X.Y.Z.`.d. +.+G.k.l.H.I.J.++@+#+",
-"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+",
+"$+%+&+*+R.S.=+-+;+>+,+'+)+A.X.Y.!+~+{+]+^+/+(+_+H.I.J.:+<+[+}+|+",
-"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+",
+"1+2+3+4+=+-+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+I.l+m+n+o+p+q+r+s+",
-"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+",
+"t+u+v+w+5+6+7+x+y+z+A+B+C+D+E+F+G+H+I+J+K+h.L+++M+N+p+O+P+Q+R+S+",
-"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@        +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
+"T+U+2+V+7+x+y+W+X+Y+Z+`+ @.@        +@@@#@$@%@&@*@O+P+Q+R+=@-@;@",
-">@,@'@)@y+!@~@{@Z+`+]@^@/@(@        _@:@<@[@}@O+P+Q+R+=@-@|@1@2@",
+">@,@'@)@y+!@~@{@Z+`+]@^@/@(@        _@:@<@[@}@O+P+Q+R+=@-@|@1@2@",
-"3@4@5@7+6@7@8@9@0@a@b@c@d@e@        f@g@h@i@j@Q+R+=@-@|@1@k@l@m@",
+"3@4@5@7+6@7@8@9@0@a@b@c@d@e@        f@g@h@i@j@Q+R+=@-@|@1@k@l@m@",
-"n@y+o@p@{@9@0@a@b@c@q@r@s@t@        u@v@i@w@Q+=@-@|@1@k@l@x@y@z@",
+"n@y+o@p@{@9@0@a@b@c@q@r@s@t@        u@v@i@w@Q+=@-@|@1@k@l@x@y@z@",
-"A@p@-+B@0@a@b@c@q@r@C@D@E@F@        G@H@I@J@K@L@M@N@O@P@Q@R@S@T@",
+"A@p@-+B@0@a@b@c@q@r@C@D@E@F@        G@H@I@J@K@L@M@N@O@P@Q@R@S@T@",
-"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@          `@ #.#+#@###$#%#&#*#=#=#  ",
+"U@7@4@V@b@c@q@r@C@D@W@X@Y@Z@          `@ #.#+#@###$#%#&#*#=#=#  ",
-"-#;#>#,#q@r@C@D@W@X@'#)#!#~#                                    ",
+"-#;#>#,#q@r@C@D@W@X@'#)#!#~#                                    ",
-"{#(@]#^#/#(#_#:#<#[#}#|#1#                                      ",
+"{#(@]#^#/#(#_#:#<#[#}#|#1#                                      ",
-"    2#3#4#5#6#7#8#9#1#0#                                        ",
+"    2#3#4#5#6#7#8#9#1#0#                                        ",
-"                                                                ",
+"                                                                ",
-"                                                                ",
+"                                                                ",
-"                                                                ",
+"                                                                ",
-"                                                                "};
+"                                                                "};

autoconf_inc.m4

@@ -1,62 +1,62 @@
-dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
-dnl Bakefile 0.2.12 (http://www.bakefile.org)
+dnl Bakefile 0.2.9 (http://www.bakefile.org)
 dnl Do not modify, all changes will be overwritten!
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.12"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_debug=""
     fi
     AC_SUBST(COND_BUILD_debug)
-dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_debug_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_release=""
     fi
     AC_SUBST(COND_BUILD_release)
-dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_release_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
-dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_FLAG_0="#"
     if test "x$DEBUG_FLAG" = "x0" ; then
         COND_DEBUG_FLAG_0=""
     fi
     AC_SUBST(COND_DEBUG_FLAG_0)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
     fi
     AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_1="#"
     if test "x$DEBUG_INFO" = "x1" ; then
         COND_DEBUG_INFO_1=""
     fi
     AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
         COND_DEPS_TRACKING_0=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
         COND_DEPS_TRACKING_1=""
@@ -74,7 +74,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_ICC_PCH_1=""
     fi
     AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
         COND_MONOLITHIC_0=""
@@ -146,19 +146,13 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_STC_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_0_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XML_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_XML_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XML" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_XML_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XML_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1=""
@@ -212,30 +206,24 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1[wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1="#"
+    COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" -a "x$USE_XML" = "x1" ; then
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1=""
+        COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
     fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1_USE_XML_1)
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_STC_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_STC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_STC" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XML_1[wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_XML_1="#"
+    COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XML" = "x1" ; then
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_XML_1=""
+        COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
     fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XML_1)
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XML" = "x1" -a "x$USE_XRC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XML_1_USE_XRC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_USE_AUI_1[wx.bkl] ###
     COND_MONOLITHIC_0_USE_AUI_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_AUI" = "x1" ; then
@@ -260,7 +248,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_MEDIA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
         COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -290,31 +278,25 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_RICHTEXT_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_RICHTEXT_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_RICHTEXT_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
     COND_MONOLITHIC_0_USE_STC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
         COND_MONOLITHIC_0_USE_WEBVIEW_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_XML_1[wx.bkl] ###
-    COND_MONOLITHIC_0_USE_XML_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_XML" = "x1" ; then
-        COND_MONOLITHIC_0_USE_XML_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_USE_XML_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
     COND_MONOLITHIC_0_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
         COND_MONOLITHIC_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
@@ -332,19 +314,19 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1_USE_STC_1="#"
     if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
         COND_MONOLITHIC_1_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_USE_STC_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -362,36 +344,60 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
+    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl] ###
     COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
         COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
     fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1)
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
@@ -422,7 +428,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[../../samples/ipc/ipc.bk
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
     COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
@@ -434,42 +440,72 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+    COND_PLATFORM_MAC_0="#"
+    if test "x$PLATFORM_MAC" = "x0" ; then
+        COND_PLATFORM_MAC_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_MAC_0)
+dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl] ###
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MAC_1)
+dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
+    COND_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MSDOS_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_MSDOS_0)
+dnl ### begin block 20_COND_PLATFORM_MSDOS_1[wx.bkl] ###
+    COND_PLATFORM_MSDOS_1="#"
+    if test "x$PLATFORM_MSDOS" = "x1" ; then
+        COND_PLATFORM_MSDOS_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MSDOS_1)
+dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_OS2_1="#"
     if test "x$PLATFORM_OS2" = "x1" ; then
         COND_PLATFORM_OS2_1=""
     fi
     AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_0="#"
     if test "x$PLATFORM_UNIX" = "x0" ; then
         COND_PLATFORM_UNIX_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
         COND_PLATFORM_UNIX_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -482,7 +518,7 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
         COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
         COND_PLATFORM_WIN32_0=""
@@ -494,13 +530,7 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bk
         COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
-    if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
-        COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
@@ -512,30 +542,30 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_1_SHARED_0[../../samples/dll/dll.bkl]
         COND_PLATFORM_WIN32_1_SHARED_0=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1_SHARED_0)
+dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
 dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
     if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
 dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
     if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
-    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_SHARED_0[wx.bkl] ###
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
@@ -554,6 +584,12 @@ dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/
         COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
     fi
     AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0)
+dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
+    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
@@ -602,18 +638,12 @@ dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
         COND_SHARED_0_wxUSE_ZLIB_builtin=""
     fi
     AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
-dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_SHARED_1="#"
     if test "x$SHARED" = "x1" ; then
         COND_SHARED_1=""
     fi
     AC_SUBST(COND_SHARED_1)
-dnl ### begin block 20_COND_SHARED_1_USE_GUI_1[../../tests/test.bkl] ###
-    COND_SHARED_1_USE_GUI_1="#"
-    if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
-        COND_SHARED_1_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_SHARED_1_USE_GUI_1)
 dnl ### begin block 20_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
     COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
@@ -626,12 +656,24 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
         COND_TOOLKIT_=""
     fi
     AC_SUBST(COND_TOOLKIT_)
-dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
         COND_TOOLKIT_COCOA=""
     fi
     AC_SUBST(COND_TOOLKIT_COCOA)
+dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_COCOA_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_DFB[wx.bkl] ###
     COND_TOOLKIT_DFB="#"
     if test "x$TOOLKIT" = "xDFB" ; then
@@ -674,6 +716,24 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx.
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1)
 dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
     COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
@@ -692,24 +752,12 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0[wx.
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_4="#"
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" ; then
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
     fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4)
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x4" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
     COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
@@ -728,7 +776,7 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_GTK_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
         COND_TOOLKIT_MAC=""
@@ -752,7 +800,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
@@ -770,13 +818,25 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_CARBON="#"
     if test "x$TOOLKIT" = "xOSX_CARBON" ; then
         COND_TOOLKIT_OSX_CARBON=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_CARBON)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_COCOA="#"
     if test "x$TOOLKIT" = "xOSX_COCOA" ; then
         COND_TOOLKIT_OSX_COCOA=""
@@ -788,19 +848,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
-    COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_WXUNIV_0[../../samples/widgets/widgets.bkl] ###
-    COND_TOOLKIT_OSX_COCOA_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OSX_COCOA_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OSX_COCOA_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
     COND_TOOLKIT_OSX_IPHONE="#"
     if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
         COND_TOOLKIT_OSX_IPHONE=""
@@ -818,18 +866,48 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_QT[wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
-    COND_TOOLKIT_QT="#"
+    COND_TOOLKIT_PM="#"
-    if test "x$TOOLKIT" = "xQT" ; then
+    if test "x$TOOLKIT" = "xPM" ; then
-        COND_TOOLKIT_QT=""
+        COND_TOOLKIT_PM=""
     fi
-    AC_SUBST(COND_TOOLKIT_QT)
+    AC_SUBST(COND_TOOLKIT_PM)
-dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1[wx.bkl] ###
-    COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
+    COND_TOOLKIT_PM_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
+        COND_TOOLKIT_PM_USE_GUI_1=""
     fi
-    AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
+    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_WINCE[wx.bkl] ###
+    COND_TOOLKIT_WINCE="#"
+    if test "x$TOOLKIT" = "xWINCE" ; then
+        COND_TOOLKIT_WINCE=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE)
+dnl ### begin block 20_COND_TOOLKIT_WINCE_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_WINCE_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_WINCE_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_WINCE_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_WINCE_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_WINCE_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
@@ -842,37 +920,49 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_X11_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
-dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1[wx.bkl] ###
+    COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1)
+dnl ### begin block 20_COND_TOOLKIT_X11_WXUNIV_1[wx.bkl] ###
+    COND_TOOLKIT_X11_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_X11_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_X11_WXUNIV_1)
+dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_CAIRO_1="#"
     if test "x$USE_CAIRO" = "x1" ; then
         COND_USE_CAIRO_1=""
     fi
     AC_SUBST(COND_USE_CAIRO_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_1="#"
     if test "x$USE_EXCEPTIONS" = "x1" ; then
         COND_USE_EXCEPTIONS_1=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""
     fi
     AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
         COND_USE_GUI_1=""
@@ -896,25 +986,25 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBTIFF_builtin)
-dnl ### begin block 20_COND_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl] ###
+dnl ### begin block 20_COND_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
     COND_USE_OPENGL_1="#"
     if test "x$USE_OPENGL" = "x1" ; then
         COND_USE_OPENGL_1=""
@@ -926,19 +1016,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_USE_PCH_1=""
     fi
     AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
         COND_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_0="#"
     if test "x$USE_RTTI" = "x0" ; then
         COND_USE_RTTI_0=""
     fi
     AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_1="#"
     if test "x$USE_RTTI" = "x1" ; then
         COND_USE_RTTI_1=""
@@ -986,31 +1076,19 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
         COND_USE_STC_1=""
     fi
     AC_SUBST(COND_USE_STC_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_0="#"
     if test "x$USE_THREADS" = "x0" ; then
         COND_USE_THREADS_0=""
     fi
     AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_1="#"
     if test "x$USE_THREADS" = "x1" ; then
         COND_USE_THREADS_1=""
     fi
     AC_SUBST(COND_USE_THREADS_1)
-dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[wx.bkl] ###
+dnl ### begin block 20_COND_USE_XRC_1[../../utils/execmon/execmon.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_USE_WEBVIEW_WEBKIT2_1="#"
-    if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
-        COND_USE_WEBVIEW_WEBKIT2_1=""
-    fi
-    AC_SUBST(COND_USE_WEBVIEW_WEBKIT2_1)
-dnl ### begin block 20_COND_USE_XML_1[../../utils/wxrc/wxrc.bkl,wx.bkl] ###
-    COND_USE_XML_1="#"
-    if test "x$USE_XML" = "x1" ; then
-        COND_USE_XML_1=""
-    fi
-    AC_SUBST(COND_USE_XML_1)
-dnl ### begin block 20_COND_USE_XRC_1[../../utils/execmon/execmon.bkl] ###
     COND_USE_XRC_1="#"
     if test "x$USE_XRC" = "x1" ; then
         COND_USE_XRC_1=""
@@ -1028,43 +1106,49 @@ dnl ### begin block 20_COND_WITH_PLUGIN_SDL_1[wx.bkl] ###
         COND_WITH_PLUGIN_SDL_1=""
     fi
     AC_SUBST(COND_WITH_PLUGIN_SDL_1)
-dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
+    COND_WXUNIV_0="#"
+    if test "x$WXUNIV" = "x0" ; then
+        COND_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_WXUNIV_0)
+dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_EXPAT_builtin="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_wxUSE_EXPAT_builtin=""
     fi
     AC_SUBST(COND_wxUSE_EXPAT_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBJPEG_builtin="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBPNG_builtin="#"
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBTIFF_builtin="#"
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_wxUSE_LIBTIFF_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
-dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_REGEX_builtin="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_wxUSE_REGEX_builtin=""
     fi
     AC_SUBST(COND_wxUSE_REGEX_builtin)
-dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_ZLIB_builtin="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
         COND_wxUSE_ZLIB_builtin=""

build/aclocal/ax_cxx_compile_stdcxx.m4

@@ -1,951 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
-#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 11
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual ~Base() {}
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual ~Derived() override {}
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201703L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-  namespace test_constexpr_lambdas
-  {
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-  namespace test_structured_bindings
-  {
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-
-  namespace test_exception_spec_type_system
-  {
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus < 201703L
-
-]])

build/aclocal/ax_func_which_gethostbyname_r.m4

@@ -1,74 +1,35 @@
-# ==================================================================================
+dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
-#  https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
+dnl
-# ==================================================================================
+dnl Determines which historical variant of the gethostbyname_r() call
-#
+dnl (taking three, five, or six arguments) is available on the system
-# SYNOPSIS
+dnl and defines one of the following macros accordingly:
-#
+dnl
-#   AX_FUNC_WHICH_GETHOSTBYNAME_R
+dnl   HAVE_FUNC_GETHOSTBYNAME_R_6
-#
+dnl   HAVE_FUNC_GETHOSTBYNAME_R_5
-# DESCRIPTION
+dnl   HAVE_FUNC_GETHOSTBYNAME_R_3
-#
+dnl
-#   Determines which historical variant of the gethostbyname_r() call
+dnl If used in conjunction with gethostname.c, the API demonstrated in
-#   (taking three, five, or six arguments) is available on the system and
+dnl test.c can be used regardless of which gethostbyname_r() is
-#   defines one of the following macros accordingly:
+dnl available. These example files can be found at
-#
+dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-#     HAVE_FUNC_GETHOSTBYNAME_R_6
+dnl
-#     HAVE_FUNC_GETHOSTBYNAME_R_5
+dnl based on David Arnold's autoconf suggestion in the threads faq
-#     HAVE_FUNC_GETHOSTBYNAME_R_3
+dnl
-#
+dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
-#   as well as
+dnl for Autoconf 2.5x by Daniel Richard G.
-#
+dnl
-#     HAVE_GETHOSTBYNAME_R
+dnl @category InstalledPackages
-#
+dnl @author Caolan McNamara <caolan@skynet.ie>
-#   If used in conjunction with gethostname.c, the API demonstrated in
+dnl @author Daniel Richard G. <skunk@iskunk.org>
-#   test.c can be used regardless of which gethostbyname_r() is available.
+dnl @version 2005-01-21
-#   These example files can be found at
+dnl @license GPLWithACException
-#   http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
-#
-#   based on David Arnold's autoconf suggestion in the threads faq
-#
-#   Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten for
-#   Autoconf 2.5x, and updated for 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Caolan McNamara <caolan@skynet.ie>
-#   Copyright (c) 2008 Daniel Richard G. <skunk@iskunk.org>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
 
 AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
 
-    AC_LANG_PUSH([C])
+    AC_LANG_PUSH(C)
     AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
 
-    AC_CACHE_VAL([ac_cv_func_which_gethostbyname_r], [
+    AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
 
 ################################################################
 
@@ -83,12 +44,16 @@ ac_cv_func_which_gethostbyname_r=unknown
 # netdb.h is not declaring the function, and the compiler is thereby
 # assuming an implicit prototype. In which case, we're out of luck.
 #
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
+AC_COMPILE_IFELSE(
-        [
+    [AC_LANG_PROGRAM(
+        [[#include <netdb.h>]],
+        [[
             char *name = "www.gnu.org";
             (void)gethostbyname_r(name) /* ; */
-        ])],
+        ]]
-    [ac_cv_func_which_gethostbyname_r=no])
+    )],
+    ac_cv_func_which_gethostbyname_r=no
+    )
 
 #
 # SIX ARGUMENTS
@@ -97,16 +62,20 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
+AC_COMPILE_IFELSE(
-        [
+    [AC_LANG_PROGRAM(
+        [[#include <netdb.h>]],
+        [[
             char *name = "www.gnu.org";
             struct hostent ret, *retp;
             char buf@<:@1024@:>@;
             int buflen = 1024;
             int my_h_errno;
             (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
-        ])],
+        ]]
-    [ac_cv_func_which_gethostbyname_r=six])
+    )],
+    ac_cv_func_which_gethostbyname_r=six
+    )
 
 fi
 
@@ -117,16 +86,20 @@ fi
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
+AC_COMPILE_IFELSE(
-        [
+    [AC_LANG_PROGRAM(
+	[[#include <netdb.h>]],
+        [[
             char *name = "www.gnu.org";
             struct hostent ret;
             char buf@<:@1024@:>@;
             int buflen = 1024;
             int my_h_errno;
             (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
-        ])],
+        ]]
-    [ac_cv_func_which_gethostbyname_r=five])
+    )],
+    ac_cv_func_which_gethostbyname_r=five
+    )
 
 fi
 
@@ -137,14 +110,18 @@ fi
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>],
+AC_COMPILE_IFELSE(
-        [
+    [AC_LANG_PROGRAM(
+        [[#include <netdb.h>]],
+        [[
             char *name = "www.gnu.org";
             struct hostent ret;
             struct hostent_data data;
             (void)gethostbyname_r(name, &ret, &data) /* ; */
-        ])],
+        ]]
-    [ac_cv_func_which_gethostbyname_r=three])
+    )],
+    ac_cv_func_which_gethostbyname_r=three
+    )
 
 fi
 
@@ -152,30 +129,20 @@ fi
 
 ]) dnl end AC_CACHE_VAL
 
-case "$ac_cv_func_which_gethostbyname_r" in
-    three|five|six)
-    AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1],
-              [Define to 1 if you have some form of gethostbyname_r().])
-    ;;
-esac
-
 case "$ac_cv_func_which_gethostbyname_r" in
     three)
     AC_MSG_RESULT([three])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_3], [1],
+    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
-              [Define to 1 if you have the three-argument form of gethostbyname_r().])
     ;;
 
     five)
     AC_MSG_RESULT([five])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_5], [1],
+    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
-              [Define to 1 if you have the five-argument form of gethostbyname_r().])
     ;;
 
     six)
     AC_MSG_RESULT([six])
-    AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_6], [1],
+    AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
-              [Define to 1 if you have the six-argument form of gethostbyname_r().])
     ;;
 
     no)
@@ -191,6 +158,6 @@ case "$ac_cv_func_which_gethostbyname_r" in
     ;;
 esac
 
-AC_LANG_POP
+AC_LANG_POP(C)
 
 ]) dnl end AC_DEFUN

build/aclocal/ax_subdirs_configure.m4

@@ -1,337 +0,0 @@
-# ===========================================================================
-#   https://www.gnu.org/software/autoconf-archive/ax_subdirs_configure.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_SUBDIRS_CONFIGURE( [subdirs], [mandatory arguments], [possibly merged arguments], [replacement arguments], [forbidden arguments])
-#
-# DESCRIPTION
-#
-#   AX_SUBDIRS_CONFIGURE attempts to be the equivalent of AC_CONFIG_SUBDIRS
-#   with customizable options for configure scripts.
-#
-#   Run the configure script for each directory from the comma-separated m4
-#   list 'subdirs'. This macro can be used multiple times. All arguments of
-#   this macro must be comma-separated lists.
-#
-#   All command line arguments from the parent configure script will be
-#   given to the subdirectory configure script after the following
-#   modifications (in that order):
-#
-#   1. The arguments from the 'mandatory arguments' list shall always be
-#   appended to the argument list.
-#
-#   2. The arguments from the 'possibly merged arguments' list shall be
-#   added if not present in the arguments of the parent configure script or
-#   merged with the existing argument otherwise.
-#
-#   3. The arguments from the 'replacement arguments' list shall be added if
-#   not present in the arguments of the parent configure script or replace
-#   the existing argument otherwise.
-#
-#   4. The arguments from the 'forbidden arguments' list shall always be
-#   removed from the argument list.
-#
-#   The lists 'mandatory arguments' and 'forbidden arguments' can hold any
-#   kind of argument. The 'possibly merged arguments' and 'replacement
-#   arguments' expect their arguments to be of the form --option-name=value.
-#
-#   This macro aims to remain as close as possible to the AC_CONFIG_SUBDIRS
-#   macro. It corrects the paths for '--cache-file' and '--srcdir' and adds
-#   '--disable-option-checking' and '--silent' if necessary.
-#
-#   This macro also sets the output variable subdirs_extra to the list of
-#   directories recorded with AX_SUBDIRS_CONFIGURE. This variable can be
-#   used in Makefile rules or substituted in configured files.
-#
-#   This macro shall do nothing more than managing the arguments of the
-#   configure script. Just like when using AC_CONFIG_SUBDIRS, it is up to
-#   the user to check any requirements or define and substitute any required
-#   variable for the remainder of the project.
-#
-#   Configure scripts recorded with AX_SUBDIRS_CONFIGURE may be executed
-#   before configure scripts recorded with AC_CONFIG_SUBDIRS.
-#
-#   Without additional arguments, the behaviour of AX_SUBDIRS_CONFIGURE
-#   should be identical to the behaviour of AC_CONFIG_SUBDIRS, apart from
-#   the contents of the variables subdirs and subdirs_extra (except that
-#   AX_SUBDIRS_CONFIGURE expects a comma-separated m4 list):
-#
-#     AC_CONFIG_SUBDIRS([something])
-#     AX_SUBDIRS_CONFIGURE([something])
-#
-#   This macro may be called multiple times.
-#
-#   Usage example:
-#
-#   Let us assume our project has 4 dependencies, namely A, B, C and D. Here
-#   are some characteristics of our project and its dependencies:
-#
-#   - A does not require any special option.
-#
-#   - we want to build B with an optional feature which can be enabled with
-#   its configure script's option '--enable-special-feature'.
-#
-#   - B's configure script is strange and has an option '--with-B=build'.
-#   After close inspection of its documentation, we don't want B to receive
-#   this option.
-#
-#   - C and D both need B.
-#
-#   - Just like our project, C and D can build B themselves with the option
-#   '--with-B=build'.
-#
-#   - We want C and D to use the B we build instead of building it
-#   themselves.
-#
-#   Our top-level configure script will be called as follows:
-#
-#     $ <path/to/configure> --with-A=build --with-B=build --with-C=build \
-#       --with-D=build --some-option
-#
-#   Thus we have to make sure that:
-#
-#   - neither B, C or D receive the option '--with-B=build'
-#
-#   - C and D know where to find the headers and libraries of B.
-#
-#   Under those conditions, we can use the AC_CONFIG_SUBDIRS macro for A,
-#   but need to use AX_SUBDIRS_CONFIGURE for B, C and D:
-#
-#   - B must receive '--enable-special-feature' but cannot receive
-#   '--with-B=build'
-#
-#   - C and D cannot receive '--with-B=build' (or else it would be built
-#   thrice) and need to be told where to find B (since we are building it,
-#   it would probably not be available in standard paths).
-#
-#   Here is a configure.ac snippet that solves our problem:
-#
-#     AC_CONFIG_SUBDIRS([dependencies/A])
-#     AX_SUBDIRS_CONFIGURE(
-#         [dependencies/B], [--enable-special-feature], [], [],
-#         [--with-B=build])
-#     AX_SUBDIRS_CONFIGURE(
-#         [[dependencies/C],[dependencies/D]],
-#         [],
-#         [[CPPFLAGS=-I${ac_top_srcdir}/dependencies/B -I${ac_top_builddir}/dependencies/B],
-#          [LDFLAGS=-L${ac_abs_top_builddir}/dependencies/B/.libs]],
-#         [--with-B=system],
-#         [])
-#
-#   If using automake, the following can be added to the Makefile.am (we use
-#   both $(subdirs) and $(subdirs_extra) since our example above used both
-#   AC_CONFIG_SUBDIRS and AX_SUBDIRS_CONFIGURE):
-#
-#     SUBDIRS = $(subdirs) $(subdirs_extra)
-#
-# LICENSE
-#
-#   Copyright (c) 2017 Harenome Ranaivoarivony-Razanajato <ranaivoarivony-razanajato@hareno.me>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   Under Section 7 of GPL version 3, you are granted additional permissions
-#   described in the Autoconf Configure Script Exception, version 3.0, as
-#   published by the Free Software Foundation.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#serial 5
-
-AC_DEFUN([AX_SUBDIRS_CONFIGURE],
-[
-  dnl Calls to AC_CONFIG_SUBDIRS perform preliminary steps and build a list
-  dnl '$subdirs' which is used later by _AC_OUTPUT_SUBDIRS (used by AC_OUTPUT)
-  dnl to actually run the configure scripts.
-  dnl This macro performs similar preliminary steps but uses
-  dnl AC_CONFIG_COMMANDS_PRE to delay the final tasks instead of building an
-  dnl intermediary list and relying on another macro.
-  dnl
-  dnl Since each configure script can get different options, a special variable
-  dnl named 'ax_sub_configure_args_<subdir>' is constructed for each
-  dnl subdirectory.
-
-  # Various preliminary checks.
-  AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])
-  AS_LITERAL_IF([$1], [],
-      [AC_DIAGNOSE([syntax], [$0: you should use literals])])
-
-  m4_foreach(subdir_path, [$1],
-  [
-    ax_dir="subdir_path"
-
-    dnl Build the argument list in a similar fashion to AC_CONFIG_SUBDIRS.
-    dnl A few arguments found in the final call to the configure script are not
-    dnl added here because they rely on variables that may not yet be available
-    dnl (see below the part that is similar to _AC_OUTPUT_SUBDIRS).
-    # Do not complain, so a configure script can configure whichever parts of a
-    # large source tree are present.
-    if test -d "$srcdir/$ax_dir"; then
-      _AC_SRCDIRS(["$ax_dir"])
-      # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-      # so they do not pile up.
-      ax_args=
-      ax_prev=
-      eval "set x $ac_configure_args"
-      shift
-      for ax_arg; do
-        if test -n "$ax_prev"; then
-          ax_prev=
-          continue
-        fi
-        case $ax_arg in
-          -cache-file | --cache-file | --cache-fil | --cache-fi | --cache-f \
-          | --cache- | --cache | --cach | --cac | --ca | --c)
-            ax_prev=cache_file ;;
-          -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-          | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-          | --c=*)
-            ;;
-          --config-cache | -C)
-            ;;
-          -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-            ax_prev=srcdir ;;
-          -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-            ;;
-          -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-            ax_prev=prefix ;;
-          -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* \
-          | --p=*)
-            ;;
-          --disable-option-checking)
-            ;;
-          *) case $ax_arg in
-              *\'*) ax_arg=$(AS_ECHO(["$ax_arg"]) | sed "s/'/'\\\\\\\\''/g");;
-            esac
-            AS_VAR_APPEND([ax_args], [" '$ax_arg'"]) ;;
-        esac
-      done
-      # Always prepend --disable-option-checking to silence warnings, since
-      # different subdirs can have different --enable and --with options.
-      ax_args="--disable-option-checking $ax_args"
-      # Options that must be added as they are provided.
-      m4_ifnblank([$2], [m4_foreach(opt, [$2], [AS_VAR_APPEND(ax_args, " 'opt'")
-      ])])
-      # New options that may need to be merged with existing options.
-      m4_ifnblank([$3], [m4_foreach(opt, [$3],
-          [ax_candidate="opt"
-           ax_candidate_flag="${ax_candidate%%=*}"
-           ax_candidate_content="${ax_candidate#*=}"
-           if test "x$ax_candidate" != "x" -a "x$ax_candidate_flag" != "x"; then
-             if echo "$ax_args" | grep -- "${ax_candidate_flag}=" >/dev/null 2>&1; then
-               [ax_args=$(echo $ax_args | sed "s,\(${ax_candidate_flag}=[^']*\),\1 ${ax_candidate_content},")]
-             else
-               AS_VAR_APPEND(ax_args, " 'opt'")
-             fi
-           fi
-      ])])
-      # New options that must replace existing options.
-      m4_ifnblank([$4], [m4_foreach(opt, [$4],
-          [ax_candidate="opt"
-           ax_candidate_flag="${ax_candidate%%=*}"
-           ax_candidate_content="${ax_candidate#*=}"
-           if test "x$ax_candidate" != "x" -a "x$ax_candidate_flag" != "x"; then
-             if echo "$ax_args" | grep -- "${ax_candidate_flag}=" >/dev/null 2>&1; then
-               [ax_args=$(echo $ax_args | sed "s,${ax_candidate_flag}=[^']*,${ax_candidate},")]
-             else
-               AS_VAR_APPEND(ax_args, " 'opt'")
-             fi
-           fi
-      ])])
-      # Options that must be removed.
-      m4_ifnblank([$5], [m4_foreach(opt, [$5], [ax_args=$(echo $ax_args | sed "s,'opt',,")
-      ])])
-      AS_VAR_APPEND([ax_args], [" '--srcdir=$ac_srcdir'"])
-
-      # Add the subdirectory to the list of target subdirectories.
-      ax_subconfigures="$ax_subconfigures $ax_dir"
-      # Save the argument list for this subdirectory.
-      dnl $1 is a path to some subdirectory: m4_bpatsubsts() is used to convert
-      dnl $1 into a valid shell variable name.
-      dnl For instance, "ax_sub_configure_args_path/to/subdir" becomes
-      dnl "ax_sub_configure_args_path_to_subdir".
-      ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_")
-      eval "ax_sub_configure_args_$ax_var=\"$ax_args\""
-      eval "ax_sub_configure_$ax_var=\"yes\""
-    else
-      AC_MSG_WARN([could not find source tree for $ax_dir])
-    fi
-
-    dnl Add some more arguments to the argument list and then actually run the
-    dnl configure script. This is mostly what happens in _AC_OUTPUT_SUBDIRS
-    dnl except it does not iterate over an intermediary list.
-    AC_CONFIG_COMMANDS_PRE(
-      dnl This very line cannot be quoted! m4_foreach has some work here.
-      ax_dir="subdir_path"
-    [
-      # Convert the path to the subdirectory into a shell variable name.
-      ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_")
-      ax_configure_ax_var=$(eval "echo \"\$ax_sub_configure_$ax_var\"")
-      if test "$no_recursion" != "yes" -a "x$ax_configure_ax_var" = "xyes"; then
-        AC_SUBST([subdirs_extra], ["$subdirs_extra $ax_dir"])
-        ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)"
-        _AS_ECHO_LOG([$ax_msg])
-        _AS_ECHO([$ax_msg])
-        AS_MKDIR_P(["$ax_dir"])
-        _AC_SRCDIRS(["$ax_dir"])
-
-        ax_popdir=$(pwd)
-        cd "$ax_dir"
-
-        # Check for guested configure; otherwise get Cygnus style configure.
-        if test -f "$ac_srcdir/configure.gnu"; then
-          ax_sub_configure=$ac_srcdir/configure.gnu
-        elif test -f "$ac_srcdir/configure"; then
-          ax_sub_configure=$ac_srcdir/configure
-        elif test -f "$ac_srcdir/configure.in"; then
-          # This should be Cygnus configure.
-          ax_sub_configure=$ac_aux_dir/configure
-        else
-          AC_MSG_WARN([no configuration information is in $ax_dir])
-          ax_sub_configure=
-        fi
-
-        if test -n "$ax_sub_configure"; then
-          # Get the configure arguments for the current configure.
-          eval "ax_sub_configure_args=\"\$ax_sub_configure_args_${ax_var}\""
-
-          # Always prepend --prefix to ensure using the same prefix
-          # in subdir configurations.
-          ax_arg="--prefix=$prefix"
-          case $ax_arg in
-            *\'*) ax_arg=$(AS_ECHO(["$ax_arg"]) | sed "s/'/'\\\\\\\\''/g");;
-          esac
-          ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args"
-          if test "$silent" = yes; then
-            ax_sub_configure_args="--silent $ax_sub_configure_args"
-          fi
-          # Make the cache file name correct relative to the subdirectory.
-          case $cache_file in
-            [[\\/]]* | ?:[[\\/]]* )
-              ax_sub_cache_file=$cache_file ;;
-            *) # Relative name.
-              ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-          esac
-
-          AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file])
-          eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \
-              || AC_MSG_ERROR([$ax_sub_configure failed for $ax_dir])
-        fi
-
-        cd "$ax_popdir"
-      fi
-    ])
-  ])
-])

build/aclocal/bakefile-dllar.m4

@@ -0,0 +1,483 @@
+AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
+[
+dnl ===================== dllar.sh begins here =====================
+dnl    (Created by merge-scripts.py from dllar.sh
+dnl     file do not edit here!)
+D='$'
+cat <<EOF >dllar.sh
+#!/bin/sh
+#
+# dllar - a tool to build both a .dll and an .a file
+# from a set of object (.o) files for EMX/OS2.
+#
+#  Written by Andrew Zabolotny, bit@freya.etu.ru
+#  Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
+#
+#  This script will accept a set of files on the command line.
+#  All the public symbols from the .o files will be exported into
+#  a .DEF file, then linker will be run (through gcc) against them to
+#  build a shared library consisting of all given .o files. All libraries
+#  (.a) will be first decompressed into component .o files then act as
+#  described above. You can optionally give a description (-d "description")
+#  which will be put into .DLL. To see the list of accepted options (as well
+#  as command-line format) simply run this program without options. The .DLL
+#  is built to be imported by name (there is no guarantee that new versions
+#  of the library you build will have same ordinals for same symbols).
+#
+#  dllar is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  dllar is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with dllar; see the file COPYING.  If not, write to the Free
+#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+#  02111-1307, USA.
+
+# To successfuly run this program you will need:
+#  - Current drive should have LFN support (HPFS, ext2, network, etc)
+#    (Sometimes dllar generates filenames which won't fit 8.3 scheme)
+#  - gcc
+#    (used to build the .dll)
+#  - emxexp
+#    (used to create .def file from .o files)
+#  - emximp
+#    (used to create .a file from .def file)
+#  - GNU text utilites (cat, sort, uniq)
+#    used to process emxexp output
+#  - GNU file utilities (mv, rm)
+#  - GNU sed
+#  - lxlite (optional, see flag below)
+#    (used for general .dll cleanup)
+#
+
+flag_USE_LXLITE=1;
+
+#
+# helper functions
+# basnam, variant of basename, which does _not_ remove the path, _iff_
+#                              second argument (suffix to remove) is given
+basnam(){
+    case ${D}# in
+    1)
+        echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
+        ;;
+    2)
+        echo ${D}1 | sed 's/'${D}2'${D}//'
+        ;;
+    *)
+        echo "error in basnam ${D}*"
+        exit 8
+        ;;
+    esac
+}
+
+# Cleanup temporary files and output
+CleanUp() {
+    cd ${D}curDir
+    for i in ${D}inputFiles ; do
+        case ${D}i in
+        *!)
+            rm -rf \`basnam ${D}i !\`
+            ;;
+        *)
+            ;;
+        esac
+    done
+
+    # Kill result in case of failure as there is just to many stupid make/nmake
+    # things out there which doesn't do this.
+    if @<:@ ${D}# -eq 0 @:>@; then
+        rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
+    fi
+}
+
+# Print usage and exit script with rc=1.
+PrintHelp() {
+ echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
+ echo '       @<:@-name-mangler-script script.sh@:>@'
+ echo '       @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
+ echo '       @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
+ echo '       @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
+ echo '       @<:@*.o@:>@ @<:@*.a@:>@'
+ echo '*> "output_file" should have no extension.'
+ echo '   If it has the .o, .a or .dll extension, it is automatically removed.'
+ echo '   The import library name is derived from this and is set to "name".a,'
+ echo '   unless overridden by -import'
+ echo '*> "importlib_name" should have no extension.'
+ echo '   If it has the .o, or .a extension, it is automatically removed.'
+ echo '   This name is used as the import library name and may be longer and'
+ echo '   more descriptive than the DLL name which has to follow the old '
+ echo '   8.3 convention of FAT.'
+ echo '*> "script.sh may be given to override the output_file name by a'
+ echo '   different name. It is mainly useful if the regular make process'
+ echo '   of some package does not take into account OS/2 restriction of'
+ echo '   DLL name lengths. It takes the importlib name as input and is'
+ echo '   supposed to procude a shorter name as output. The script should'
+ echo '   expect to get importlib_name without extension and should produce'
+ echo '   a (max.) 8 letter name without extension.'
+ echo '*> "cc" is used to use another GCC executable.   (default: gcc.exe)'
+ echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
+ echo '   These flags will be put at the start of GCC command line.'
+ echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
+ echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
+ echo '   multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
+ echo '   If the last character of a symbol is "*", all symbols beginning'
+ echo '   with the prefix before "*" will be exclude, (see _GLOBAL* above).'
+ echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
+ echo '   TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
+ echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
+ echo '   C runtime DLLs.'
+ echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
+ echo '*> All other switches (for example -L./ or -lmylib) will be passed'
+ echo '   unchanged to GCC at the end of command line.'
+ echo '*> If you create a DLL from a library and you do not specify -o,'
+ echo '   the basename for DLL and import library will be set to library name,'
+ echo '   the initial library will be renamed to 'name'_s.a (_s for static)'
+ echo '   i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
+ echo '   library will be renamed into gcc_s.a.'
+ echo '--------'
+ echo 'Example:'
+ echo '   dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
+ echo '    -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
+ CleanUp
+ exit 1
+}
+
+# Execute a command.
+# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
+# @Uses    Whatever CleanUp() uses.
+doCommand() {
+    echo "${D}*"
+    eval ${D}*
+    rcCmd=${D}?
+
+    if @<:@ ${D}rcCmd -ne 0 @:>@; then
+        echo "command failed, exit code="${D}rcCmd
+        CleanUp
+        exit ${D}rcCmd
+    fi
+}
+
+# main routine
+# setup globals
+cmdLine=${D}*
+outFile=""
+outimpFile=""
+inputFiles=""
+renameScript=""
+description=""
+CC=gcc.exe
+CFLAGS="-s -Zcrtdll"
+EXTRA_CFLAGS=""
+EXPORT_BY_ORDINALS=0
+exclude_symbols=""
+library_flags=""
+curDir=\`pwd\`
+curDirS=curDir
+case ${D}curDirS in
+*/)
+  ;;
+*)
+  curDirS=${D}{curDirS}"/"
+  ;;
+esac
+# Parse commandline
+libsToLink=0
+omfLinking=0
+while @<:@ ${D}1 @:>@; do
+    case ${D}1 in
+    -ord*)
+        EXPORT_BY_ORDINALS=1;
+        ;;
+    -o*)
+	shift
+        outFile=${D}1
+	;;
+    -i*)
+        shift
+        outimpFile=${D}1
+        ;;
+    -name-mangler-script)
+        shift
+        renameScript=${D}1
+        ;;
+    -d*)
+        shift
+        description=${D}1
+        ;;
+    -f*)
+        shift
+        CFLAGS=${D}1
+        ;;
+    -c*)
+        shift
+        CC=${D}1
+        ;;
+    -h*)
+        PrintHelp
+        ;;
+    -ex*)
+        shift
+        exclude_symbols=${D}{exclude_symbols}${D}1" "
+        ;;
+    -libf*)
+        shift
+        library_flags=${D}{library_flags}${D}1" "
+        ;;
+    -nocrt*)
+        CFLAGS="-s"
+        ;;
+    -nolxl*)
+        flag_USE_LXLITE=0
+        ;;
+    -* | /*)
+        case ${D}1 in
+        -L* | -l*)
+            libsToLink=1
+            ;;
+        -Zomf)
+            omfLinking=1
+            ;;
+        *)
+            ;;
+        esac
+        EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+        ;;
+    *.dll)
+        EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
+        if @<:@ ${D}omfLinking -eq 1 @:>@; then
+            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
+	else
+            EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
+        fi
+        ;;
+    *)
+        found=0;
+        if @<:@ ${D}libsToLink -ne 0 @:>@; then
+            EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+        else
+            for file in ${D}1 ; do
+                if @<:@ -f ${D}file @:>@; then
+                    inputFiles="${D}{inputFiles} ${D}file"
+                    found=1
+                fi
+            done
+            if @<:@ ${D}found -eq 0 @:>@; then
+                echo "ERROR: No file(s) found: "${D}1
+                exit 8
+            fi
+        fi
+      ;;
+    esac
+    shift
+done # iterate cmdline words
+
+#
+if @<:@ -z "${D}inputFiles" @:>@; then
+    echo "dllar: no input files"
+    PrintHelp
+fi
+
+# Now extract all .o files from .a files
+newInputFiles=""
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *.a | *.lib)
+        case ${D}file in
+        *.a)
+            suffix=".a"
+            AR="ar"
+            ;;
+        *.lib)
+            suffix=".lib"
+            AR="emxomfar"
+            EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
+            ;;
+        *)
+            ;;
+        esac
+        dirname=\`basnam ${D}file ${D}suffix\`"_%"
+        mkdir ${D}dirname
+        if @<:@ ${D}? -ne 0 @:>@; then
+            echo "Failed to create subdirectory ./${D}dirname"
+            CleanUp
+            exit 8;
+        fi
+        # Append '!' to indicate archive
+        newInputFiles="${D}newInputFiles ${D}{dirname}!"
+        doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
+        cd ${D}curDir
+        found=0;
+        for subfile in ${D}dirname/*.o* ; do
+            if @<:@ -f ${D}subfile @:>@; then
+                found=1
+                if @<:@ -s ${D}subfile @:>@; then
+	            # FIXME: This should be: is file size > 32 byte, _not_ > 0!
+                    newInputFiles="${D}newInputFiles ${D}subfile"
+                fi
+            fi
+        done
+        if @<:@ ${D}found -eq 0 @:>@; then
+            echo "WARNING: there are no files in archive \\'${D}file\\'"
+        fi
+        ;;
+    *)
+        newInputFiles="${D}{newInputFiles} ${D}file"
+        ;;
+    esac
+done
+inputFiles="${D}newInputFiles"
+
+# Output filename(s).
+do_backup=0;
+if @<:@ -z ${D}outFile @:>@; then
+    do_backup=1;
+    set outFile ${D}inputFiles; outFile=${D}2
+fi
+
+# If it is an archive, remove the '!' and the '_%' suffixes
+case ${D}outFile in
+*_%!)
+    outFile=\`basnam ${D}outFile _%!\`
+    ;;
+*)
+    ;;
+esac
+case ${D}outFile in
+*.dll)
+    outFile=\`basnam ${D}outFile .dll\`
+    ;;
+*.DLL)
+    outFile=\`basnam ${D}outFile .DLL\`
+    ;;
+*.o)
+    outFile=\`basnam ${D}outFile .o\`
+    ;;
+*.obj)
+    outFile=\`basnam ${D}outFile .obj\`
+    ;;
+*.a)
+    outFile=\`basnam ${D}outFile .a\`
+    ;;
+*.lib)
+    outFile=\`basnam ${D}outFile .lib\`
+    ;;
+*)
+    ;;
+esac
+case ${D}outimpFile in
+*.a)
+    outimpFile=\`basnam ${D}outimpFile .a\`
+    ;;
+*.lib)
+    outimpFile=\`basnam ${D}outimpFile .lib\`
+    ;;
+*)
+    ;;
+esac
+if @<:@ -z ${D}outimpFile @:>@; then
+    outimpFile=${D}outFile
+fi
+defFile="${D}{outFile}.def"
+arcFile="${D}{outimpFile}.a"
+arcFile2="${D}{outimpFile}.lib"
+
+#create ${D}dllFile as something matching 8.3 restrictions,
+if @<:@ -z ${D}renameScript @:>@ ; then
+    dllFile="${D}outFile"
+else
+    dllFile=\`${D}renameScript ${D}outimpFile\`
+fi
+
+if @<:@ ${D}do_backup -ne 0 @:>@ ; then
+    if @<:@ -f ${D}arcFile @:>@ ; then
+        doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
+    fi
+    if @<:@ -f ${D}arcFile2 @:>@ ; then
+        doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
+    fi
+fi
+
+# Extract public symbols from all the object files.
+tmpdefFile=${D}{defFile}_%
+rm -f ${D}tmpdefFile
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *!)
+        ;;
+    *)
+        doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
+        ;;
+    esac
+done
+
+# Create the def file.
+rm -f ${D}defFile
+echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
+dllFile="${D}{dllFile}.dll"
+if @<:@ ! -z ${D}description @:>@; then
+    echo "DESCRIPTION  \\"${D}{description}\\"" >> ${D}defFile
+fi
+echo "EXPORTS" >> ${D}defFile
+
+doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
+grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
+
+# Checks if the export is ok or not.
+for word in ${D}exclude_symbols; do
+    grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
+    mv ${D}{tmpdefFile}% ${D}tmpdefFile
+done
+
+
+if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+    sed "=" < ${D}tmpdefFile | \\
+    sed '
+      N
+      : loop
+      s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
+      t loop
+    ' > ${D}{tmpdefFile}%
+    grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
+else
+    rm -f ${D}{tmpdefFile}%
+fi
+cat ${D}tmpdefFile >> ${D}defFile
+rm -f ${D}tmpdefFile
+
+# Do linking, create implib, and apply lxlite.
+gccCmdl="";
+for file in ${D}inputFiles ; do
+    case ${D}file in
+    *!)
+        ;;
+    *)
+        gccCmdl="${D}gccCmdl ${D}file"
+        ;;
+    esac
+done
+doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
+touch "${D}{outFile}.dll"
+
+doCommand "emximp -o ${D}arcFile ${D}defFile"
+if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
+    add_flags="";
+    if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+        add_flags="-ynd"
+    fi
+    doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
+fi
+doCommand "emxomf -s -l ${D}arcFile"
+
+# Successful exit.
+CleanUp 1
+exit 0
+EOF
+dnl ===================== dllar.sh ends here =====================
+])

build/aclocal/bakefile-lang.m4

@@ -87,6 +87,17 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
     AC_LANG_POP($2)
 ])
 
+dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
+AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
+[
+    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
+[
+    _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
+])
+
 dnl IBM xlC compiler defines __xlC__ for both C and C++
 AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
 [
@@ -179,6 +190,46 @@ AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
     _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
 ])
 
+dnl ===========================================================================
+dnl macros to detect specialty compiler options
+dnl ===========================================================================
+
+dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
+AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
+[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
+dnl First create an empty conf test
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+dnl Now remove .o and .c.o or .cc.o
+rm -f conftest.$ac_objext conftest.$ac_ext.o
+dnl Now compile the test
+AS_IF([AC_TRY_EVAL(ac_compile)],
+dnl If the test succeeded look for conftest.c.o or conftest.cc.o
+[for ac_file in `(ls conftest.* 2>/dev/null)`; do
+    case $ac_file in
+        conftest.$ac_ext.o)
+            bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
+            ;;
+        *)
+            ;;
+    esac
+done],
+[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
+]) dnl AS_IF
+
+rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
+]) dnl AC_CACHE_CHECK
+
+if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
+    if test "[]_AC_LANG_ABBREV[]" = "c"; then
+        CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
+    fi
+    if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
+        CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
+    fi
+fi
+]) dnl AC_DEFUN
+
+
 dnl ===========================================================================
 dnl Macros to do all of the compiler detections as one macro
 dnl ===========================================================================
@@ -202,6 +253,14 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
 
     dnl if we're using gcc, we can't be using any of incompatible compilers
     if test "x$G$1" != "xyes"; then
+        if test "x$1" = "xC"; then
+            AC_BAKEFILE_METROWERKS_EXTO
+            if test "x$bakefile_cv_c_exto" '!=' "x"; then
+                unset ac_cv_prog_cc_g
+                _AC_PROG_CC_G
+            fi
+        fi
+
         dnl most of these compilers are only used under well-defined OS so
         dnl don't waste time checking for them on other ones
         case `uname -s` in
@@ -210,7 +269,10 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
                 ;;
 
             Darwin)
-                AC_BAKEFILE_PROG_XL$1
+                AC_BAKEFILE_PROG_MW$1
+                if test "$MW$1" != "yes"; then
+                    AC_BAKEFILE_PROG_XL$1
+                fi
                 ;;
 
             IRIX*)

build/aclocal/bakefile.m4

@@ -27,7 +27,7 @@ dnl
 
 dnl ---------------------------------------------------------------------------
 dnl Lots of compiler & linker detection code contained here was taken from
-dnl wxWidgets configure.in script (see https://www.wxwidgets.org)
+dnl wxWidgets configure.in script (see http://www.wxwidgets.org)
 dnl ---------------------------------------------------------------------------
 
 
@@ -69,16 +69,24 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
 [
     PLATFORM_UNIX=0
     PLATFORM_WIN32=0
+    PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOS=0
     PLATFORM_MACOSX=0
+    PLATFORM_OS2=0
     PLATFORM_BEOS=0
 
     if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
         case "${BAKEFILE_HOST}" in
-            *-*-mingw* )
+            *-*-mingw32* )
                 PLATFORM_WIN32=1
             ;;
+            *-pc-msdosdjgpp )
+                PLATFORM_MSDOS=1
+            ;;
+            *-pc-os2_emx | *-pc-os2-emx )
+                PLATFORM_OS2=1
+            ;;
             *-*-darwin* )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -99,6 +107,12 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
             win32 )
                 PLATFORM_WIN32=1
             ;;
+            msdos )
+                PLATFORM_MSDOS=1
+            ;;
+            os2 )
+                PLATFORM_OS2=1
+            ;;
             darwin )
                 PLATFORM_MAC=1
                 PLATFORM_MACOSX=1
@@ -117,9 +131,11 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
 
     AC_SUBST(PLATFORM_UNIX)
     AC_SUBST(PLATFORM_WIN32)
+    AC_SUBST(PLATFORM_MSDOS)
     AC_SUBST(PLATFORM_MAC)
     AC_SUBST(PLATFORM_MACOS)
     AC_SUBST(PLATFORM_MACOSX)
+    AC_SUBST(PLATFORM_OS2)
     AC_SUBST(PLATFORM_BEOS)
 ])
 
@@ -132,6 +148,10 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
 [
+    AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf],
+                                        [use OMF object format (OS/2)]),
+                  [bk_os2_use_omf="$enableval"])
+
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
         dnl For Unix to MacOS X porting instructions, see:
@@ -146,6 +166,19 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
         fi
         ;;
 
+      *-pc-os2_emx | *-pc-os2-emx )
+        if test "x$bk_os2_use_omf" = "xyes" ; then
+            AR=emxomfar
+            RANLIB=:
+            LDFLAGS="-Zomf $LDFLAGS"
+            CFLAGS="-Zomf $CFLAGS"
+            CXXFLAGS="-Zomf $CXXFLAGS"
+            OS2_LIBEXT="lib"
+        else
+            OS2_LIBEXT="a"
+        fi
+        ;;
+
       i*86-*-beos* )
         LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS"
         ;;
@@ -197,7 +230,7 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
             DLLPREFIX="cyg"
             dlldir="$bindir"
         ;;
-        *-*-mingw* )
+        *-*-mingw32* )
             SO_SUFFIX="dll"
             SO_SUFFIX_MODULE="dll"
             DLLIMP_SUFFIX="dll.a"
@@ -205,6 +238,21 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
             DLLPREFIX=""
             dlldir="$bindir"
         ;;
+        *-pc-msdosdjgpp )
+            EXEEXT=".exe"
+            DLLPREFIX=""
+            dlldir="$bindir"
+        ;;
+        *-pc-os2_emx | *-pc-os2-emx )
+            SO_SUFFIX="dll"
+            SO_SUFFIX_MODULE="dll"
+            DLLIMP_SUFFIX=$OS2_LIBEXT
+            EXEEXT=".exe"
+            DLLPREFIX=""
+            LIBPREFIX=""
+            LIBEXT=".$OS2_LIBEXT"
+            dlldir="$bindir"
+        ;;
         *-*-darwin* )
             SO_SUFFIX="dylib"
             SO_SUFFIX_MODULE="bundle"
@@ -282,13 +330,48 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       *-*-darwin* )
-        SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+        AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH
-        SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
+        chmod +x shared-ld-sh
 
-        SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
 
-        if test "x$GCC" = "xyes"; then
+        dnl Most apps benefit from being fully binded (its faster and static
+        dnl variables initialized at startup work).
+        dnl This can be done either with the exe linker flag -Wl,-bind_at_load
+        dnl or with a double stage link in order to create a single module
+        dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
+
+        dnl If using newer dev tools then there is a -single_module flag that
+        dnl we can use to do this for dylibs, otherwise we'll need to use a helper
+        dnl script.  Check the version of gcc to see which way we can go:
+        AC_CACHE_CHECK([for gcc 3.1 or later], bakefile_cv_gcc31, [
+           AC_TRY_COMPILE([],
+               [
+                   #if (__GNUC__ < 3) || \
+                       ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
+                       This is old gcc
+                   #endif
+               ],
+               [
+                   bakefile_cv_gcc31=yes
+               ],
+               [
+                   bakefile_cv_gcc31=no
+               ]
+           )
+        ])
+        if test "$bakefile_cv_gcc31" = "no"; then
+            dnl Use the shared-ld-sh helper script
+            SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
+            SHARED_LD_CXX="$SHARED_LD_CC"
+        else
+            dnl Use the -single_module flag and let the linker do it for us
+            SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+            SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+        fi
+
+        if test "x$GCC" == "xyes"; then
             PIC_FLAG="-dynamic -fPIC"
         fi
         if test "x$XLCC" = "xyes"; then
@@ -342,20 +425,29 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         fi
       ;;
 
-      *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
+      *-*-cygwin* | *-*-mingw32* )
         PIC_FLAG=""
         SHARED_LD_CC="\$(CC) -shared -o"
         SHARED_LD_CXX="\$(CXX) -shared -o"
         WINDOWS_IMPLIB=1
       ;;
 
+      *-pc-os2_emx | *-pc-os2-emx )
+        SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
+        SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
+        PIC_FLAG=""
+        AC_BAKEFILE_CREATE_FILE_DLLAR_SH
+        chmod +x dllar.sh
+      ;;
+
       powerpc-apple-macos* | \
-      *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
       *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
-      *-*-sysv5* )
+      *-*-sysv5* | \
+      *-pc-msdosdjgpp )
         dnl defaults are ok
       ;;
 
@@ -400,7 +492,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
@@ -466,6 +558,10 @@ AC_DEFUN([AC_BAKEFILE_DEPS],
             DEPSMODE=gcc
             DEPSFLAG="-MMD"
             AC_MSG_RESULT([gcc])
+        elif test "x$MWCC" = "xyes"; then
+            DEPSMODE=mwcc
+            DEPSFLAG="-MM"
+            AC_MSG_RESULT([mwcc])
         elif test "x$SUNCC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="-xM1"
@@ -530,20 +626,20 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
         AC_SUBST(AR)
     else
         AC_CHECK_TOOL(AR, ar, ar)
-        AROPTIONS=rc
+        AROPTIONS=rcu
     fi
     AC_SUBST(AROPTIONS)
 
     AC_CHECK_TOOL(STRIP, strip, :)
     AC_CHECK_TOOL(NM, nm, :)
 
-    dnl Don't use `install -d`, see https://trac.wxwidgets.org/ticket/13452
+    dnl Don't use `install -d`, see http://trac.wxwidgets.org/ticket/13452
     INSTALL_DIR="mkdir -p"
     AC_SUBST(INSTALL_DIR)
 
     LDFLAGS_GUI=
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
+        *-*-cygwin* | *-*-mingw32* )
         LDFLAGS_GUI="-mwindows"
     esac
     AC_SUBST(LDFLAGS_GUI)
@@ -559,13 +655,20 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
 [
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
+        *-*-cygwin* | *-*-mingw32* )
             dnl Check for win32 resources compiler:
             AC_CHECK_TOOL(WINDRES, windres)
          ;;
+
+      *-*-darwin* | powerpc-apple-macos* )
+            AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
+            AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+        ;;
     esac
 
     AC_SUBST(WINDRES)
+    AC_SUBST(REZ)
+    AC_SUBST(SETFILE)
 ])
 
 dnl ---------------------------------------------------------------------------
@@ -710,7 +813,7 @@ AC_DEFUN([AC_BAKEFILE],
     AC_SUBST(OBJCXXFLAGS)
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.12"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
 
     dnl includes autoconf_inc.m4:
     $1
@@ -797,6 +900,34 @@ if test ${D}DEPSMODE = gcc ; then
     fi
     exit 0
 
+elif test ${D}DEPSMODE = mwcc ; then
+    ${D}* || exit ${D}?
+    # Run mwcc again with -MM and redirect into the dep file we want
+    # NOTE: We can't use shift here because we need ${D}* to be valid
+    prevarg=
+    for arg in ${D}* ; do
+        if test "${D}prevarg" = "-o"; then
+            objfile=${D}arg
+        else
+            case "${D}arg" in
+                -* )
+                ;;
+                * )
+                    srcfile=${D}arg
+                ;;
+            esac
+        fi
+        prevarg="${D}arg"
+    done
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
+    exit 0
+
 elif test ${D}DEPSMODE = unixcc; then
     ${D}* || exit ${D}?
     # Run compiler again with deps flag and redirect into the dep file.
@@ -834,6 +965,117 @@ EOF
 dnl ===================== bk-deps ends here =====================
 ])
 
+AC_DEFUN([AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH],
+[
+dnl ===================== shared-ld-sh begins here =====================
+dnl    (Created by merge-scripts.py from shared-ld-sh
+dnl     file do not edit here!)
+D='$'
+cat <<EOF >shared-ld-sh
+#!/bin/sh
+#-----------------------------------------------------------------------------
+#-- Name:        distrib/mac/shared-ld-sh
+#-- Purpose:     Link a mach-o dynamic shared library for Darwin / Mac OS X
+#-- Author:      Gilles Depeyrot
+#-- Copyright:   (c) 2002 Gilles Depeyrot
+#-- Licence:     any use permitted
+#-----------------------------------------------------------------------------
+
+verbose=0
+args=""
+objects=""
+linking_flag="-dynamiclib"
+ldargs="-r -keep_private_externs -nostdlib"
+
+if test "x${D}CXX" = "x"; then
+    CXX="c++"
+fi
+
+while test ${D}# -gt 0; do
+    case ${D}1 in
+
+       -v)
+        verbose=1
+        ;;
+
+       -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
+        # collect these options and values
+        args="${D}{args} ${D}1 ${D}2"
+        shift
+        ;;
+       
+       -arch|-isysroot)
+        # collect these options and values
+        ldargs="${D}{ldargs} ${D}1 ${D}2"
+        shift
+        ;;
+
+       -s|-Wl,*)
+        # collect these load args
+        ldargs="${D}{ldargs} ${D}1"
+        ;;
+
+       -l*|-L*|-flat_namespace|-headerpad_max_install_names)
+        # collect these options
+        args="${D}{args} ${D}1"
+        ;;
+
+       -dynamiclib|-bundle)
+        linking_flag="${D}1"
+        ;;
+
+       -*)
+        echo "shared-ld: unhandled option '${D}1'"
+        exit 1
+        ;;
+
+        *.o | *.a | *.dylib)
+        # collect object files
+        objects="${D}{objects} ${D}1"
+        ;;
+
+        *)
+        echo "shared-ld: unhandled argument '${D}1'"
+        exit 1
+        ;;
+
+    esac
+    shift
+done
+
+status=0
+
+#
+# Link one module containing all the others
+#
+if test ${D}{verbose} = 1; then
+    echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+fi
+${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+status=${D}?
+
+#
+# Link the shared library from the single module created, but only if the
+# previous command didn't fail:
+#
+if test ${D}{status} = 0; then
+    if test ${D}{verbose} = 1; then
+        echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+    fi
+    ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+    status=${D}?
+fi
+
+#
+# Remove intermediate module
+#
+rm -f master.${D}${D}.o
+
+exit ${D}status
+EOF
+dnl ===================== shared-ld-sh ends here =====================
+])
+
 AC_DEFUN([AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH],
 [
 dnl ===================== bk-make-pch begins here =====================

build/aclocal/cppunit.m4

@@ -0,0 +1,81 @@
+dnl
+dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PATH_CPPUNIT],
+[
+
+AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
+            cppunit_config_prefix="$withval", cppunit_config_prefix="")
+AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
+            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  fi
+
+  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+  cppunit_version_min=$1
+
+  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+  no_cppunit=""
+  if test "$CPPUNIT_CONFIG" = "no" ; then
+    AC_MSG_RESULT(no)
+    no_cppunit=yes
+  else
+    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $cppunit_micro_version \>= $cppunit_micro_min `
+
+    if test "$cppunit_version_proper" = "1" ; then
+      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+    else
+      AC_MSG_RESULT(no)
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+     ifelse([$2], , :, [$2])     
+  else
+     CPPUNIT_CFLAGS=""
+     CPPUNIT_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+
+  AC_SUBST(CPPUNIT_CFLAGS)
+  AC_SUBST(CPPUNIT_LIBS)
+])
+
+
+

build/aclocal/gtk-2.0.m4

@@ -24,8 +24,19 @@ AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run
 
   no_gtk=""
 
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  PKG_PROG_PKG_CONFIG([0.7])
+
+  if test x$PKG_CONFIG != xno ; then
+    if pkg-config --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_gtk=yes
+  fi
 
   min_gtk_version=ifelse([$1], ,2.0.0,$1)
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
@@ -74,16 +85,14 @@ main ()
   int major, minor, micro;
   char *tmp_version;
 
-  fclose (fopen ("conf.gtktest", "w"));
+  system ("touch conf.gtktest");
 
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_gtk_version");
   if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_gtk_version");
-     g_free(tmp_version);
      exit(1);
    }
-  g_free(tmp_version);
 
   if ((gtk_major_version != $gtk_config_major_version) ||
       (gtk_minor_version != $gtk_config_minor_version) ||
@@ -94,7 +103,7 @@ main ()
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If pkg-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
@@ -130,7 +139,7 @@ main ()
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
         printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
         printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
         printf("*** so that the correct libraries are found at run-time))\n");
       }
     }
@@ -172,7 +181,7 @@ main ()
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi

build/aclocal/gtk-3.0.m4

@@ -1,50 +1,55 @@
 # Configure paths for GTK+
 # Owen Taylor     1997-2001
 
-# Version number used by aclocal, see `info automake Serials`.
-# Increment on every change.
-#serial 1
-
 dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
 dnl pass to pkg-config
 dnl
 AC_DEFUN([AM_PATH_GTK_3_0],
-[m4_warn([obsolete], [AM_PATH_GTK_3_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk+-3.0]) instead])
+[dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
 AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
 		    , enable_gtktest=yes)
-  min_gtk_version=ifelse([$1], [], [3.0.0], [$1])
 
-  pkg_config_args="gtk+-3.0 >= $min_gtk_version"
+  pkg_gtk_version=gtk+-3.0
+  pkg_config_args=$pkg_gtk_version
   for module in . $4
   do
       case "$module" in
          gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
+             pkg_gthread_version=gthread-2.0
+             pkg_config_args="$pkg_config_args $pkg_gthread_version"
          ;;
       esac
   done
 
   no_gtk=""
 
-  PKG_PROG_PKG_CONFIG([0.16])
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
-  if test -z "$PKG_CONFIG"; then
+  if test x$PKG_CONFIG != xno ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo "*** pkg-config too old; version 0.7 or better required."
+      no_gtk=yes
+      PKG_CONFIG=no
+    fi
+  else
     no_gtk=yes
   fi
 
+  min_gtk_version=ifelse([$1], ,3.0.0,$1)
   AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
 
-  if test -n "$PKG_CONFIG"; then
+  if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
     if $PKG_CONFIG --uninstalled $pkg_config_args; then
 	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
 	  enable_gtktest=no
     fi
-
+    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
-    if $PKG_CONFIG $pkg_config_args; then
 	  :
     else
 	  no_gtk=yes
@@ -78,11 +83,14 @@ dnl
 int 
 main ()
 {
-  unsigned int major, minor, micro;
+  int major, minor, micro;
+  char *tmp_version;
 
   fclose (fopen ("conf.gtktest", "w"));
 
-  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_gtk_version");
      exit(1);
    }
@@ -121,9 +129,9 @@ main ()
        }
      else
       {
-        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
                gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
 	       major, minor, micro);
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
         printf("***\n");
@@ -148,7 +156,7 @@ main ()
      ifelse([$2], , :, [$2])
   else
      AC_MSG_RESULT(no)
-     if test -z "$PKG_CONFIG"; then
+     if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"
      else
@@ -174,7 +182,7 @@ main ()
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
@@ -192,15 +200,13 @@ dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTI
 dnl   Tests for BACKEND-NAME in the GTK targets list
 dnl
 AC_DEFUN([GTK_CHECK_BACKEND],
-[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0]) or similar instead])
+[
   pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
   min_gtk_version=ifelse([$2],,3.0.0,$2)
-  pkg_config_args="$pkg_config_args >= $min_gtk_version"
 
-  PKG_PROG_PKG_CONFIG([0.16])
+  AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
-  AS_IF([test -z "$PKG_CONFIG"], [AC_MSG_ERROR([No pkg-config found])])
 
-  if $PKG_CONFIG $pkg_config_args ; then
+  if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
     target_found=yes
   else
     target_found=no

build/aclocal/gtk-4.0.m4

@@ -1,217 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_4_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_4_0],
-[m4_warn([obsolete], [AM_PATH_GTK_4_0 is deprecated, use PKG_CHECK_MODULES([GTK], [gtk4]) instead])
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-  min_gtk_version=ifelse([$1], [], [3.90.0], [$1])
-
-  pkg_config_args="gtk4 >= $min_gtk_version"
-  for module in . $4
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk4 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk4 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk4 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  unsigned int major, minor, micro;
-
-  fclose (fopen ("conf.gtktest", "w"));
-
-  if (sscanf("$min_gtk_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_get_major_version() != $gtk_config_major_version) ||
-      (gtk_get_minor_version() != $gtk_config_minor_version) ||
-      (gtk_get_micro_version() != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk4' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_get_major_version() != GTK_MAJOR_VERSION) ||
-	   (gtk_get_minor_version() != GTK_MINOR_VERSION) ||
-           (gtk_get_micro_version() != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
-    }
-  else
-    {
-      if ((gtk_get_major_version() > major) ||
-        ((gtk_get_major_version() == major) && (gtk_get_minor_version() > minor)) ||
-        ((gtk_get_major_version() == major) && (gtk_get_minor_version() == minor) && (gtk_get_micro_version() >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
-               gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
-        printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_get_major_version()) || (gtk_get_minor_version()) || (gtk_get_micro_version())); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
-
-dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl   Tests for BACKEND-NAME in the GTK targets list
-dnl
-AC_DEFUN([GTK_CHECK_BACKEND],
-[m4_warn([obsolete], [GTK_CHECK_BACKEND is deprecated, use PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-4.0]) or similar instead])
-  pkg_config_args=ifelse([$1],,gtk4, gtk4-$1)
-  min_gtk_version=ifelse([$2],,4.0.0,$2)
-  pkg_config_args="$pkg_config_args >= $min_gtk_version"
-
-  AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
-
-  if $PKG_CONFIG $pkg_config_args ; then
-    target_found=yes
-  else
-    target_found=no
-  fi
-
-  if test "x$target_found" = "xno"; then
-    ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
-  else
-    ifelse([$3],,[:],[$3])
-  fi
-])

build/aclocal/gtk.m4

@@ -78,11 +78,9 @@ main ()
   /* HP/UX 9 (%@#!) writes to sscanf strings */
   tmp_version = g_strdup("$min_gtk_version");
   if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     g_free(tmp_version);
      printf("%s, bad version string\n", "$min_gtk_version");
      exit(1);
    }
-  g_free(tmp_version);
 
   if ((gtk_major_version != $gtk_config_major_version) ||
       (gtk_minor_version != $gtk_config_minor_version) ||

build/aclocal/visibility.m4

@@ -49,22 +49,9 @@ AC_DEFUN([WX_VISIBILITY],
          error this platform has no visibility;
          #endif
 
-         /* At the time of Xcode 4.1 / Clang 3, Clang++ still didn't
+         /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */
-            have the bugs sorted out. These were fixed starting with
+         #if defined(__clang__)
-            Xcode 4.6.0 / Apple Clang 4.2 (which is based on Clang 3.2 so
+         clang compiler is still broken w.r.t. visibility;
-            check for that version too). */
-         #ifdef __clang__
-            #ifdef __APPLE__
-                #if __clang_major__ < 4 \
-                    || (__clang_major__ == 4 && __clang_minor__ < 2)
-                    error Clang compiler version < 4.2 is broken w.r.t. visibility;
-                #endif
-            #else
-                #if __clang_major__ < 3 \
-                    || (__clang_major__ == 3 && __clang_minor__ < 2)
-                    error Clang compiler version < 3.2 is broken w.r.t. visibility;
-                #endif
-            #endif
          #endif
 
          extern __attribute__((__visibility__("hidden"))) int hiddenvar;

build/autogen.mk

@@ -54,8 +54,10 @@ ACLOCAL_SOURCES = \
   build/aclocal/ac_raf_func_which_getservbyname_r.m4 \
   build/aclocal/atomic_builtins.m4 \
   build/aclocal/ax_func_which_gethostbyname_r.m4 \
+  build/aclocal/bakefile-dllar.m4 \
   build/aclocal/bakefile-lang.m4 \
   build/aclocal/bakefile.m4 \
+  build/aclocal/cppunit.m4 \
   build/aclocal/gst-element-check.m4 \
   build/aclocal/gtk-2.0.m4 \
   build/aclocal/gtk.m4 \

build/bakefiles/Bakefiles.bkgen

@@ -3,10 +3,22 @@
 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 
     <!--
-    The formats below are disabled because wxWidgets doesn't support these
+    Formats listed here are not generated by default. To enable them, either
-    compilers any longer (although bakefile still does).
+    remove them from the <disable-formats> directive below or create
+    Bakefiles.local.bkgen file in this directory and add <enable-formats>
+    into it:
+         <?xml version="1.0" ?>
+         <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
+             <enable-formats>dmars</enable-formats>
+         </bakefile-gen>
+
+    Reasons why these formats are disabled (and so not in CVS):
+
+    dmars, dmars_smake, msevc4prj - These are generated at release time and
+                we don't want to clutter the source tree with these files.
     -->
-    <disable-formats>borland,dmars,dmars_smake,msvc6prj,msvs2003prj,watcom</disable-formats>
+
+    <disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
@@ -27,28 +39,44 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
+        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
+    </del-formats>
+
+    <!-- WinCE can't have console apps: -->
+    <del-formats files="../../samples/console/*">msevc4prj</del-formats>
+    <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/execmon/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
+    <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
+    <del-formats files="../../tests/*">msevc4prj</del-formats>
+    <del-formats files="../../tests/benchmarks/*">msevc4prj</del-formats>
+
+
+    <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
+    <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </del-formats>
 
     <!-- Some samples use MSVC-specific stuff -->
-    <del-formats files="../../samples/mfc/mfc.bkl">
+    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
-        autoconf,borland,dmars_smake,dmars,mingw,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msevc4prj,watcom
     </del-formats>
 
     <!-- Default flags (for all formats and bakefiles): -->
@@ -89,6 +117,9 @@
     <add-flags files="wx.bkl" formats="msvs2008prj">
         -o../msw/wx_vc9.sln
     </add-flags>
+    <add-flags files="wx.bkl" formats="msevc4prj">
+        -o../wince/wx.vcw
+    </add-flags>
 
 
 
@@ -112,11 +143,6 @@
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
     </add-flags>
 
-    <add-flags formats="msvs2005prj,msvs2008prj">
-        -DMSVS_PLATFORMS=win32,win64
-    </add-flags>
-
-
     <!-- Makefile specific settings: -->
 
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
@@ -229,7 +255,7 @@
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu
     </add-formats>
-    <del-formats files="../../samples/mfc/mfc.bkl">
+    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
         gnu
     </del-formats>
     <add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"