Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal de Bruijn <pmjdebruijn@pcode.nl>2021-02-12 19:37:57 +0300
committerLukáš Matěna <33929324+lukasmatena@users.noreply.github.com>2021-02-14 09:41:21 +0300
commitb75830df6ed07bdcad8c40e6189df3fb5a5f8fe8 (patch)
treecb599ac34e1a9bfa736fa132dfcc38642c01e716
parent9c568a543c79aceb2f2d40f7349a49b7c5722e44 (diff)
UnsavedChangesDialog: fix wxString casts
similar instance: https://github.com/prusa3d/PrusaSlicer/commit/08388d3daac2527ed65516e405c626e51aa5396b related to: #5752
-rw-r--r--src/slic3r/GUI/UnsavedChangesDialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index 1b0d30424..07a6fc739 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -201,9 +201,9 @@ void ModelNode::UpdateIcons()
{
// update icons for the colors, if any exists
if (!m_old_color.IsEmpty())
- m_old_color_bmp = get_bitmap(m_toggle ? m_old_color : grey.c_str());
+ m_old_color_bmp = get_bitmap(m_toggle ? m_old_color : wxString::FromUTF8(grey.c_str()));
if (!m_new_color.IsEmpty())
- m_new_color_bmp = get_bitmap(m_toggle ? m_new_color : grey.c_str());
+ m_new_color_bmp = get_bitmap(m_toggle ? m_new_color : wxString::FromUTF8(grey.c_str()));
// update main icon, if any exists
if (m_icon_name.empty())