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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/slic3r/GUI/GUI.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index c22fd6f79..45921b530 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -229,10 +229,15 @@ void show_error(wxWindow* parent, const wxString& message) msg.ShowModal(); } +void show_error(wxWindow* parent, const char* message) +{ + show_error(parent, wxString::FromUTF8(message)); +} + void show_error_id(int id, const std::string& message) { auto *parent = id != 0 ? wxWindow::FindWindowById(id) : nullptr; - show_error(parent, from_u8(message)); + show_error(parent, message); } void show_info(wxWindow* parent, const wxString& message, const wxString& title) |