Merge branch 'freefilesync-bump' into 'master'

freefilesync 10.15

See merge request bgstack15/stackrpms!79

1 files changed, 30 insertions, 0 deletions

diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch
index a1ff0e4..e6069d4 100644
--- a/freefilesync/ffs_no_wx311.patch
+++ b/freefilesync/ffs_no_wx311.patch
@@ -1,3 +1,4 @@
+2019-08-15 just compile. 
 diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp
 --- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-07 05:03:34.000000000 -0400
 +++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-08 19:16:54.026727623 -0400
@@ -40,3 +41,32 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S
  
  
      std::call_once(onceFlagCreateCfgPath, [&]
+diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
+index 6e769bb..ce6110b 100644
+--- a/FreeFileSync/Source/ui/command_box.cpp
++++ b/FreeFileSync/Source/ui/command_box.cpp
+@@ -130,7 +130,9 @@ void CommandBox::setValueAndUpdateList(const wxString& value)
+
+     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
+     wxItemContainer::Clear(); //suffices to clear the selection items only!
+-    this->Append(items);
++    for (const wxString& item : items)
++        this->Append(item);
++
+
+     //this->SetSelection(wxNOT_FOUND); //don't select anything
+     ChangeValue(value); //preserve main text!
+diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
+index 2b824b1..a17ea2f 100644
+--- a/FreeFileSync/Source/ui/folder_history_box.cpp
++++ b/FreeFileSync/Source/ui/folder_history_box.cpp
+@@ -90,7 +90,8 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& folderPathPhrase)
+
+     //this->Clear(); -> NO! emits yet another wxEVT_COMMAND_TEXT_UPDATED!!!
+     wxItemContainer::Clear(); //suffices to clear the selection items only!
+-    this->Append(dirList);
++    for (const wxString& dir : dirList)
++        this->Append(dir);
+
+     //this->SetSelection(wxNOT_FOUND); //don't select anything
+     ChangeValue(folderPathPhrase); //preserve main text!