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

Merge branch 'updating' of https://github.com/prusa3d/Slic3r into updating

Browse source
This commit is contained in:
YuSanka 2018-04-30 16:30:23 +02:00
commit 6d34db352d
11 changed files with 329 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xs/src/slic3r/GUI/GUI.hpp
View file

@ -118,6 +118,7 @@ void add_created_tab(Tab* panel);
void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt_key, const boost::any& value, int opt_index = 0);
void show_error(wxWindow* parent, const wxString& message);
void show_error_id(int id, const std::string& message); // For Perl
void show_info(wxWindow* parent, const wxString& message, const wxString& title);
void warning_catcher(wxWindow* parent, const wxString& message);