diff options
| -rw-r--r-- | src/slic3r/GUI/Field.cpp | 2 | ||||
| -rw-r--r-- | src/slic3r/GUI/Field.hpp | 2 | ||||
| -rw-r--r-- | src/slic3r/GUI/Tab.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 4f1c024eb..edc65aca0 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1019,7 +1019,7 @@ void StaticText::BUILD() if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit); if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit); - const wxString legend(m_opt.get_default_value<ConfigOptionString>()->value); + const wxString legend = wxString::FromUTF8(m_opt.get_default_value<ConfigOptionString>()->value.c_str()); auto temp = new wxStaticText(m_parent, wxID_ANY, legend, wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE); temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); temp->SetBackgroundStyle(wxBG_STYLE_PAINT); diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index 210ae73f4..ae449450a 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -465,7 +465,7 @@ public: void set_value(const std::string& value, bool change_event = false) { m_disable_change_event = !change_event; - dynamic_cast<wxStaticText*>(window)->SetLabel(value); + dynamic_cast<wxStaticText*>(window)->SetLabel(wxString::FromUTF8(value.data())); m_disable_change_event = false; } void set_value(const boost::any& value, bool change_event = false) { diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c6043e802..7ad4263ca 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2149,13 +2149,13 @@ PageShp TabPrinter::build_kinematics_page() def.gui_type = "legend"; def.mode = comAdvanced; def.tooltip = L("Values in this column are for Full Power mode"); - def.set_default_value(new ConfigOptionString{ L("Full Power") }); + def.set_default_value(new ConfigOptionString{ _(L("Full Power")).ToUTF8().data() }); auto option = Option(def, "full_power_legend"); line.append_option(option); def.tooltip = L("Values in this column are for Silent mode"); - def.set_default_value(new ConfigOptionString{ L("Silent") }); + def.set_default_value(new ConfigOptionString{ _(L("Silent")).ToUTF8().data() }); option = Option(def, "silent_legend"); line.append_option(option); |