Use wxString in lieu of std::string to stop confusion on OSX, also makes more sense..

Originally committed to SVN as r3573.
This commit is contained in:
Amar Takhar 2009-09-26 21:12:15 +00:00
parent 56ff7c2133
commit 8322981b47
2 changed files with 3 additions and 3 deletions

View file

@ -153,7 +153,7 @@ void Report::ProcessNode(wxXmlNode *node, wxString *text, wxListView *listView)
while (child) { while (child) {
wxString name = child->GetName(); wxString name = child->GetName();
if ((names = nMap.find(std::string(name.utf8_str()))) != nMap.end()) { if ((names = nMap.find(name)) != nMap.end()) {
node_name = locale->GetString(names->second); node_name = locale->GetString(names->second);
} else { } else {
wxLogDebug("Report::ProcessNode Unknown node found: \"%s\" (add it to nMap)\n", name); wxLogDebug("Report::ProcessNode Unknown node found: \"%s\" (add it to nMap)\n", name);

View file

@ -43,10 +43,10 @@ private:
}; };
/// Map of internal XML elements to human readable names. /// Map of internal XML elements to human readable names.
typedef std::map<std::string, std::string, lst_comp> nameMap; typedef std::map<wxString, wxString, lst_comp> nameMap;
/// element->human name pairs. /// element->human name pairs.
typedef std::pair<std::string, std::string> nPair; typedef std::pair<wxString, wxString> nPair;
/// Struct to hold generatex XML Report. /// Struct to hold generatex XML Report.
struct XMLReport { struct XMLReport {