dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert wxString using ToStdWstring

Browse source 
Avoid using c-style cast to convert wxString to std::wstring.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2026-07-19 19:06:49 +02:00
parent eae57d9aab
commit adfe6b0c36
No known key found for this signature in database
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinema/Cinema.cpp
View file

@ -114,7 +114,7 @@ void CinemaSidebar::OnAddPath(wxCommandEvent&)
if (m_NewPathName->GetValue().empty()) if (m_NewPathName->GetValue().empty())
return; return;
POST_COMMAND(AddCinemaPath, ((std::wstring)m_NewPathName->GetValue().wc_str())); POST_COMMAND(AddCinemaPath, (m_NewPathName->GetValue().ToStdWstring()));
m_NewPathName->Clear(); m_NewPathName->Clear();
ReloadPathList(); ReloadPathList();
} }
@ -129,7 +129,7 @@ void CinemaSidebar::OnDeletePath(wxCommandEvent&)
if (pathName.empty()) if (pathName.empty())
return; return;
POST_COMMAND(DeleteCinemaPath, ((std::wstring)pathName.wc_str())); POST_COMMAND(DeleteCinemaPath, (pathName.ToStdWstring()));
ReloadPathList(); ReloadPathList();
} }

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View file

@ -807,7 +807,7 @@ void MapSidebar::OnRandomGenerate(wxCommandEvent& WXUNUSED(evt))
m_ScenarioEditor.GetToolManager().SetCurrentTool(_T("")); m_ScenarioEditor.GetToolManager().SetCurrentTool(_T(""));
// TODO: clear the undo buffer, etc // TODO: clear the undo buffer, etc
AtlasMessage::qGenerateMap qry((std::wstring)scriptName.wc_str(), json); AtlasMessage::qGenerateMap qry(scriptName.ToStdWstring(), json);
qry.Post(); qry.Post();
if (qry.status < 0) if (qry.status < 0)

6
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
View file

@ -145,7 +145,7 @@ public:
m_Sizer->Clear(true); m_Sizer->Clear(true);
AtlasMessage::qGetTerrainTexturePreview qry((std::wstring)m_TextureName.wc_str(), imageWidth, imageHeight); AtlasMessage::qGetTerrainTexturePreview qry(m_TextureName.ToStdWstring(), imageWidth, imageHeight);
qry.Post(); qry.Post();
AtlasMessage::sTerrainTexturePreview preview = qry.preview; AtlasMessage::sTerrainTexturePreview preview = qry.preview;
@ -316,7 +316,7 @@ void TerrainSidebar::OnPassabilityChoice(wxCommandEvent& evt)
if (evt.GetSelection() == 0) if (evt.GetSelection() == 0)
POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", L"")); POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", L""));
else else
POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", (std::wstring)evt.GetString().wc_str())); POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", evt.GetString().ToStdWstring()));
} }
void TerrainSidebar::OnShowPriorities(wxCommandEvent& evt) void TerrainSidebar::OnShowPriorities(wxCommandEvent& evt)
@ -365,7 +365,7 @@ public:
wxBusyInfo busy (_("Loading terrain previews")); wxBusyInfo busy (_("Loading terrain previews"));
AtlasMessage::qGetTerrainGroupTextures query((std::wstring)m_Name.wc_str()); AtlasMessage::qGetTerrainGroupTextures query(m_Name.ToStdWstring());
query.Post(); query.Post();
m_Textures = *query.names; m_Textures = *query.names;

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp
View file

@ -105,7 +105,7 @@ AtlasMessage::sObjectSettings ObjectSettings::GetSettings() const
it != m_ActorSelections.end(); it != m_ActorSelections.end();
++it) ++it)
{ {
selections.push_back((std::wstring)it->wc_str()); selections.push_back(it->ToStdWstring());
} }
settings.selections = selections; settings.selections = selections;

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp
View file

@ -66,7 +66,7 @@ public:
{ {
Position pos(evt.GetPosition()); Position pos(evt.GetPosition());
POST_MESSAGE(BrushPreview, (true, pos)); POST_MESSAGE(BrushPreview, (true, pos));
POST_COMMAND(FillTerrain, (pos, (std::wstring)g_SelectedTexture.wc_str())); POST_COMMAND(FillTerrain, (pos, g_SelectedTexture.ToStdWstring()));
return true; return true;
} }
else if (evt.Moving()) else if (evt.Moving())

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
View file

@ -147,7 +147,7 @@ public:
void Paint(PaintTerrain* obj) void Paint(PaintTerrain* obj)
{ {
POST_MESSAGE(BrushPreview, (true, obj->m_Pos)); POST_MESSAGE(BrushPreview, (true, obj->m_Pos));
POST_COMMAND(PaintTerrain, (obj->m_Pos, (std::wstring)g_SelectedTexture.wc_str(), GetPriority())); POST_COMMAND(PaintTerrain, (obj->m_Pos, g_SelectedTexture.ToStdWstring(), GetPriority()));
} }
virtual bool IsMouseUp(wxMouseEvent& evt) = 0; virtual bool IsMouseUp(wxMouseEvent& evt) = 0;

4
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
View file

@ -61,10 +61,10 @@ public:
+ (m_ScreenPos.type1.y-m_Target.type1.y)*(m_ScreenPos.type1.y-m_Target.type1.y); + (m_ScreenPos.type1.y-m_Target.type1.y)*(m_ScreenPos.type1.y-m_Target.type1.y);
bool useTarget = (dragDistSq >= 16*16); bool useTarget = (dragDistSq >= 16*16);
if (preview) if (preview)
POST_MESSAGE(ObjectPreview, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed, true)); POST_MESSAGE(ObjectPreview, (m_ObjectID.ToStdWstring(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed, true));
else else
{ {
POST_COMMAND(CreateObject, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed)); POST_COMMAND(CreateObject, (m_ObjectID.ToStdWstring(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed));
RandomizeActorSeed(); RandomizeActorSeed();
} }
} }

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp
View file

@ -66,7 +66,7 @@ public:
{ {
Position pos(evt.GetPosition()); Position pos(evt.GetPosition());
POST_MESSAGE(BrushPreview, (true, pos)); POST_MESSAGE(BrushPreview, (true, pos));
POST_COMMAND(ReplaceTerrain, (pos, (std::wstring)g_SelectedTexture.wc_str())); POST_COMMAND(ReplaceTerrain, (pos, g_SelectedTexture.ToStdWstring()));
return true; return true;
} }
else if (evt.Moving()) else if (evt.Moving())