3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 17:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge upstream changes

Browse source 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/MsgDialog.hpp
View file

@ -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;
};
}
}