diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 614d4f7f47..c3554bfe5f 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -349,7 +349,7 @@ void AuFile::on_input_enter(wxCommandEvent &evt) wxString new_fullname_path = dir.wstring() + "/" + new_fullname; - fs::path new_dir_path(new_fullname_path.c_str()); + fs::path new_dir_path(new_fullname_path.ToStdWstring()); if (fs::exists(new_dir_path)) existing = true; @@ -465,7 +465,7 @@ void AuFile::on_set_cover() auto full_root_path_str = encode_path(full_root_path.string().c_str()); auto dir = wxString::Format("%s/.thumbnails", full_root_path_str); - fs::path dir_path(dir.c_str()); + fs::path dir_path(dir.ToStdWstring()); if (!fs::exists(dir_path)) { fs::create_directory(dir_path); @@ -509,7 +509,7 @@ void AuFile::on_set_delete() auto full_root_path = full_path.branch_path(); auto full_root_path_str = encode_path(full_root_path.string().c_str()); auto dir = wxString::Format("%s/.thumbnails", full_root_path_str); - fs::path dir_path(dir.c_str()); + fs::path dir_path(dir.ToStdWstring()); auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png"; auto small_img_path = dir_path.string() + "/thumbnail_small.png"; @@ -774,7 +774,7 @@ AuxiliaryPanel::AuxiliaryPanel(wxWindow *parent, wxWindowID id, const wxPoint &p auto list = iter->second; for (auto i = 0; i < list.size(); i++) { if (list[i].wstring() == old_name) { - list[i] = fs::path(new_name.c_str()); + list[i] = fs::path(new_name.ToStdWstring()); break; } } @@ -952,7 +952,7 @@ void AuxiliaryPanel::on_import_file(wxCommandEvent &event) // add in file list iter = m_paths_list.find(file_model.ToStdString()); - auto file_fs_path = fs::path(dir_path.c_str()); + auto file_fs_path = fs::path(dir_path.ToStdWstring()); if (iter != m_paths_list.end()) { m_paths_list[file_model.ToStdString()].push_back(file_fs_path); } else { @@ -1032,7 +1032,7 @@ void AuxiliaryPanel::Reload(wxString aux_path) auto idx = file_path.find(folder.ToStdString()); if (idx != std::string::npos) { auto iter = m_paths_list.find(folder.ToStdString()); - auto file_path_str = fs::path(file_path.c_str()); + auto file_path_str = fs::path(file_path.ToStdWstring()); if (iter != m_paths_list.end()) { m_paths_list[folder.ToStdString()].push_back(file_path_str); diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp index 897d2450dd..109b74a25a 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp @@ -32,7 +32,7 @@ public: m_container = is_container; m_root = false; path = abs_path; - fs::path path_obj(path.c_str()); + boost::filesystem::path path_obj(path.ToStdWstring()); name = path_obj.filename().generic_wstring(); parent->Append(this); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 64d4d279d7..67f5f25ab8 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3069,7 +3069,7 @@ void SelectMachineDialog::set_default() filename = m_plater->get_export_gcode_filename("", true); } - fs::path filename_path(filename.c_str()); + fs::path filename_path(filename.ToStdWstring()); m_current_project_name = wxString::FromUTF8(filename_path.filename().string()); m_rename_text->SetLabelText(m_current_project_name); m_rename_normal_panel->Layout(); diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index d549b83f2b..c800df5fb5 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -1123,7 +1123,7 @@ void SendToPrinterDialog::set_default() } } - fs::path filename_path(filename.c_str()); + fs::path filename_path(filename.ToStdWstring()); m_current_project_name = wxString::FromUTF8(filename_path.filename().string()); m_rename_text->SetLabelText(m_current_project_name); m_rename_normal_panel->Layout(); @@ -1238,4 +1238,4 @@ SendToPrinterDialog::~SendToPrinterDialog() } } -} \ No newline at end of file +}