Merge branch 'b11.17' into 'master'11.17

add upstream 11.17

See merge request opensource-tracking/FreeFileSync!41

1 files changed, 23 insertions, 23 deletions

diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h
index d7dcf5fd..6218c6d8 100644
--- a/wx+/popup_dlg_generated.h
+++ b/wx+/popup_dlg_generated.h
@@ -38,35 +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, 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(); }
+    // 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( 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();
 
 };