3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-28 11:11:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixes after merging 2.3.2/2.3.3 changes from stable to master.

Browse source
This commit is contained in:
Vojtech Bubnik 2021-08-13 14:53:13 +02:00
parent add67d769a
commit d569789285
3 changed files with 17 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Jobs/SLAImportJob.cpp
View file

@ -119,6 +119,7 @@ public:
wxString path;
Vec2i win = {2, 2};
std::string err;
ConfigSubstitutions config_substitutions;
priv(Plater *plt) : plater{plt} {}
};

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

@ -114,6 +114,22 @@ public:
#endif
// Generic info dialog, used for displaying exceptions
class InfoDialog : public MsgDialog
{
public:
InfoDialog(wxWindow *parent, const wxString &title, const wxString &msg);
InfoDialog(InfoDialog&&) = delete;
InfoDialog(const InfoDialog&) = delete;
InfoDialog&operator=(InfoDialog&&) = delete;
InfoDialog&operator=(const InfoDialog&) = delete;
virtual ~InfoDialog() = default;
private:
wxString msg;
};
}
}