mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
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
This commit is contained in:
parent
c326b31c92
commit
aa8c97803c
1 changed files with 1 additions and 1 deletions
|
@ -1010,7 +1010,7 @@ wxString Control::get_tooltip(int tick/*=-1*/)
|
||||||
tick_code_it->gcode == ToolChangeCode ?
|
tick_code_it->gcode == ToolChangeCode ?
|
||||||
from_u8((boost::format(_utf8(L("Extruder (tool) is changed to Extruder \"%1%\""))) %
|
from_u8((boost::format(_utf8(L("Extruder (tool) is changed to Extruder \"%1%\""))) %
|
||||||
tick_code_it->extruder ).str()) :
|
tick_code_it->extruder ).str()) :
|
||||||
tick_code_it->gcode;
|
from_u8(tick_code_it->gcode);
|
||||||
|
|
||||||
// If tick is marked as a conflict (exclamation icon),
|
// If tick is marked as a conflict (exclamation icon),
|
||||||
// we should to explain why
|
// we should to explain why
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue