1
0
forked from mirrors/0ad

Fix compilation of Atlas on UNICODE BUILDS

Patch by: @madpilot
Tested by: nwtour
Differential Revision: https://code.wildfiregames.com/D1593
This was SVN commit r24970.
This commit is contained in:
Stan
2021-03-01 23:32:23 +00:00
parent f3aedf88a6
commit ac72fb4486
2 changed files with 11 additions and 11 deletions
@@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2021 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -166,11 +166,11 @@ void MapDialog::OnListBox(wxCommandEvent& evt)
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 @@ void MapDialog::OpenFile()
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 @@ void MapDialog::SaveFile()
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)
{