X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5104949d8a39b36bdaade45536453eeb89817959..f395c809b5c24d14f7cf733121d82a0b7b2ae14b:/src/common/objstrm.cpp diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp index 07fa7f9a19..b7beef3b71 100644 --- a/src/common/objstrm.cpp +++ b/src/common/objstrm.cpp @@ -12,6 +12,20 @@ #pragma implementation "objstrm.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/defs.h" +#include "wx/setup.h" +#endif + +#if USE_SERIAL + #include "wx/object.h" #include "wx/objstrm.h" #include "wx/datstrm.h" @@ -49,13 +63,16 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info) if (info.duplicate) { data_s.WriteString(TAG_DUPLICATE_OBJECT); data_s.WriteString(GetObjectName(info.object)); + printf("info.object (dup %s)\n", info.object->GetClassInfo()->GetClassName()); return; } if (info.object) { data_s.WriteString(info.object->GetClassInfo()->GetClassName()); + printf("info.object (%s)\n", info.object->GetClassInfo()->GetClassName()); } else { data_s.WriteString(TAG_EMPTY_OBJECT); + printf("info.object (NULL)\n"); return; } @@ -230,13 +247,13 @@ bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info) class_name = data_s.ReadString(); info->children_removed = 0; + info->n_children = 0; if (class_name == TAG_EMPTY_OBJECT) info->object = (wxObject *) NULL; else if (class_name == TAG_DUPLICATE_OBJECT) { info->object_name = data_s.ReadString(); info->object = SolveName(info->object_name); - info->n_children = 0; } else { info->object_name = data_s.ReadString(); info->object = wxCreateDynamicObject( WXSTRINGCAST class_name); @@ -307,3 +324,6 @@ wxObject *wxObjectInputStream::LoadObject() return object; } + +#endif +