Some manual updates; in MDI sample, child frames now have default size/position ...

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

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index 1d2b01d01a30b9b74eb2d52f6cf0bc1507505129..935d6fe08c96748e513b231086f10eb0978f9b96 100644 (file)
--- a/src/common/objstrm.cpp
+++ b/src/common/objstrm.cpp
@@ -48,7 +48,7 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info)
   data_s.Write8(info.children.Number());
 }
 
-void wxObjectOutputStream::AddChildren(wxObject *obj)
+void wxObjectOutputStream::AddChild(wxObject *obj)
 {
   wxObjectStreamInfo *info;
 
@@ -159,7 +159,7 @@ bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info)
   sig[WXOBJ_BEG_LEN] = 0;
   if (wxString(sig) != WXOBJ_BEGIN)
     return FALSE;
-  info->object = wxCreateDynamicObject((char *)data_s.ReadString());
+  info->object = wxCreateDynamicObject( WXSTRINGCAST data_s.ReadString());
   info->object_name = data_s.ReadString();
   info->n_children = data_s.Read8();
   info->children = wxList();