GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-05 10:50:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3021:58: error: use of deleted function 'std::optional<wxFont>& std::optional<wxFont>::operator=(std::optional<wxFont>&&)'
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3026:55: error: use of deleted function 'std::optional<wxFont>& std::optional<wxFont>::operator=(std::optional<wxFont>&&)'
This commit is contained in:
Filip Sykala - NTB T15p 2022-11-21 14:19:45 +01:00
parent a54459d46a
commit 225fb7d8aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/Utils/WxFontUtils.cpp
View File

@ -175,9 +175,9 @@ std::optional<wxFont> WxFontUtils::load_wxFont(
const std::string &font_descriptor) const std::string &font_descriptor)
{ {
wxString font_descriptor_wx(font_descriptor); wxString font_descriptor_wx(font_descriptor);
wxFont wx_font(font_descriptor_wx); std::optional<wxFont> res = std::make_optional<wxFont>(font_descriptor_wx);
if (!wx_font.IsOk()) return {}; if (!res->IsOk()) return {};
return wx_font; return res;
} }
using TypeToFamily = boost::bimap<wxFontFamily, std::string_view>; using TypeToFamily = boost::bimap<wxFontFamily, std::string_view>;
@ -244,9 +244,9 @@ std::optional<wxFont> WxFontUtils::create_wxFont(const EmbossStyle &style)
// default: // default:
//} //}
wxFont font(info); std::optional<wxFont> res = std::make_optional<wxFont>(info);
if (!font.IsOk()) return {}; if (!res->IsOk()) return {};
return font; return res;
} }
void WxFontUtils::update_property(FontProp &font_prop, const wxFont &font) void WxFontUtils::update_property(FontProp &font_prop, const wxFont &font)