diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-05-03 11:55:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 11:55:54 -0300 |
| commit | a22a474a59045ccb23a57495e4cae85ef7b49f9b (patch) | |
| tree | 5d4778b821e70338b57866208bcdb8e228c94918 /Project | |
| parent | 7804c1bd2c0bd2a5f135c30b20991e8187581cc6 (diff) | |
| parent | 2eebd5c5ffae87e3aa4f75ce63ee66ad57dc5c46 (diff) | |
| download | PSP.git-a22a474a59045ccb23a57495e4cae85ef7b49f9b.tar.gz PSP.git-a22a474a59045ccb23a57495e4cae85ef7b49f9b.tar.xz PSP.git-a22a474a59045ccb23a57495e4cae85ef7b49f9b.zip | |
Merge pull request #29 from ronignc/master
Appended mb_str() method to wxString objects so that g++ does not complain to us
Diffstat (limited to 'Project')
| -rw-r--r-- | Project/FileHanding.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Project/FileHanding.cpp b/Project/FileHanding.cpp index ac649bb..beb9b81 100644 --- a/Project/FileHanding.cpp +++ b/Project/FileHanding.cpp @@ -11,7 +11,7 @@ void FileHanding::SaveProject(wxFileName path) writeProjectsFile.close(); rapidxml::xml_document<> doc; - rapidxml::file<> xmlFile(path.GetFullPath()); + rapidxml::file<> xmlFile(path.GetFullPath().mb_str()); doc.parse<0>(xmlFile.data()); rapidxml::xml_node<>* decl = doc.allocate_node(rapidxml::node_declaration); @@ -782,7 +782,7 @@ void FileHanding::SaveProject(wxFileName path) bool FileHanding::OpenProject(wxFileName path) { rapidxml::xml_document<> doc; - rapidxml::file<> xmlFile(path.GetFullPath()); + rapidxml::file<> xmlFile(path.GetFullPath().mb_str()); doc.parse<0>(xmlFile.data()); @@ -1699,7 +1699,7 @@ void FileHanding::SaveControl(wxFileName path) writeProjectsFile.close(); rapidxml::xml_document<> doc; - rapidxml::file<> xmlFile(path.GetFullPath()); + rapidxml::file<> xmlFile(path.GetFullPath().mb_str()); doc.parse<0>(xmlFile.data()); rapidxml::xml_node<>* decl = doc.allocate_node(rapidxml::node_declaration); @@ -1727,7 +1727,7 @@ bool FileHanding::OpenControl(wxFileName path, std::vector<ConnectionLine*>& ctrlConnectionList) { rapidxml::xml_document<> doc; - rapidxml::file<> xmlFile(path.GetFullPath()); + rapidxml::file<> xmlFile(path.GetFullPath().mb_str()); doc.parse<0>(xmlFile.data()); @@ -2600,7 +2600,7 @@ void FileHanding::SetNodeValue(rapidxml::xml_document<>& doc, rapidxml::xml_node void FileHanding::SetNodeValue(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* node, int value) { - node->value(doc.allocate_string(wxString::Format("%d", value))); + node->value(doc.allocate_string(wxString::Format("%d", value).mb_str())); } void FileHanding::SetNodeValue(rapidxml::xml_document<>& doc, rapidxml::xml_node<>* node, double value) @@ -2621,7 +2621,7 @@ void FileHanding::SetNodeAttribute(rapidxml::xml_document<>& doc, const char* atrName, int value) { - node->append_attribute(doc.allocate_attribute(atrName, doc.allocate_string(wxString::Format("%d", value)))); + node->append_attribute(doc.allocate_attribute(atrName, doc.allocate_string(wxString::Format("%d", value).mb_str()))); } void FileHanding::SetNodeAttribute(rapidxml::xml_document<>& doc, |