#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 wxUSE_SERIAL
+
#include "wx/object.h"
#include "wx/objstrm.h"
#include "wx/datstrm.h"
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;
}
wxObjectInputStream::wxObjectInputStream(wxInputStream& s)
: wxFilterInputStream(s)
{
+ m_secondcall = FALSE;
}
wxObject *wxObjectInputStream::SolveName(const wxString& name) const
wxObjectStreamInfo *info;
if (m_current_info->children_removed >= m_current_info->n_children)
- return NULL;
+ return (wxObject *) NULL;
node = m_current_info->children.Nth(m_current_info->children_removed+no);
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);
return object;
}
+
+#endif
+