merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

src/slic3r/GUI/MsgDialog.hpp

@@ -3,7 +3,6 @@
 
 #include <string>
 #include <unordered_map>
-
 #include "GUI_Utils.hpp"
 #include <wx/dialog.h>
 #include <wx/font.h>
@@ -14,6 +13,7 @@
 #include <wx/statline.h>
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
+#include "Widgets/TextInput.hpp"
 #include "BBLStatusBar.hpp"
 #include "BBLStatusBarSend.hpp"
 
@@ -93,7 +93,7 @@ protected:
     MsgButtonsHash  m_buttons;
 	CheckBox* m_checkbox_dsa{nullptr};
 };
-wxDECLARE_EVENT(EVT_CHECKBOX_CHANGE, wxCommandEvent);
+
 
 // Generic error dialog, used for displaying exceptions
 class ErrorDialog : public MsgDialog
@@ -372,6 +372,7 @@ private:
     wxString msg;
 };
 
+
 }
 }