Update to 13.4

8 files changed, 41 insertions, 383 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 011b7d192e83..1d78b9f6aef4 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,20 @@
 pkgbase = freefilesync
 	pkgdesc = Backup software to synchronize files and folders
-	pkgver = 11.4
+	pkgver = 13.4
 	pkgrel = 1
 	url = https://freefilesync.org
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = unzip
-	depends = wxgtk
-	depends = curl
-	depends = lsb-release
-	source = FreeFileSync_11.4_Source.zip::https://freefilesync.org/download/FreeFileSync_11.4_Source.zip
-	source = reversions_11-1.patch
-	source = theme_fixes.patch
-	source = revert_xdg_config_path.patch
-	source = revert_bulk_append.patch
-	source = revert_linkflags.patch
+	depends = wxwidgets-gtk3
+	noextract = FreeFileSync_13.4_Source.zip.1
+	source = FreeFileSync_13.4_Source.zip.1::https://freefilesync.org/download/FreeFileSync_13.4_Source.zip
+	source = FreeFileSync_13.4_Source.zip::https://freefilesync.org/download/FreeFileSync_13.4_Source.zip
 	source = FreeFileSync.desktop
 	source = RealTimeSync.desktop
-	source = dlagent
-	sha256sums = d0c20c1388024460944bb0871e91ce6dc9ac5c02be45a095f288db169eb844b4
-	sha256sums = 6c2d7f24e4edc52bc1af95d3f48ef67456cde0b952b81a702901acfb36545999
-	sha256sums = 4f2b1d46c0b754c668be7ec675a2bb09f72b3bd0e20987b4db61575b5ca1bf46
-	sha256sums = 0f9a9a6b2c3c460bbde7425bd62273c925259db1cc9dc18c6013aae99fb15cd8
-	sha256sums = 17e7db683662809882db6d6b3d855eb4372ca1bd05e15c4c490970a0b4b127c0
-	sha256sums = c83475ef3ac8bd534d637062d516c9eeea54ac18c775be55e1adef413ac73063
+	sha256sums = SKIP
+	sha256sums = d1ce076256a1f5a1ec30cc82cff4e3800e7da5371ee21a20cf99fa5dff4cca1a
 	sha256sums = 590d87707240529ca893199f852143f5d7c7266cb050e37e615900b013ac3d51
 	sha256sums = 82439b4b81b0a72652befad9b9db52ffbc0180f307c92205aa5ab344f9f82830
-	sha256sums = 1649e7ea66235c6f82daf9beb6b61b7765df54e9ef70f7f6fc1283f5c2b1e54a
 
 pkgname = freefilesync
-
diff --git a/PKGBUILD b/PKGBUILD
index 6c81647b9655..5c5c9fc3d25b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,108 +1,59 @@
-
 # Contributor: chenxing <cxcxcxcx AT gmail DOT com>
 # Contributor: Michael Burkhard <Michael DOT Burkhard AT web DOT de>
 # Contributor: alexmo82 <25396682 AT live DOT it>
 # Contributor: Simon Brulhart <simon@brulhart.me>
 # Maintainer: jooch <jooch AT gmx DOT com>
+# Maintainer: tee < teeaur at duck dot com >
 
 pkgname=freefilesync
-pkgver=11.4
+pkgver=13.4
 pkgrel=1
 pkgdesc="Backup software to synchronize files and folders"
 arch=('i686' 'x86_64')
 url="https://freefilesync.org"
