Changeset 9797 for ps

Timestamp:

07/10/11 23:00:21 (14 years ago)

Author:

ben

Message:

Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring)

Location:

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor

Files:

• ScenarioEditor.cpp (modified) (1 diff)
• Sections/Terrain/Terrain.cpp (modified) (1 diff)

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -793 +793 @@
     q.Post();
 
-    wxString state(std::wstring(*q.dump));
+    std::wstring dump = *q.dump;
+    wxString state(dump.c_str());
 
     wxFFile file(filename.c_str(), _T("w"));

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp

@@ -126 +126 @@
     std::vector<std::wstring> passClasses = *qry.classNames;
     for (size_t i = 0; i < passClasses.size(); ++i)
-        m_PassabilityChoice->Append(passClasses[i]);
+        m_PassabilityChoice->Append(passClasses[i].c_str());
 
     static_cast<TerrainBottomBar*>(m_BottomBar)->LoadTerrain();