diff options
| author | bubnikv <bubnikv@gmail.com> | 2020-02-21 15:38:06 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2020-02-21 15:38:06 +0300 |
| commit | a7ffd2a6fe5408a135c1b7c33da33613bc3b63a7 (patch) | |
| tree | 1c3c7725f2c729c5538315938a147441e4e4ef31 /src/slic3r/GUI/GUI.hpp | |
| parent | 0486e412f4dc2618a79b81db093bb7dbfa5aa842 (diff) | |
GUI::show_error() is now generalized for std::string and const char*
Fixed return type of std::string translate_utf8() with context
(incorrectly returned wxString, should return std::string).
Fixed double translation of BackgroundSlicingProcess::validate() in Plater.
Diffstat (limited to 'src/slic3r/GUI/GUI.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index 0b904bad8..b13e7c042 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -39,6 +39,8 @@ extern void add_menus(wxMenuBar *menu, int event_preferences_changed, int event_ 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(wxWindow* parent, const char* message); +inline void show_error(wxWindow* parent, const std::string& message) { show_error(parent, message.c_str()); } 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); |