Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / common / xtistrm.cpp

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index a366c64d96d2d5baac3bba70559f8cc5cd34663a..9f0860b933594d044ebcf9cd3234850896e78a82 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -577,7 +577,7 @@ void wxObjectRuntimeReaderCallback::SetProperty(int objectID,
 {
     wxObject *o;
     o = m_data->GetObject(objectID);
 {
     wxObject *o;
     o = m_data->GetObject(objectID);

-    classInfo->SetProperty( o, propertyInfo->GetName(), value );
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value );

 }
 
 void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
 }
 
 void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,


@@ -599,7 +599,7 @@ void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
         valo = dynvalo->GetSuperClassInstance();
     }
 
         valo = dynvalo->GetSuperClassInstance();
     }
 

-    classInfo->SetProperty( o, propertyInfo->GetName(), 
+    classInfo->SetProperty( o, propertyInfo->GetName().c_str(),

                             valClassInfo->ObjectPtrToAny(valo) );
 }
 
                             valClassInfo->ObjectPtrToAny(valo) );
 }
 


@@ -650,7 +650,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID,
 {
     wxObject *o;
     o = m_data->GetObject(objectID);
 {
     wxObject *o;
     o = m_data->GetObject(objectID);

-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), value );
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value );

 }
 
 void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,
 }
 
 void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,


@@ -674,7 +674,7 @@ void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID
         valo = dynvalo->GetSuperClassInstance();
     }
 
         valo = dynvalo->GetSuperClassInstance();
     }
 

-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName(), 
+    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(),

                                         valClassInfo->ObjectPtrToAny(valo) );
 }
 
                                         valClassInfo->ObjectPtrToAny(valo) );
 }