Ticket #2375: atlasuifix.patch

source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp

@@ -178 +178 @@
         // new format doesn't store the entire path)
         #define THING1(out,outname, in,inname, prefix) \
             wxASSERT( wxString(in["Object"][inname]).StartsWith(_T(prefix)) ); \
-            out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length()))
+            out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length()).wc_str())
         #define THING2(out,outname, in,inname, prefix) \
             wxASSERT( wxString(in[inname]).StartsWith(_T(prefix)) ); \
-            out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length()))
+            out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length()).wc_str())
 
         if (wxString(in["Object"]["Material"]).Len())
         {
@@ -198 +198 @@
         // XXX
         if (wxString(in["Object"]["TextureName"]).StartsWith(_T("art/textures/ui/session/portraits/ui_portrait_sheet_civ_")))
         {
-            var.add("texture", L"temp/" + wxString(in["Object"]["TextureName"]).Mid(strlen("art/textures/ui/session/portraits/")));
+            var.add("texture", wxString(wxString(L"temp/") + wxString(in["Object"]["TextureName"]).Mid(strlen("art/textures/ui/session/portraits/"))).wc_str());
         }
         else
         {

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

@@ -232 +232 @@
 AtObj MapSettingsControl::UpdateSettingsObject()
 {
     // map name
-    m_MapSettings.set("Name", wxDynamicCast(FindWindow(ID_MapName), wxTextCtrl)->GetValue());
+    m_MapSettings.set("Name", wxDynamicCast(FindWindow(ID_MapName), wxTextCtrl)->GetValue().wc_str());
 
     // map description
-    m_MapSettings.set("Description", wxDynamicCast(FindWindow(ID_MapDescription), wxTextCtrl)->GetValue());
+    m_MapSettings.set("Description", wxDynamicCast(FindWindow(ID_MapDescription), wxTextCtrl)->GetValue().wc_str());
 
     // map preview
-    m_MapSettings.set("Preview", wxDynamicCast(FindWindow(ID_MapPreview), wxTextCtrl)->GetValue());
+    m_MapSettings.set("Preview", wxDynamicCast(FindWindow(ID_MapPreview), wxTextCtrl)->GetValue().wc_str());
 
     // reveal map
     m_MapSettings.setBool("RevealMap", wxDynamicCast(FindWindow(ID_MapReveal), wxCheckBox)->GetValue());
 
     // game type / victory conditions
-    m_MapSettings.set("GameType", wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection());
+    m_MapSettings.set("GameType", wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection().wc_str());
 
     // keywords
     {

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -858 +858 @@
         // name
         wxTextCtrl* text = controls.name;
         if (text->IsEnabled())
-            player.set("Name", text->GetValue());
+            player.set("Name", text->GetValue().wc_str());
 
         // civ
         wxChoice* choice = controls.civ;
@@ -865 +865 @@
         if (choice->IsEnabled() && choice->GetSelection() >= 0)
         {
             wxStringClientData* str = dynamic_cast<wxStringClientData*>(choice->GetClientObject(choice->GetSelection()));
-            player.set("Civ", str->GetData());
+            player.set("Civ", str->GetData().wc_str());
         }
 
         // colour
@@ -887 +887 @@
             {
                 // ai - get id
                 wxStringClientData* str = dynamic_cast<wxStringClientData*>(choice->GetClientObject(choice->GetSelection()));
-                player.set("AI", str->GetData());
+                player.set("AI", str->GetData().wc_str());
             }
             else // human
                 player.set("AI", _T(""));