Skip to content
Snippets Groups Projects
Commit 818c20c1 authored by Nuno Teixeira's avatar Nuno Teixeira
Browse files

cad/PrusaSlicer: Fix build with wxWidgets 3.2.4

- Patches taken from OpenBSD port

PR:		274367, 275082
Approved by:	portmgr (build fix blanket)
MFH:		2023Q4
parent 76ad9566
No related branches found
No related tags found
No related merge requests found
--- src/slic3r/GUI/PhysicalPrinterDialog.cpp.orig 2023-06-19 12:07:14 UTC
+++ src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -458,7 +458,7 @@ void PhysicalPrinterDialog::build_printhost_settings(C
// Always fill in the "printhost_port" combo box from the config and select it.
{
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
- choice->set_values({ m_config->opt_string("printhost_port") });
+ choice->set_values((const std::vector<std::string>){ m_config->opt_string("printhost_port") });
choice->set_selection();
}
--- src/slic3r/GUI/Plater.cpp.orig 2023-07-25 12:32:07 UTC
--- src/slic3r/GUI/Plater.cpp.orig 2023-06-19 12:07:14 UTC
+++ src/slic3r/GUI/Plater.cpp
@@ -2452,7 +2452,7 @@ std::vector<size_t> Plater::priv::load_files(const std
// when loading a project file. However, creating the dialog on heap causes issues on macOS, where it does not
......@@ -27,3 +27,12 @@
// For some reason on Linux the menu isn't displayed if position is
// specified (even though the position is sane).
position = wxDefaultPosition;
@@ -5281,7 +5281,7 @@ void Plater::load_project(const wxString& filename)
p->reset();
- if (! load_files({ into_path(filename) }).empty()) {
+ if (! load_files((const std::vector<boost::filesystem::path>){ 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.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment