Ticket #2375: wx30.patch

source/tools/atlas/AtlasObject/AtlasObject.h

@@ -27 +27 @@
 #include <wchar.h> // for wchar_t
 #include <string>
 
+class wxString;
+
 typedef struct JSContext JSContext;
 
 //////////////////////////////////////////////////////////////////////////
@@ -169 +171 @@
     // never actually altered. Copies of this AtObj (including copies stored
     // inside other AtObjs) will not be affected.
     void add(const char* key, const wchar_t* value);
+    void add(const char* key, const wxString& value);
     void add(const char* key, AtObj& data);
     void set(const char* key, const wchar_t* value);
+    void set(const char* key, const wxString& value);
     void set(const char* key, AtObj& data);
     void setBool(const char* key, bool value);
     void setDouble(const char* key, double value);

source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp

@@ -21 +21 @@
 #include <assert.h>
 #include <sstream>
 
+#include <wx/string.h>
+
 #define ATSMARTPTR_IMPL(T) \
     template<> void AtSmartPtr<T>::inc_ref()    \
     {                                           \
@@ -160 +162 @@
     p = p->addChild(key, data.p);
 }
 
+void AtObj::add(const char* key, const wxString& value)
+{
+    add(key, value.wc_str());
+}
+
 void AtObj::add(const char* key, const wchar_t* value)
 {
     const AtNode* o = new AtNode(value);
@@ -178 +185 @@
     p = p->setChild(key, data.p);
 }
 
+void AtObj::set(const char* key, const wxString& value)
+{
+    set(key, value.wc_str());
+}
+
 void AtObj::set(const char* key, const wchar_t* value)
 {
     const AtNode* o = new AtNode(value);

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

@@ -122 +122 @@
         actor.set("float", L"");
 
     if (m_Material->GetValue().length())
-        actor.set("material", m_Material->GetValue().c_str());
+        actor.set("material", m_Material->GetValue().wc_str());
 
     AtObj out;
     out.set("actor", actor);
@@ -335 +335 @@
         actor.set("float", L"");
 
     if (m_Material->GetValue().length())
-        actor.set("material", m_Material->GetValue().c_str());
+        actor.set("material", m_Material->GetValue().wc_str());
 
     AtObj out;
     out.set("actor", actor);

source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp

@@ -256 +256 @@
 {
     wxCHECK(item >= 0 && column >= 0 && column < (int)m_ColumnTypes.size(), );
     MakeSizeAtLeast(item+1);
-    m_ListData[item].set(m_ColumnTypes[column].key, str.c_str());
+    m_ListData[item].set(m_ColumnTypes[column].key, str.wc_str());
 }
 
 void EditableListCtrl::SetCellObject(long item, long column, AtObj& obj)