1 files changed, 0 insertions, 65 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
deleted file mode 100644
index 1671e4c..0000000
--- a/freefilesync/ffs_no_wx311.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Last modified: 2022-04-18
-Version: 11.20
-Author: bgstack15
-Message: Just compile by stepping around wxWidgets 3.1.1 calls
-diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 08:15:29.432156507 -0500
-+++ 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp	2020-12-08 18:22:19.929543356 -0500
-@@ -300,7 +300,8 @@
-     {
-         showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString()));
-     }
--    m_listBoxGdriveUsers->Append(gdriveAccounts);
-+    for (const wxString& item : gdriveAccounts) // reverted to pre-wx 3.1.1 logic
-+        m_listBoxGdriveUsers->Append(item);
- 
-     //set default values for Google Drive: use first item of m_listBoxGdriveUsers
-     if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase))
-@@ -1689,7 +1690,6 @@
-     //setMainInstructionFont(*m_staticTextMain);
- 
-     setImage(*m_bitmapActivation, loadImage("internet"));
--    m_textCtrlOfflineActivationKey->ForceUpper();
- 
-     setTextWithUrls(*m_richTextLastError, lastErrorMsg);
-     setTextWithUrls(*m_richTextManualActivationUrl, manualActivationUrl);
-diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp
---- 10.3-0/wx+/grid.cpp	2018-08-07 05:03:34.000000000 -0400
-+++ 10.3-2/wx+/grid.cpp	2018-08-08 19:24:56.849445102 -0400
-@@ -1176,7 +1176,9 @@
-             {
-                 if (overlapPix != 0)
-                 {
--                    const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
-+                    // Fedora 28 does not have wxGTK 3.1.1 yet. This probably breaks HiDPI usage
-+                    //const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
-+                    const double scrollSpeed = overlapPix * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
-                     toScroll += scrollSpeed * deltaSecs;
-                 }
-                 else
-diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/command_box.cpp 10.24-1/FreeFileSync/Source/ui/command_box.cpp
---- 10.24-0/FreeFileSync/Source/ui/command_box.cpp	2020-05-17 11:01:12.893890567 -0400
-+++ 10.24-1/FreeFileSync/Source/ui/command_box.cpp	2020-05-17 11:22:18.069114993 -0400
-@@ -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) // reverted to pre-wx 3.1.1 logic
-+        this->Append(item);
- 
-     //this->SetSelection(wxNOT_FOUND); //don't select anything
-     ChangeValue(value); //preserve main text!
-diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/folder_history_box.cpp 10.24-1/FreeFileSync/Source/ui/folder_history_box.cpp
---- 10.24-0/FreeFileSync/Source/ui/folder_history_box.cpp	2020-05-17 11:01:12.909890709 -0400
-+++ 10.24-1/FreeFileSync/Source/ui/folder_history_box.cpp	2020-05-17 11:21:18.460583251 -0400
-@@ -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& itemk : items) // reverted to pre-wx 3.1.1 logic
-+        this->Append(itemk);
- 
-     //this->SetSelection(wxNOT_FOUND); //don't select anything
-     ChangeValue(folderPathPhrase); //preserve main text!