From 79e1060bde2982863a66df852eaca4aff6b24147 Mon Sep 17 00:00:00 2001 From: thysson2701 Date: Thu, 11 Jun 2026 22:09:33 +0200 Subject: [PATCH] fix(stable): wx 3.3.2 char+wxString in Search, wxList::Node in SendMultiMachinePage --- src/slic3r/GUI/Search.cpp | 2 +- src/slic3r/GUI/SendMultiMachinePage.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp index 1aef329297b..d8a96101f62 100644 --- a/src/slic3r/GUI/Search.cpp +++ b/src/slic3r/GUI/Search.cpp @@ -213,7 +213,7 @@ bool OptionsSearcher::search(const std::string &search, bool force /* = false*/, }; auto get_tooltip = [this, &sep](const Option &opt) { - return marker_by_type(opt.type, printer_technology) + opt.category_local + sep + opt.group_local + sep + opt.label_local; + return wxString(1, marker_by_type(opt.type, printer_technology)) + opt.category_local + sep + opt.group_local + sep + opt.label_local; }; std::vector matches, matches2; diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 569f2d561d7..8758f2e5f42 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -449,7 +449,7 @@ PrintParams SendMultiMachinePage::request_params(MachineObject* obj) bool timelapse = app_config->get("print", "timelapse") == "1" ? true : false; auto use_ams = false; - AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + AmsRadioSelectorList::compatibility_iterator node = m_radio_group.GetFirst(); auto groupid = 0; @@ -938,7 +938,7 @@ wxBoxSizer* SendMultiMachinePage::create_item_radiobox(wxString title, wxWindow* void SendMultiMachinePage::OnSelectRadio(wxMouseEvent& event) { - AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + AmsRadioSelectorList::compatibility_iterator node = m_radio_group.GetFirst(); auto groupid = 0; //while (node) { @@ -975,7 +975,7 @@ void SendMultiMachinePage::OnSelectRadio(wxMouseEvent& event) void SendMultiMachinePage::on_select_radio(std::string param) { - AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + AmsRadioSelectorList::compatibility_iterator node = m_radio_group.GetFirst(); auto groupid = 0; while (node) { @@ -995,7 +995,7 @@ void SendMultiMachinePage::on_select_radio(std::string param) bool SendMultiMachinePage::get_value_radio(std::string param) { - AmsRadioSelectorList::Node* node = m_radio_group.GetFirst(); + AmsRadioSelectorList::compatibility_iterator node = m_radio_group.GetFirst(); auto groupid = 0; while (node) { AmsRadioSelector* rs = node->GetData();