From 788059f3ebb501e75926e07e802621772bfb8be5 Mon Sep 17 00:00:00 2001 From: Filip Sykala - NTB T15p Date: Mon, 21 Nov 2022 21:48:52 +0100 Subject: [PATCH] Fix: ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2405:73: error: conversion from 'wxFont' to non-scalar type 'std::optional' requested ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:3019:12: warning: unused variable 'wx_font_opt' [-Wunused-variable] --- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 37ac6f88d..62af648b3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -2402,9 +2402,9 @@ void GLGizmoEmboss::draw_style_edit() { style.prop.boldness = stored_style->prop.boldness; style.prop.skew = stored_style->prop.skew; - std::optional new_wx_font = WxFontUtils::load_wxFont(style.path); - if (new_wx_font.has_value() && - m_style_manager.set_wx_font(*new_wx_font)) + wxFont new_wx_font = WxFontUtils::load_wxFont(style.path); + if (new_wx_font.IsOk() && + m_style_manager.set_wx_font(new_wx_font)) exist_change = true; } else if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Revert font changes.").c_str()); @@ -3016,7 +3016,6 @@ bool GLGizmoEmboss::load_configuration(ModelVolume *volume) return es.name == style.name; }; - int wx_font_opt; wxFont wx_font; bool is_path_changed = false; if (style.type == WxFontUtils::get_actual_type())