diff options
| author | B Stack <bgstack15@gmail.com> | 2020-07-23 14:24:41 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-07-23 14:24:41 +0000 |
| commit | 6182a3a1a339fdbc882c30a01e25c1db7ad7728c (patch) | |
| tree | f7f50de0ac3c85e16687014bd7ad37babe75861d /freefilesync/ffs_no_wx311.patch | |
| parent | Merge branch 'irfanview-bump' into 'master' (diff) | |
| parent | fix date for 10.25 (diff) | |
| download | stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.gz stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.tar.bz2 stackrpms-6182a3a1a339fdbc882c30a01e25c1db7ad7728c.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.0
See merge request bgstack15/stackrpms!169
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 926f7b8..22d8260 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,7 +1,7 @@ 2019-08-15 just compile. diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp --- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-19 16:17:15.000000000 -0400 -+++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-20 14:23:47.488836409 -0400 ++++ 11.0-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-07-22 11:39:25.820068366 -0400 @@ -293,7 +293,8 @@ { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); @@ -12,10 +12,10 @@ diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/So //set default values for Google Drive: use first item of m_listBoxGdriveUsers if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) -@@ -1663,7 +1664,7 @@ +@@ -1682,7 +1683,7 @@ //setMainInstructionFont(*m_staticTextMain); - m_bitmapActivation->SetBitmap(getResourceImage("internet")); + m_bitmapActivation->SetBitmap(loadImage("internet")); - m_textCtrlOfflineActivationKey->ForceUpper(); + //m_textCtrlOfflineActivationKey->ForceUpper(); |