Index: source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
===================================================================
--- source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
+++ source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
@@ -166,11 +166,11 @@
 	else
 	{
 		wxString filePath = GetSelectedFilePath();
-		AtlasMessage::qVFSFileExists fileExistsQuery(filePath.wc_str());
+		AtlasMessage::qVFSFileExists fileExistsQuery(filePath.ToStdWstring());
 		fileExistsQuery.Post();
 		if (!filePath.IsEmpty() && fileExistsQuery.exists)
 		{
-			AtlasMessage::qVFSFileRealPath pathQuery(filePath.wc_str());
+			AtlasMessage::qVFSFileRealPath pathQuery(filePath.ToStdWstring());
 			pathQuery.Post();
 			wxDynamicCast(FindWindow(ID_MapDialogFilename), wxTextCtrl)->ChangeValue(*pathQuery.realPath);
 		}
@@ -221,7 +221,7 @@
 	if (filePath.empty())
 		return;
 
-	AtlasMessage::qVFSFileExists qry(filePath.wc_str());
+	AtlasMessage::qVFSFileExists qry(filePath.ToStdWstring());
 	qry.Post();
 	if (!qry.exists)
 		return;
@@ -236,7 +236,7 @@
 		return;
 
 	// TODO: this test would work better outside the VFS
-	AtlasMessage::qVFSFileExists qry(filePath.wc_str());
+	AtlasMessage::qVFSFileExists qry(filePath.ToStdWstring());
 	qry.Post();
 	if (qry.exists)
 	{
Index: source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
===================================================================
--- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@@ -748,7 +748,7 @@
 	wxBusyInfo busy(_("Loading ") + name);
 	wxBusyCursor busyc;
 
-	AtlasMessage::qVFSFileExists qry(filename.wc_str());
+	AtlasMessage::qVFSFileExists qry(filename.ToStdWstring());
 	qry.Post();
 	if (!qry.exists)
 		return false;
@@ -758,7 +758,7 @@
 	m_ToolManager.SetCurrentTool(_T(""));
 	// TODO: clear the undo buffer, etc
 
-	std::wstring map(filename.wc_str());
+	std::wstring map(filename.ToStdWstring());
 	POST_MESSAGE(LoadMap, (map));
 
 	SetOpenFilename(name);
@@ -811,7 +811,7 @@
 
 	OpenFile(_T(""), _T("maps/scenarios/_default.xml"));
 
-	std::wstring image(dlg.GetPath().wc_str());
+	std::wstring image(dlg.GetPath().ToStdWstring());
 	POST_MESSAGE(ImportHeightmap, (image));
 
 	// TODO: Make this a non-undoable command
@@ -855,7 +855,7 @@
 		// the preview units.)
 		m_ToolManager.SetCurrentTool(_T(""));
 
-		std::wstring map(m_OpenFilename.wc_str());
+		std::wstring map(m_OpenFilename.ToStdWstring());
 		POST_MESSAGE(SaveMap, (map));
 
 		// Wait for it to finish saving
@@ -877,7 +877,7 @@
 
 		m_ToolManager.SetCurrentTool(_T(""));
 
-		std::wstring map(filePath.wc_str());
+		std::wstring map(filePath.ToStdWstring());
 		POST_MESSAGE(SaveMap, (map));
 
 		SetOpenFilename(filePath);