Fix wxArrayString ctor, wstring concat, and wxList::Node for wx 3.3
- Plater: use Add() instead of wxArrayString(size_t, wxString) ctor - Search: change sep from std::wstring to wxString for concatenation - SendMultiMachinePage: replace wxList::Node* with compatibility_iterator (Node type removed in wx 3.3 with wxUSE_STD_CONTAINERS=ON)
This commit is contained in:
@@ -12112,7 +12112,7 @@ void Plater::import_model_id(wxString download_info)
|
||||
/* load project */
|
||||
// Orca: If download is a zip file, treat it as if file has been drag and dropped on the plater
|
||||
if (target_path.extension() == ".zip")
|
||||
this->load_files(wxArrayString(1, wxString::FromUTF8(target_path.string())));
|
||||
{ wxArrayString arr; arr.Add(wxString::FromUTF8(target_path.string())); this->load_files(arr); }
|
||||
else
|
||||
this->load_project(target_path.wstring());
|
||||
/*BBS set project info after load project, project info is reset in load project */
|
||||
|
||||
Reference in New Issue
Block a user