add upstream 11.16

7 files changed, 93 insertions, 99 deletions

diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp
index b519aac2..b8876dc3 100644
--- a/wx+/image_tools.cpp
+++ b/wx+/image_tools.cpp
@@ -180,10 +180,7 @@ wxImage zen::stackImages(const wxImage& img1, const wxImage& img2, ImageStackLay
 
 wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const wxColor& col, ImageStackAlignment textAlign)
 {
-    //assert(!contains(text, L"&")); //accelerator keys not supported here
-    wxString textFmt = replaceCpy(text, L"&", L"", false);
-
-    const std::vector<std::pair<wxString, wxSize>> lineInfo = getTextExtentInfo(textFmt, font);
+    const std::vector<std::pair<wxString, wxSize>> lineInfo = getTextExtentInfo(text, font);
 
     int maxWidth   = 0;
     int lineHeight = 0;
diff --git a/wx+/no_flicker.h b/wx+/no_flicker.h
index a84a7228..d8f2d6cd 100644
--- a/wx+/no_flicker.h
+++ b/wx+/no_flicker.h
@@ -30,15 +30,17 @@ void setText(wxTextCtrl& control, const wxString& newText, bool* additionalLayou
 }
 
 
-void setText(wxStaticText& control, wxString newText, bool* additionalLayoutChange = nullptr)
+void setText(wxStaticText& control, const wxString& newText, bool* additionalLayoutChange = nullptr)
 {
+    //wxControl::EscapeMnemonics() (& -> &&) =>  wxControl::GetLabelText/SetLabelText
+    //e.g. "filenames in the sync progress dialog": https://sourceforge.net/p/freefilesync/bugs/279/
 
-    const wxString& label = control.GetLabel(); //perf: don't call twice!
+    const wxString& label = control.GetLabelText(); //perf: don't call twice!
     if (additionalLayoutChange && !*additionalLayoutChange)
         *additionalLayoutChange = label.length() != newText.length(); //avoid screen flicker: update layout only when necessary
 
     if (label != newText)
-        control.SetLabel(newText);
+        control.SetLabelText(newText);
 }
 
 
diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp
index 3d4077c3..703371c2 100644
--- a/wx+/popup_dlg.cpp
+++ b/wx+/popup_dlg.cpp
@@ -16,7 +16,7 @@
 #include "popup_dlg_generated.h"
 #include "std_button_layout.h"
 #include "taskbar.h"
-    #include "window_tools.h"
+#include "window_tools.h"
 
 
 using namespace zen;
@@ -155,19 +155,16 @@ public:
 
         int maxWidth  = fastFromDIP(500);
         int maxHeight = fastFromDIP(400); //try to determine better value based on actual display resolution:
-
         if (parent)
-        {
-            const int disPos = wxDisplay::GetFromWindow(parent); //window must be visible
-            if (disPos != wxNOT_FOUND)
+            if (const int disPos = wxDisplay::GetFromWindow(parent); //window must be visible
+                disPos != wxNOT_FOUND)
                 maxHeight = wxDisplay(disPos).GetClientArea().GetHeight() *  2 / 3;
-        }
 
         assert(!cfg.textMain.empty() || !cfg.textDetail.empty());
         if (!cfg.textMain.empty())
         {
             setMainInstructionFont(*m_staticTextMain);
-            m_staticTextMain->SetLabel(cfg.textMain);
+            m_staticTextMain->SetLabelText(cfg.textMain);
             m_staticTextMain->Wrap(maxWidth); //call *after* SetLabel()
         }
         else
@@ -175,10 +172,7 @@ public:
 
         if (!cfg.textDetail.empty())
         {
-            wxString text;
-            if (!cfg.textMain.empty())
-                text += L'\n';
-            text += trimCpy(cfg.textDetail) + L'\n'; //add empty top/bottom lines *instead* of using border space!
+            const wxString& text = trimCpy(cfg.textDetail) + L'\n'; //add empty line *instead* of using border space!
 
             setBestInitialSize(*m_richTextDetail, text, wxSize(maxWidth, maxHeight));
             setTextWithUrls(*m_richTextDetail, text);
diff --git a/wx+/popup_dlg.h b/wx+/popup_dlg.h
index 11e96e3b..12c19c14 100644
--- a/wx+/popup_dlg.h
+++ b/wx+/popup_dlg.h
@@ -69,7 +69,7 @@ struct PopupDialogCfg
     PopupDialogCfg& setMainInstructions  (const wxString& label) { textMain   = label; return *this; } //set at least one of these!
     PopupDialogCfg& setDetailInstructions(const wxString& label) { textDetail = label; return *this; } //
     PopupDialogCfg& disableButton(ConfirmationButton3 button) { disabledButtons.insert(button); return *this; }
-    PopupDialogCfg& remindWhenPending(const Zstring& soundFilePath) { soundFileAlertPending = soundFilePath; return *this; }
+    PopupDialogCfg& alertWhenPending(const Zstring& soundFilePath) { soundFileAlertPending = soundFilePath; return *this; }
     PopupDialogCfg& setCheckBox(bool& value, const wxString& label, ConfirmationButton3 disableWhenChecked = ConfirmationButton3::cancel)
     {
         checkBoxValue = &value;
diff --git a/wx+/popup_dlg_generated.cpp b/wx+/popup_dlg_generated.cpp
index 22e3d02c..43841437 100644
--- a/wx+/popup_dlg_generated.cpp
+++ b/wx+/popup_dlg_generated.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -11,88 +11,88 @@
 
 PopupDialogGenerated::PopupDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 );
+	m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 );
 
-    wxBoxSizer* bSizer16;
-    bSizer16 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer16;
+	bSizer16 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer16->Add( 0, 10, 0, 0, 5 );
+	bSizer16->Add( 0, 10, 0, 0, 5 );
 
-    m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( -1 );
-    bSizer16->Add( m_staticTextMain, 0, wxRIGHT, 10 );
+	m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( -1 );
+	bSizer16->Add( m_staticTextMain, 0, wxBOTTOM|wxRIGHT, 10 );
 
-    m_richTextDetail = new wxRichTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
-    bSizer16->Add( m_richTextDetail, 1, wxEXPAND, 5 );
+	m_richTextDetail = new wxRichTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
+	bSizer16->Add( m_richTextDetail, 1, wxEXPAND, 5 );
 
 
-    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
 
 
-    m_panel33->SetSizer( bSizer165 );
-    m_panel33->Layout();
-    bSizer165->Fit( m_panel33 );
-    bSizer24->Add( m_panel33, 1, wxEXPAND, 5 );
+	m_panel33->SetSizer( bSizer165 );
+	m_panel33->Layout();
+	bSizer165->Fit( m_panel33 );
+	bSizer24->Add( m_panel33, 1, wxEXPAND, 5 );
 
-    m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline6, 0, wxEXPAND, 5 );
+	m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline6, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonAccept = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonAccept = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonAccept->SetDefault();
-    bSizerStdButtons->Add( m_buttonAccept, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_buttonAccept->SetDefault();
+	bSizerStdButtons->Add( m_buttonAccept, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonAccept2 = new wxButton( this, wxID_YESTOALL, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonAccept2, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonAccept2 = new wxButton( this, wxID_YESTOALL, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonAccept2, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonDecline = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonDecline, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonDecline = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonDecline, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    bSizer24->Add( bSizer25, 0, wxEXPAND, 5 );
+	bSizer24->Add( bSizer25, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::onClose ) );
-    m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onCheckBoxClick ), NULL, this );
-    m_buttonAccept->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonAccept ), NULL, this );
-    m_buttonAccept2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonAccept2 ), NULL, this );
-    m_buttonDecline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonDecline ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::onClose ) );
+	m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onCheckBoxClick ), NULL, this );
+	m_buttonAccept->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonAccept ), NULL, this );
+	m_buttonAccept2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonAccept2 ), NULL, this );
+	m_buttonDecline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onButtonDecline ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::onCancel ), NULL, this );
 }
 
 PopupDialogGenerated::~PopupDialogGenerated()
diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h
index 93842d17..d7dcf5fd 100644
--- a/wx+/popup_dlg_generated.h
+++ b/wx+/popup_dlg_generated.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -38,34 +38,35 @@
 ///////////////////////////////////////////////////////////////////////////////
 class PopupDialogGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel33;
-    wxStaticBitmap* m_bitmapMsgType;
-    wxStaticText* m_staticTextMain;
-    wxRichTextCtrl* m_richTextDetail;
-    wxStaticLine* m_staticline6;
-    wxCheckBox* m_checkBoxCustom;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonAccept;
-    wxButton* m_buttonAccept2;
-    wxButton* m_buttonDecline;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel33;
+		wxStaticBitmap* m_bitmapMsgType;
+		wxStaticText* m_staticTextMain;
+		wxRichTextCtrl* m_richTextDetail;
+		wxStaticLine* m_staticline6;
+		wxCheckBox* m_checkBoxCustom;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonAccept;
+		wxButton* m_buttonAccept2;
+		wxButton* m_buttonDecline;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, overide them in your derived class
-    virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void onCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onButtonAccept( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onButtonAccept2( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onButtonDecline( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, override them in your derived class
+		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onButtonAccept( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onButtonAccept2( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onButtonDecline( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~PopupDialogGenerated();
+		PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+
+		~PopupDialogGenerated();
 
 };
 
diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp
index e3c021c6..63a004bd 100644
--- a/wx+/tooltip.cpp
+++ b/wx+/tooltip.cpp
@@ -67,10 +67,10 @@ void Tooltip::show(const wxString& text, wxPoint mousePos, const wxImage* img)
         tipWindow_->bitmapLeft_->SetBitmap(newImg);
         tipWindow_->Refresh(); //needed if bitmap size changed!
     }
-
-    if (text != tipWindow_->staticTextMain_->GetLabel())
+    
+    if (text != tipWindow_->staticTextMain_->GetLabelText())
     {
-        tipWindow_->staticTextMain_->SetLabel(text);
+        tipWindow_->staticTextMain_->SetLabelText(text);
         tipWindow_->staticTextMain_->Wrap(fastFromDIP(600));
     }