From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001 From: Gregor Riepl Date: Mon, 27 Nov 2023 13:01:55 +0100 Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString overloads --- src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp =================================================================== --- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -606,7 +606,7 @@ void PhysicalPrinterDialog::build_printh // Always fill in the "printhost_port" combo box from the config and select it. { Choice* choice = dynamic_cast(m_optgroup->get_field("printhost_port")); - choice->set_values({ m_config->opt_string("printhost_port") }); + choice->set_values(std::vector({ m_config->opt_string("printhost_port") })); choice->set_selection(); } Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/Plater.cpp =================================================================== --- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/Plater.cpp +++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/Plater.cpp @@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString p->reset(); - if (! load_files({ into_path(filename) }).empty()) { + if (! load_files(std::vector({ into_path(filename) })).empty()) { // At least one file was loaded. p->set_project_filename(filename); // Save the names of active presets and project specific config into ProjectDirtyStateManager. =================================================================== More of the same: =================================================================== --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -467,9 +467,7 @@ wxVariant nm, hst; job_list->GetValue(nm, evt.job_id, COL_FILENAME); job_list->GetValue(hst, evt.job_id, COL_HOST); - const wchar_t * nm_str = nm.GetString(); - const wchar_t * hst_str = hst.GetString(); - wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, into_u8(nm_str), into_u8(hst_str), evt.progress / 100.f); + wxGetApp().notification_manager()->set_upload_job_notification_percentage(evt.job_id + 1, into_u8(nm.GetString()), into_u8(hst.GetString()), evt.progress / 100.f); } } --- a/src/slic3r/Utils/PrusaConnect.cpp +++ b/src/slic3r/Utils/PrusaConnect.cpp @@ -290,7 +290,7 @@ if (path && (!available || *available)) { StorageInfo si; si.path = boost::nowide::widen(*path); - si.name = name ? boost::nowide::widen(*name) : wxString(); + si.name = name ? boost::nowide::widen(*name) : std::wstring(); // If read_only is missing, assume it is NOT read only. // si.read_only = read_only ? *read_only : false; // version without "ro" si.read_only = (read_only ? *read_only : (ro ? *ro : false));