-license=('GPL3')
-depends=(wxgtk curl lsb-release)
-makedepends=(unzip)
+license=(GPL3)
+depends=(wxwidgets-gtk3)
 source=(
-	"FreeFileSync_${pkgver}_Source.zip::${url}/download/FreeFileSync_${pkgver}_Source.zip"		#ffs
-	reversions_11-1.patch
-	theme_fixes.patch
-	revert_xdg_config_path.patch
-	revert_bulk_append.patch
-	revert_linkflags.patch
+    "FreeFileSync_${pkgver}_Source.zip.1::${url}/download/FreeFileSync_${pkgver}_Source.zip"
+    "FreeFileSync_${pkgver}_Source.zip::${url}/download/FreeFileSync_${pkgver}_Source.zip"
 	FreeFileSync.desktop
 	RealTimeSync.desktop
-	dlagent
-	)
-
-sha256sums=('d0c20c1388024460944bb0871e91ce6dc9ac5c02be45a095f288db169eb844b4'
-			'6c2d7f24e4edc52bc1af95d3f48ef67456cde0b952b81a702901acfb36545999'
-			'4f2b1d46c0b754c668be7ec675a2bb09f72b3bd0e20987b4db61575b5ca1bf46'
-            '0f9a9a6b2c3c460bbde7425bd62273c925259db1cc9dc18c6013aae99fb15cd8'
-            '17e7db683662809882db6d6b3d855eb4372ca1bd05e15c4c490970a0b4b127c0'
-            'c83475ef3ac8bd534d637062d516c9eeea54ac18c775be55e1adef413ac73063'
+)
+noextract=("FreeFileSync_${pkgver}_Source.zip.1")
+sha256sums=('SKIP'
+            'd1ce076256a1f5a1ec30cc82cff4e3800e7da5371ee21a20cf99fa5dff4cca1a'
             '590d87707240529ca893199f852143f5d7c7266cb050e37e615900b013ac3d51'
-            '82439b4b81b0a72652befad9b9db52ffbc0180f307c92205aa5ab344f9f82830'
-            '1649e7ea66235c6f82daf9beb6b61b7765df54e9ef70f7f6fc1283f5c2b1e54a')
-
-DLAGENTS=("https::./dlagent $url %u %o")
+            '82439b4b81b0a72652befad9b9db52ffbc0180f307c92205aa5ab344f9f82830')
 
 prepare() {
-# wxgtk < 3.1.0
-    # Revert to classic config path
-    patch -p1 -i revert_xdg_config_path.patch
-
-    # Avoid uses of wxItemContainer::Append(const std::vector<wxString>& items)
-    patch -p1 -i revert_bulk_append.patch
-
-    # edit lines to remove functions that require wxgtk 3.1.x 
-    sed -e 's:m_textCtrlOfflineActivationKey->ForceUpper:// &:g' -i 'FreeFileSync/Source/ui/small_dlgs.cpp'
-    sed -e 's:const double scrollSpeed =:& 6; //:g' -i 'wx+/grid.cpp'
-
-	patch -p1 -i reversions_11-1.patch
-    grep -RiIl 'wxASCII_STR' | xargs sed -e 's/wxASCII_STR/wxString::FromAscii/g' -i
-	grep -RiIl 'wxDD_SHOW_HIDDEN' | xargs sed -e 's/, wxDD_DEFAULT_STYLE | wxDD_SHOW_HIDDEN//g' -i
-
-# undo zenju hacks
-	sed -e '71,77d' -i 'wx+/dc.h'
-	sed -e '73d' -i 'wx+/no_flicker.h'
-
-# GUI theme fixes (for improved color compatibility)
-	patch -p1 -i theme_fixes.patch
-
-# add LINKFLAGS that were removed but that we still need in our case
-    patch -p1 -i revert_linkflags.patch
-
-# inlining of constants not present in libssh2's distributed headers
-    sed -i 's/MAX_SFTP_READ_SIZE/30000/g' FreeFileSync/Source/afs/sftp.cpp
-    sed -i 's/MAX_SFTP_OUTGOING_SIZE/30000/g' FreeFileSync/Source/afs/sftp.cpp
+    bsdunzip FreeFileSync/Build/Resources/Icons.zip {FreeFileSync,RealTimeSync}.png
+    sed -i 's|-2|-3|' FreeFileSync/Source/{Makefile,RealTimeSync/Makefile}
+    sed -i 's|#error|//#error|' FreeFileSync/Source/{application.cpp,RealTimeSync/application.cpp} zen/{string_tools.h,globals.h}
+    sed -i 's|::g_object_ref|g_object_ref|' FreeFileSync/Source/base/icon_loader.cpp
 }
 
 build() {
-### speed up compile on multithread machines
-    MAKEFLAGS="-j$(nproc)"
-
-### just in case of compile errors
-    VER=`g++ -dumpversion`
-    MAC=`g++ -dumpmachine`
-    echo "compiler g++ $VER $MAC"
-
-### FFS
-    cd "${srcdir}/FreeFileSync/Source"
-    make exeName=FreeFileSync tmpPath="${srcdir}/FreeFileSync/tmp_ffs"
+    MAKEFLAGS="-s -j`nproc`"
+    CXXFLAGS="$CXXFLAGS -DMAX_SFTP_READ_SIZE=30000 -DMAX_SFTP_OUTGOING_SIZE=30000"
+    LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-3.0`"
 
-### RTS
-    cd "${srcdir}/FreeFileSync/Source/RealTimeSync"
-    make exeName=RealTimeSync tmpPath="${srcdir}/FreeFileSync/tmp_rts"
+    make -C"$srcdir/FreeFileSync/Source" exeName=FreeFileSync
+    make -C"$srcdir/FreeFileSync/Source/RealTimeSync" exeName=RealTimeSync
 }
 
 package() {
-    bindir="${pkgdir}/usr/bin"
-    appdir="${pkgdir}/opt/FreeFileSync"
-    appdocdir="${pkgdir}/usr/share/doc/FreeFileSync"
-
-    cd "${srcdir}/FreeFileSync/Build"
-    install -t "${appdir}/Bin" -Dm755 Bin/*
-    mkdir -p "${bindir}"
-    ln -s /opt/FreeFileSync/Bin/{FreeFileSync,RealTimeSync} "${bindir}"
-
-    cp -rT Resources "${appdir}/Resources"
-    find "${appdir}/Resources" -type f -print0 | xargs -0 chmod 644
-    install -t "${pkgdir}/usr/share/pixmaps" -Dm644 Resources/FreeFileSync.png Resources/RealTimeSync.png
-
-    cd "${srcdir}"
-    install -d "${appdocdir}"
-    gzip < Changelog.txt > "${appdocdir}/CHANGELOG.gz"
-    install -Dm644 -t "${pkgdir}/usr/share/applications" FreeFileSync.desktop RealTimeSync.desktop
+    bindir="$pkgdir/usr/bin"
+    appdir="$pkgdir/opt/FreeFileSync"
+    appdocdir="$pkgdir/usr/share/doc/FreeFileSync"
+
+    cd "$srcdir/FreeFileSync/Build"
+    install -Dm755 -t "$appdir/Bin" Bin/*
+    install -Dm644 -t "$appdir/Resources" Resources/*
+    mkdir -p "$bindir"
+    ln -s /opt/FreeFileSync/Bin/{FreeFileSync,RealTimeSync} "$bindir"
+    cd "$srcdir"
+    install -d "$appdocdir"
+    gzip < Changelog.txt > "$appdocdir/CHANGELOG.gz"
+    install -Dm644 -t "$pkgdir/usr/share/pixmaps" FreeFileSync.png RealTimeSync.png
+    install -Dm644 -t "$pkgdir/usr/share/applications" FreeFileSync.desktop RealTimeSync.desktop
 }
diff --git a/dlagent b/dlagent
deleted file mode 100755
index 1b2cef8890d2..000000000000
--- a/dlagent
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -eu
-
-if [ $# -lt 3 ]; then
-    echo "Error: arguments base_url, file_url and target_file required." >&2
-    exit 1
-fi
-
-base_url="$1"
-file_url="$2"
-target_file="$3"
-success=false
-
-rm -f "$target_file"
-
-for i in 1 2 3; do
-    echo "Authenticating for download ..." >&2
-    curl -fsSL -A Mozilla "$base_url/cookie/init.js.static.php" > /dev/null
-
-    echo "Downloading ..." >&2
-    curl -fLC - --retry 5 --retry-delay 3 -A Mozilla -o "$target_file" "$file_url"
-
-    echo "Checking ..." >&2
-    if unzip -p "$target_file" >/dev/null 2>&1; then
-        success=true
-        break
-    fi
-
-    if [ $i -lt 3 ]; then
-        rm -f "$target_file"
-        echo "Warning: invalid zip file - retrying." >&2
-    else
-        echo "Error: invalid zip file." >&2
-    fi
-done
-
-[ "$success" = "true" ] && exit 0 || exit 1
diff --git a/reversions_11-1.patch b/reversions_11-1.patch
deleted file mode 100644
index c503a4f2bee3..000000000000
--- a/reversions_11-1.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Version: 11.1
-Message: Had to revert gui_status_handler.cpp and .h entirely to version 11.0 to avoid the wx 3.1.4-isms here.
-diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp
-index 3cb6aaaa..9484af2c 100644
---- a/FreeFileSync/Source/ui/gui_status_handler.cpp
-+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp
-@@ -43,8 +43,8 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg,
-     mainDlg_.Update(); //don't wait until idle event!
- 
-     //register keys
--    mainDlg_.                Bind(wxEVT_CHAR_HOOK,              &StatusHandlerTemporaryPanel::onLocalKeyEvent, this);
--    mainDlg_.m_buttonCancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &StatusHandlerTemporaryPanel::onAbortCompare,  this);
-+    mainDlg_.Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(StatusHandlerTemporaryPanel::OnKeyPressed), nullptr, this);
-+    mainDlg_.m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusHandlerTemporaryPanel::OnAbortCompare), nullptr, this);
- }
- 
- 
-@@ -128,9 +128,8 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel()
-     mainDlg_.auiMgr_.Update();
- 
-     //unregister keys
--    [[maybe_unused]] bool ubOk1 = mainDlg_.                Unbind(wxEVT_CHAR_HOOK,              &StatusHandlerTemporaryPanel::onLocalKeyEvent, this);
--    [[maybe_unused]] bool ubOk2 = mainDlg_.m_buttonCancel->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &StatusHandlerTemporaryPanel::onAbortCompare,  this);
--    assert(ubOk1 && ubOk2);
-+    mainDlg_.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(StatusHandlerTemporaryPanel::OnKeyPressed), nullptr, this);
-+    mainDlg_.m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusHandlerTemporaryPanel::OnAbortCompare), nullptr, this);
- 
-     mainDlg_.compareStatus_->teardown();
- 
-@@ -314,20 +313,20 @@ void StatusHandlerTemporaryPanel::forceUiUpdateNoThrow()
- }
- 
- 
--void StatusHandlerTemporaryPanel::onLocalKeyEvent(wxKeyEvent& event)
-+void StatusHandlerTemporaryPanel::OnKeyPressed(wxKeyEvent& event)
- {
-     const int keyCode = event.GetKeyCode();
-     if (keyCode == WXK_ESCAPE)
-     {
-         wxCommandEvent dummy;
--        onAbortCompare(dummy);
-+        OnAbortCompare(dummy);
-     }
- 
-     event.Skip();
- }
- 
- 
--void StatusHandlerTemporaryPanel::onAbortCompare(wxCommandEvent& event)
-+void StatusHandlerTemporaryPanel::OnAbortCompare(wxCommandEvent& event)
- {
-     userRequestAbort();
- }
-diff --git a/FreeFileSync/Source/ui/gui_status_handler.h b/FreeFileSync/Source/ui/gui_status_handler.h
-index e8ed01e4..2a9e00d2 100644
---- a/FreeFileSync/Source/ui/gui_status_handler.h
-+++ b/FreeFileSync/Source/ui/gui_status_handler.h
-@@ -41,8 +41,8 @@ public:
-     Result reportResults(); //noexcept!!
- 
- private:
--    void onLocalKeyEvent(wxKeyEvent& event);
--    void onAbortCompare(wxCommandEvent& event); //handle abort button click
-+    void OnKeyPressed(wxKeyEvent& event);
-+    void OnAbortCompare(wxCommandEvent& event); //handle abort button click
-     void showStatsPanel();
- 
-     MainDialog& mainDlg_;
diff --git a/revert_bulk_append.patch b/revert_bulk_append.patch
deleted file mode 100644
index 9782134ec6a0..000000000000
--- a/revert_bulk_append.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -r -u a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
---- a/FreeFileSync/Source/ui/command_box.cpp	2020-06-18 19:16:52.000000000 +0200
-+++ b/FreeFileSync/Source/ui/command_box.cpp	2020-06-21 10:45:23.265579023 +0200
-@@ -120,7 +120,8 @@
- 
-     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
-     wxItemContainer::Clear(); //suffices to clear the selection items only!
--    this->Append(items); //expensive as fuck! => only call when absolutely needed!
-+    for (const wxString& item : items)                                                                                             
-+        this->Append(item); 
- 
-     //this->SetSelection(wxNOT_FOUND); //don't select anything
-     ChangeValue(value); //preserve main text!
-diff -r -u a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
---- a/FreeFileSync/Source/ui/folder_history_box.cpp	2020-06-18 19:16:52.000000000 +0200
-+++ b/FreeFileSync/Source/ui/folder_history_box.cpp	2020-06-21 10:45:23.265579023 +0200
-@@ -90,7 +90,8 @@
- 
-     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
-     wxItemContainer::Clear(); //suffices to clear the selection items only!
--    this->Append(items); //expensive as fuck! => only call when absolutely needed!
-+    for (const wxString& item : items)                                                                                             
-+        this->Append(item); 
- 
-     //this->SetSelection(wxNOT_FOUND); //don't select anything
-     ChangeValue(folderPathPhrase); //preserve main text!
-diff -r -u a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
---- a/FreeFileSync/Source/ui/small_dlgs.cpp	2020-06-18 19:16:52.000000000 +0200
-+++ b/FreeFileSync/Source/ui/small_dlgs.cpp	2020-06-21 11:35:53.494412284 +0200
-@@ -293,7 +293,9 @@
-     {
-         showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
-     }
--    m_listBoxGdriveUsers->Append(gdriveAccounts);
-+    for (auto const& account: gdriveAccounts) {
-+        m_listBoxGdriveUsers->Append(account);
-+    }
- 
-     //set default values for Google Drive: use first item of m_listBoxGdriveUsers
-     if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase))
-diff -r -u a/wx+/choice_enum.h b/wx+/choice_enum.h
---- a/wx+/choice_enum.h	2020-06-18 19:16:51.000000000 +0200
-+++ b/wx+/choice_enum.h	2020-06-21 10:45:23.268912329 +0200
-@@ -79,7 +79,10 @@
- 
-     if (items != itemsSetLast)
-     {
--        ctrl.Set(items); //expensive as fuck! => only call when absolutely needed!
-+        ctrl.Clear();
-+        for (auto item : items) {
-+            ctrl.Append(item);
-+        }
-         itemsSetLast = std::move(items);
-     }
-     //-----------------------------------------------------------------
\ No newline at end of file
diff --git a/revert_linkflags.patch b/revert_linkflags.patch
deleted file mode 100644
index 323924a00912..000000000000
--- a/revert_linkflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -u a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
---- a/FreeFileSync/Source/Makefile
-+++ b/FreeFileSync/Source/Makefile
-@@ -4,7 +4,7 @@
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
-+linkFlags = -s -no-pie `wx-config --libs std, aui, richtext  --debug=no` -lz -pthread
- 
- 
- cxxFlags  += `pkg-config --cflags openssl`
-@@ -17,6 +17,7 @@
- linkFlags += `pkg-config --libs   libssh2`
- 
- cxxFlags  += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs   gtk+-2.0`
- #treat as system headers so that warnings are hidden:
- cxxFlags  += -isystem/usr/include/gtk-2.0
-
-diff -r -u a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
---- a/FreeFileSync/Source/RealTimeSync/Makefile
-+++ b/FreeFileSync/Source/RealTimeSync/Makefile
-@@ -4,10 +4,11 @@
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--linkFlags = -s -no-pie `wx-config --libs std, aui, richtext --debug=no` -pthread
-+linkFlags = -s -no-pie `wx-config --libs std, aui, richtext  --debug=no` -lz -pthread
- 
- #Gtk - support "no button border"
- cxxFlags  += `pkg-config --cflags gtk+-2.0`
-+linkFlags += `pkg-config --libs   gtk+-2.0`
- #treat as system headers so that warnings are hidden:
- cxxFlags  += -isystem/usr/include/gtk-2.0
diff --git a/revert_xdg_config_path.patch b/revert_xdg_config_path.patch
deleted file mode 100644
index 1802311e64cd..000000000000
--- a/revert_xdg_config_path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/FreeFileSync/Source/ffs_paths.cpp    2019-11-19 23:52:20.000000000 +0100
-+++ b/FreeFileSync/Source/ffs_paths.cpp    2019-11-24 18:14:17.627328553 +0100
-@@ -80,6 +80,4 @@
- 
--        //OS standard path (XDG layout): ~/.config/FreeFileSync
--        //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
--        wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
--        const Zstring cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
-+        //OS standard path (classic layout): ~/.FreeFileSync
-+        Zstring cfgFolderPath = utfTo<Zstring>(wxStandardPaths::Get().GetUserDataDir());
diff --git a/theme_fixes.patch b/theme_fixes.patch
deleted file mode 100644
index e87464db7cfb..000000000000
--- a/theme_fixes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -r -u a/wx+/grid.cpp b/wx+/grid.cpp
---- a/wx+/grid.cpp	 2020-12-05 14:38:39.000000000 +0100
-+++ b/wx+/grid.cpp	 2020-12-22 06:36:21.000000000 +0100
-@@ -36,10 +36,10 @@
- {
- //------------------------------ Grid Parameters --------------------------------
- inline wxColor getColorLabelText(bool enabled) { return wxSystemSettings::GetColour(enabled ? wxSYS_COLOUR_WINDOWTEXT : wxSYS_COLOUR_GRAYTEXT); }
--inline wxColor getColorGridLine() { return { 192, 192, 192 }; } //light grey
-+inline wxColor getColorGridLine() { return wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); } //light grey
- 
- inline wxColor getColorLabelGradientFrom() { return wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); }
--inline wxColor getColorLabelGradientTo  () { return { 200, 200, 200 }; } //light grey
-+inline wxColor getColorLabelGradientTo  () { return wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); } //light grey
- 
- inline wxColor getColorLabelGradientFocusFrom() { return getColorLabelGradientFrom(); }
- inline wxColor getColorLabelGradientFocusTo  () { return GridData::getColorSelectionGradientFrom(); }
-@@ -227,7 +227,7 @@
- {
-     //left border
-     {
--        wxDCPenChanger dummy(dc, wxPen(*wxWHITE, fastFromDIP(1)));
-+        wxDCPenChanger dummy(dc, wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), fastFromDIP(1)));
-         dc.DrawLine(rect.GetTopLeft(), rect.GetBottomLeft());
-     }
-     //bottom, right border
-@@ -444,7 +444,7 @@
- 
-         wxRect rectShrinked = clientRect;
-         rectShrinked.Deflate(fastFromDIP(1));
--        dc.SetPen(wxPen(*wxWHITE, fastFromDIP(1)));
-+        dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), fastFromDIP(1)));
- 
-         //dc.DrawLine(clientRect.GetTopLeft(), clientRect.GetTopRight() + wxPoint(1, 0));
-         dc.DrawLine(rectShrinked.GetTopLeft(), rectShrinked.GetBottomLeft() + wxPoint(0, 1));
-@@ -545,7 +545,7 @@
- 
-         //border lines
-         {
--            wxDCPenChanger dummy(dc, wxPen(*wxWHITE, fastFromDIP(1)));
-+            wxDCPenChanger dummy(dc, wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), fastFromDIP(1)));
-             dc.DrawLine(rect.GetTopLeft(), rect.GetTopRight());
-         }
-         {
-diff -r -u a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
---- a/FreeFileSync/Source/ui/file_grid.cpp	2020-12-05 14:38:39.000000000 +0100
-+++ b/FreeFileSync/Source/ui/file_grid.cpp	2020-12-22 06:05:29.000000000 +0100
-@@ -46,7 +46,7 @@
- inline wxColor getColorInactiveBack(bool faint) { if (faint) return { 0xf6, 0xf6, 0xf6}; return { 0xe4, 0xe4, 0xe4 }; } //light grey
- inline wxColor getColorInactiveText() { return { 0x40, 0x40, 0x40 }; } //dark grey
- 
--inline wxColor getColorGridLine() { return { 192, 192, 192 }; } //light grey
-+inline wxColor getColorGridLine() { return wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); } //light grey
- 
- const int FILE_GRID_GAP_SIZE_DIP = 2;
- const int FILE_GRID_GAP_SIZE_WIDE_DIP = 6;
-diff -r -u a/FreeFileSync/Source/ui/triple_splitter.cpp b/FreeFileSync/Source/ui/triple_splitter.cpp
---- a/FreeFileSync/Source/ui/triple_splitter.cpp	2020-12-05 14:38:39.000000000 +0100
-+++ b/FreeFileSync/Source/ui/triple_splitter.cpp	2020-12-22 05:37:32.000000000 +0100
-@@ -8,6 +8,7 @@
- #include <algorithm>
- #include <zen/stl_tools.h>
- #include <wx+/dc.h>
-+#include <wx/settings.h>
- 
- using namespace zen;
- using namespace fff;
-@@ -24,8 +25,8 @@
- const int CHILD_WINDOW_MIN_SIZE_DIP = 50; //min. size of managed windows
- 
- //let's NOT create wxWidgets objects statically:
--inline wxColor getColorSashGradientFrom() { return { 192, 192, 192 }; } //light grey
--inline wxColor getColorSashGradientTo  () { return *wxWHITE; }
-+inline wxColor getColorSashGradientFrom() { return wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW); } //light grey
-+inline wxColor getColorSashGradientTo  () { return wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); }
- }