diff options
Diffstat (limited to 'freefilesync/04_revert_zenju_aggressive_upstreamisms.patch')
| -rw-r--r-- | freefilesync/04_revert_zenju_aggressive_upstreamisms.patch | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch index 8231585..afa3b72 100644 --- a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch @@ -1,6 +1,6 @@ Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map> -Date: 2022-08-03 -Version: 11.23 +Date: 2022-09-07 +Version: 11.25 Author: bgstack15 diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 @@ -260,10 +260,9 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/toggle_button.h 11.1-2/wx+/toggle_bu 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, +--- 11.25-0/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 14:54:31.552630085 -0400 ++++ 11.25-1/FreeFileSync/Source/ui/gui_status_handler.cpp 2022-09-07 16:32:17.114749584 -0400 +@@ -44,8 +44,8 @@ mainDlg_.Update(); //don't wait until idle event! //register keys @@ -274,7 +273,7 @@ index 3cb6aaaa..9484af2c 100644 } -@@ -128,9 +128,8 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel() +@@ -129,9 +129,8 @@ mainDlg_.auiMgr_.Update(); //unregister keys @@ -286,7 +285,7 @@ index 3cb6aaaa..9484af2c 100644 mainDlg_.compareStatus_->teardown(); -@@ -314,20 +313,20 @@ void StatusHandlerTemporaryPanel::forceUiUpdateNoThrow() +@@ -324,7 +323,7 @@ } @@ -295,13 +294,7 @@ index 3cb6aaaa..9484af2c 100644 { const int keyCode = event.GetKeyCode(); if (keyCode == WXK_ESCAPE) - { - wxCommandEvent dummy; -- onAbortCompare(dummy); -+ OnAbortCompare(dummy); - } - - event.Skip(); +@@ -334,7 +333,7 @@ } @@ -352,18 +345,17 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+ return bmpSquare; }; pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim())); ---- 11.22-0/wx+/rtl.h 2022-06-26 12:01:15.642291514 -0400 -+++ 11.22-1/wx+/rtl.h 2022-06-26 12:58:17.248838575 -0400 -@@ -69,9 +69,6 @@ - if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! - buffer.emplace(rect.GetSize()); - -- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? -- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // -- - wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap - memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! +--- 11.25-0/wx+/rtl.h 2022-09-07 14:54:31.712631887 -0400 ++++ 11.25-1/wx+/rtl.h 2022-09-07 15:57:01.638891035 -0400 +@@ -70,8 +70,6 @@ + if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly! + buffer.emplace(rect.GetSize()); + +- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here? +- buffer->SetScaleFactor(dc.GetContentScaleFactor()); // + wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap + memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction! --- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 12:01:15.634291415 -0400 +++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 14:44:38.556188935 -0400 @@ -3595,7 +3590,6 @@ |