Merge branch 'b11.16' into 'master'11.16

add upstream 11.16

See merge request opensource-tracking/FreeFileSync!40

1 files changed, 25 insertions, 24 deletions

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();
 
 };