From aa8c97803c966b6c40c87e03bd2617d884acd1cd Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 25 Feb 2020 15:43:54 +0100 Subject: [PATCH] Fix of #3695 Ternary operator is given wxString and std::string, which does not work when implicit conversions between std::string and wxString are disabled --- src/slic3r/GUI/DoubleSlider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 9afbb73ed6..5bc054dd45 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1010,7 +1010,7 @@ wxString Control::get_tooltip(int tick/*=-1*/) tick_code_it->gcode == ToolChangeCode ? from_u8((boost::format(_utf8(L("Extruder (tool) is changed to Extruder \"%1%\""))) % tick_code_it->extruder ).str()) : - tick_code_it->gcode; + from_u8(tick_code_it->gcode); // If tick is marked as a conflict (exclamation icon), // we should to explain why