infyquest Posted January 12, 2014 Share Posted January 12, 2014 ActorEditor.cpp../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp: In function 'AtObj ConvertToLatestFormat(AtObj)':../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: error: no matching function for call to 'AtObj::add(const char [9], wxString)' out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:188:4: note: in expansion of macro 'THING1' THING1(actor,"material", in,"Material", "art/materials/"); ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: note: candidates are: out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:188:4: note: in expansion of macro 'THING1' THING1(actor,"material", in,"Material", "art/materials/"); ^In file included from ../../../source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h:21:0, from ../../../source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h:23, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h:18, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:20:../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: void AtObj::add(const char*, const wchar_t*) void add(const char* key, const wchar_t* value); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: no known conversion for argument 2 from 'wxString' to 'const wchar_t*'../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: void AtObj::add(const char*, AtObj&) void add(const char* key, AtObj& data); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: no known conversion for argument 2 from 'wxString' to 'AtObj&'../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: error: no matching function for call to 'AtObj::add(const char [5], wxString)' out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:196:3: note: in expansion of macro 'THING1' THING1(var,"mesh", in,"ModelName", "art/meshes/"); ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: note: candidates are: out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:196:3: note: in expansion of macro 'THING1' THING1(var,"mesh", in,"ModelName", "art/meshes/"); ^In file included from ../../../source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h:21:0, from ../../../source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h:23, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h:18, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:20:../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: void AtObj::add(const char*, const wchar_t*) void add(const char* key, const wchar_t* value); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: no known conversion for argument 2 from 'wxString' to 'const wchar_t*'../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: void AtObj::add(const char*, AtObj&) void add(const char* key, AtObj& data); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: no known conversion for argument 2 from 'wxString' to 'AtObj&'../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:201:121: error: no matching function for call to 'AtObj::add(const char [8], wxString)' var.add("texture", L"temp/" + wxString(in["Object"]["TextureName"]).Mid(strlen("art/textures/ui/session/portraits/"))); ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:201:121: note: candidates are:In file included from ../../../source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h:21:0, from ../../../source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h:23, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h:18, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:20:../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: void AtObj::add(const char*, const wchar_t*) void add(const char* key, const wchar_t* value); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: no known conversion for argument 2 from 'wxString' to 'const wchar_t*'../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: void AtObj::add(const char*, AtObj&) void add(const char* key, AtObj& data); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: no known conversion for argument 2 from 'wxString' to 'AtObj&'../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: error: no matching function for call to 'AtObj::add(const char [8], wxString)' out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:205:4: note: in expansion of macro 'THING1' THING1(var,"texture", in,"TextureName", "art/textures/skins/"); ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:181:86: note: candidates are: out.add(outname, wxString(in["Object"][inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:205:4: note: in expansion of macro 'THING1' THING1(var,"texture", in,"TextureName", "art/textures/skins/"); ^In file included from ../../../source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h:21:0, from ../../../source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h:23, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h:18, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:20:../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: void AtObj::add(const char*, const wchar_t*) void add(const char* key, const wchar_t* value); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: no known conversion for argument 2 from 'wxString' to 'const wchar_t*'../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: void AtObj::add(const char*, AtObj&) void add(const char* key, AtObj& data); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: no known conversion for argument 2 from 'wxString' to 'AtObj&'../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:184:76: error: no matching function for call to 'AtObj::add(const char [6], wxString)' out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:217:5: note: in expansion of macro 'THING2' THING2(anim,"@file", animit,"@file", "art/animation/"); ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:184:76: note: candidates are: out.add(outname, wxString(in[inname]).Mid(wxString(_T(prefix)).Length())) ^../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:217:5: note: in expansion of macro 'THING2' THING2(anim,"@file", animit,"@file", "art/animation/"); ^In file included from ../../../source/tools/atlas/AtlasUI/General/IAtlasSerialiser.h:21:0, from ../../../source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.h:23, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h:18, from ../../../source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp:20:../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: void AtObj::add(const char*, const wchar_t*) void add(const char* key, const wchar_t* value); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:171:7: note: no known conversion for argument 2 from 'wxString' to 'const wchar_t*'../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: void AtObj::add(const char*, AtObj&) void add(const char* key, AtObj& data); ^../../../source/tools/atlas/AtlasObject/AtlasObject.h:172:7: note: no known conversion for argument 2 from 'wxString' to 'AtObj&'AtlasUI.make:196: recipe for target 'obj/AtlasUI_Release/ActorEditor.o' failedmake[1]: *** [obj/AtlasUI_Release/ActorEditor.o] Error 1Makefile:80: recipe for target 'AtlasUI' failedmake: *** [AtlasUI] Error 2 Link to comment Share on other sites More sharing options...
plumo Posted January 12, 2014 Share Posted January 12, 2014 Hey, Could you provide some extra information.Which alpha version are you using? or which svn revision?How can we reproduce this? Link to comment Share on other sites More sharing options...
infyquest Posted January 12, 2014 Author Share Posted January 12, 2014 latest svn version.I am using archlinuxWxWigets 3.0-2 (wxgtk-3.0-2) Link to comment Share on other sites More sharing options...
infyquest Posted January 12, 2014 Author Share Posted January 12, 2014 I think I found a fix for this, I might need to add wc_str() or wchar_str() functionsI will post a fix soon. Link to comment Share on other sites More sharing options...
infyquest Posted January 13, 2014 Author Share Posted January 13, 2014 (edited) Index: source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp===================================================================--- source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp (revision 14579)+++ source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp (working copy)@@ -178,10 +178,10 @@ // 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,7 +198,7 @@ // 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 {Index: source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp===================================================================--- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp (revision 14579)+++ source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp (working copy)@@ -232,19 +232,19 @@ 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 {Index: source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp===================================================================--- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (revision 14579)+++ source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (working copy)@@ -858,7 +858,7 @@ // 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,7 +865,7 @@ 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,7 +887,7 @@ { // 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(""));fix is above Edited January 13, 2014 by infyquest Link to comment Share on other sites More sharing options...
niektb Posted January 13, 2014 Share Posted January 13, 2014 (edited) Better upload it as .patch file. (See the wiki) Edited January 13, 2014 by niektb 1 Link to comment Share on other sites More sharing options...
infyquest Posted January 13, 2014 Author Share Posted January 13, 2014 I know but I need a initial review of the patchhttp://trac.wildfiregames.com/ticket/2375 Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now