From 816dae015b5ed19c8ae2d16933babab7835c6bf3 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Thu, 11 Aug 2022 16:08:29 +0800 Subject: [PATCH] FIX: fix display error in release note Change-Id: I71edf47b4b48ce5ae310b8633fe351318f8f24ef --- src/slic3r/GUI/ReleaseNote.cpp | 2 +- src/slic3r/GUI/ReleaseNote.hpp | 2 +- src/slic3r/GUI/UpgradePanel.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 7116995a0..f36c488ba 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -79,7 +79,7 @@ void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect) { } -void ReleaseNoteDialog::update_release_note(std::string release_note, std::string version) +void ReleaseNoteDialog::update_release_note(wxString release_note, std::string version) { m_text_up_info->SetLabel(wxString::Format("version %s update information :", version)); wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp index 6dc53abbb..1e0945f81 100644 --- a/src/slic3r/GUI/ReleaseNote.hpp +++ b/src/slic3r/GUI/ReleaseNote.hpp @@ -43,7 +43,7 @@ public: ~ReleaseNoteDialog(); void on_dpi_changed(const wxRect &suggested_rect) override; - void update_release_note(std::string release_note, std::string version); + void update_release_note(wxString release_note, std::string version); wxStaticText * m_text_up_info{nullptr}; wxScrolledWindow *m_scrollwindw_release_note {nullptr}; diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 0cfa9ac80..7d19dd934 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -519,18 +519,18 @@ void MachineInfoPanel::on_show_release_note(wxMouseEvent &event) if (!dev) return; - std::string next_version_release_note = ""; - std::string now_version_release_note = ""; + wxString next_version_release_note; + wxString now_version_release_note; std::string version_number = ""; for (auto iter : m_obj->firmware_list) { if (iter.version == m_obj->ota_new_version_number) { version_number = m_obj->ota_new_version_number; - next_version_release_note = iter.description; + next_version_release_note = wxString::FromUTF8(iter.description); } if (iter.version == m_obj->get_ota_version()) { version_number = m_obj->get_ota_version(); - now_version_release_note = iter.description; + now_version_release_note = wxString::FromUTF8(iter.description); } }