3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed a build under OSX

Browse source
This commit is contained in:
Slic3rPE 2020-08-06 10:56:14 +02:00
parent 6ee804f466
commit 42f3bfb0f6
5 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/UnsavedChangesDialog.cpp
View file

@ -44,14 +44,14 @@ static std::string orange = "#ed6b21";
static void color_string(wxString& str, const std::string& color)
{
#ifdef SUPPORTS_MARKUP
#if defined(SUPPORTS_MARKUP) && defined(wxHAS_GENERIC_DATAVIEWCTRL)
str = from_u8((boost::format("<span color=\"%1%\">%2%</span>") % color % into_u8(str)).str());
#endif
}
static void make_string_bold(wxString& str)
{
#ifdef SUPPORTS_MARKUP
#if defined(SUPPORTS_MARKUP) && defined(wxHAS_GENERIC_DATAVIEWCTRL)
str = from_u8((boost::format("<b>%1%</b>") % into_u8(str)).str());
#endif
}
@ -133,7 +133,7 @@ ModelNode::ModelNode(ModelNode* parent, const wxString& text, const wxString& ol
void ModelNode::UpdateEnabling()
{
#ifdef SUPPORTS_MARKUP
#if defined(SUPPORTS_MARKUP) && defined(wxHAS_GENERIC_DATAVIEWCTRL)
auto change_text_color = [](wxString& str, const std::string& clr_from, const std::string& clr_to)
{
std::string old_val = into_u8(str);