Merge branch '11.2' into 'master'11.2

add upstream 11.2

See merge request opensource-tracking/FreeFileSync!26

1 files changed, 2 insertions, 2 deletions

diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h
index 52bd593c..87474708 100644
--- a/wx+/popup_dlg_generated.h
+++ b/wx+/popup_dlg_generated.h
@@ -49,7 +49,7 @@ protected:
     wxCheckBox* m_checkBoxCustom;
     wxBoxSizer* bSizerStdButtons;
     wxButton* m_buttonAccept;
-    wxButton* m_buttonAcceptAll;
+    wxButton* m_buttonAccept2;
     wxButton* m_buttonDecline;
     wxButton* m_buttonCancel;
 
@@ -57,7 +57,7 @@ protected:
     virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
     virtual void onCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
     virtual void onButtonAccept( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onButtonAcceptAll( 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(); }