Ticket #2375: atlasuifix.patch
File atlasuifix.patch, 4.4 KB (added by , 10 years ago) |
---|
-
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
178 178 // new format doesn't store the entire path) 179 179 #define THING1(out,outname, in,inname, prefix) \ 180 180 wxASSERT( wxString(in["Object"][inname]).StartsWith(_T(prefix)) ); \ 181 out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length()) )181 out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length()).wc_str()) 182 182 #define THING2(out,outname, in,inname, prefix) \ 183 183 wxASSERT( wxString(in[inname]).StartsWith(_T(prefix)) ); \ 184 out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length()) )184 out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length()).wc_str()) 185 185 186 186 if (wxString(in["Object"]["Material"]).Len()) 187 187 { … … 198 198 // XXX 199 199 if (wxString(in["Object"]["TextureName"]).StartsWith(_T("art/textures/ui/session/portraits/ui_portrait_sheet_civ_"))) 200 200 { 201 var.add("texture", L"temp/" + wxString(in["Object"]["TextureName"]).Mid(strlen("art/textures/ui/session/portraits/")));201 var.add("texture", wxString(wxString(L"temp/") + wxString(in["Object"]["TextureName"]).Mid(strlen("art/textures/ui/session/portraits/"))).wc_str()); 202 202 } 203 203 else 204 204 { -
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
232 232 AtObj MapSettingsControl::UpdateSettingsObject() 233 233 { 234 234 // map name 235 m_MapSettings.set("Name", wxDynamicCast(FindWindow(ID_MapName), wxTextCtrl)->GetValue() );235 m_MapSettings.set("Name", wxDynamicCast(FindWindow(ID_MapName), wxTextCtrl)->GetValue().wc_str()); 236 236 237 237 // map description 238 m_MapSettings.set("Description", wxDynamicCast(FindWindow(ID_MapDescription), wxTextCtrl)->GetValue() );238 m_MapSettings.set("Description", wxDynamicCast(FindWindow(ID_MapDescription), wxTextCtrl)->GetValue().wc_str()); 239 239 240 240 // map preview 241 m_MapSettings.set("Preview", wxDynamicCast(FindWindow(ID_MapPreview), wxTextCtrl)->GetValue() );241 m_MapSettings.set("Preview", wxDynamicCast(FindWindow(ID_MapPreview), wxTextCtrl)->GetValue().wc_str()); 242 242 243 243 // reveal map 244 244 m_MapSettings.setBool("RevealMap", wxDynamicCast(FindWindow(ID_MapReveal), wxCheckBox)->GetValue()); 245 245 246 246 // game type / victory conditions 247 m_MapSettings.set("GameType", wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection() );247 m_MapSettings.set("GameType", wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection().wc_str()); 248 248 249 249 // keywords 250 250 { -
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
858 858 // name 859 859 wxTextCtrl* text = controls.name; 860 860 if (text->IsEnabled()) 861 player.set("Name", text->GetValue() );861 player.set("Name", text->GetValue().wc_str()); 862 862 863 863 // civ 864 864 wxChoice* choice = controls.civ; … … 865 865 if (choice->IsEnabled() && choice->GetSelection() >= 0) 866 866 { 867 867 wxStringClientData* str = dynamic_cast<wxStringClientData*>(choice->GetClientObject(choice->GetSelection())); 868 player.set("Civ", str->GetData() );868 player.set("Civ", str->GetData().wc_str()); 869 869 } 870 870 871 871 // colour … … 887 887 { 888 888 // ai - get id 889 889 wxStringClientData* str = dynamic_cast<wxStringClientData*>(choice->GetClientObject(choice->GetSelection())); 890 player.set("AI", str->GetData() );890 player.set("AI", str->GetData().wc_str()); 891 891 } 892 892 else // human 893 893 player.set("AI", _T(""));