summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_no_wx311.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-04-21 13:35:31 +0000
committerB. Stack <bgstack15@gmail.com>2022-04-21 13:35:31 +0000
commitcbc5363fef64c2146d03a8f5c2d290db968f2d63 (patch)
tree0c616e0cddf96f96eff40cd4d0b07085a1fa73b6 /freefilesync/ffs_no_wx311.patch
parentMerge branch 'notepadnext-bump' into 'master' (diff)
parentffs 11.20 rc1 for fedora (diff)
downloadstackrpms-cbc5363fef64c2146d03a8f5c2d290db968f2d63.tar.gz
stackrpms-cbc5363fef64c2146d03a8f5c2d290db968f2d63.tar.bz2
stackrpms-cbc5363fef64c2146d03a8f5c2d290db968f2d63.zip
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 11.20 See merge request bgstack15/stackrpms!296
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
-rw-r--r--freefilesync/ffs_no_wx311.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
index 8e17036..1671e4c 100644
--- a/freefilesync/ffs_no_wx311.patch
+++ b/freefilesync/ffs_no_wx311.patch
@@ -1,4 +1,7 @@
-2019-08-15 just compile.
+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
@@ -12,16 +15,15 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/ui/small_dl
//set default values for Google Drive: use first item of m_listBoxGdriveUsers
if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase))
-@@ -1681,7 +1682,7 @@
+@@ -1689,7 +1690,6 @@
//setMainInstructionFont(*m_staticTextMain);
- m_bitmapActivation->SetBitmap(loadImage("internet"));
+ setImage(*m_bitmapActivation, loadImage("internet"));
- m_textCtrlOfflineActivationKey->ForceUpper();
-+ //m_textCtrlOfflineActivationKey->ForceUpper();
setTextWithUrls(*m_richTextLastError, lastErrorMsg);
setTextWithUrls(*m_richTextManualActivationUrl, manualActivationUrl);
-iff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp
+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 @@
bgstack15