projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed à parsing (here too)
[wxWidgets.git]
/
src
/
common
/
objstrm.cpp
diff --git
a/src/common/objstrm.cpp
b/src/common/objstrm.cpp
index 94200e50d8789feccdeeeceeb80b0574cce96f9e..e0156b200dd51ba569bc88bb5c04f5b88b5621e8 100644
(file)
--- a/
src/common/objstrm.cpp
+++ b/
src/common/objstrm.cpp
@@
-8,10
+8,20
@@
// Copyright: (c) 1998 Guilhem Lavaux
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 1998 Guilhem Lavaux
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+
#ifdef __GNUG__
#ifdef __GNUG__
-#pragma implementation "objstrm.h"
+ #pragma implementation "objstrm.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
#endif
+#if wxUSE_SERIAL && wxUSE_STREAMS
+
#include "wx/object.h"
#include "wx/objstrm.h"
#include "wx/datstrm.h"
#include "wx/object.h"
#include "wx/objstrm.h"
#include "wx/datstrm.h"
@@
-36,7
+46,7
@@
wxString wxObjectOutputStream::GetObjectName(wxObject *obj)
{
wxString name;
{
wxString name;
- name.Printf(
"%x"
, (unsigned long)obj);
+ name.Printf(
wxT("%x")
, (unsigned long)obj);
return name;
}
return name;
}
@@
-49,13
+59,17
@@
void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info)
if (info.duplicate) {
data_s.WriteString(TAG_DUPLICATE_OBJECT);
data_s.WriteString(GetObjectName(info.object));
if (info.duplicate) {
data_s.WriteString(TAG_DUPLICATE_OBJECT);
data_s.WriteString(GetObjectName(info.object));
+ wxPrintf(wxT("info.object (dup %s)\n"), info.object->GetClassInfo()->GetClassName());
return;
}
if (info.object) {
data_s.WriteString(info.object->GetClassInfo()->GetClassName());
return;
}
if (info.object) {
data_s.WriteString(info.object->GetClassInfo()->GetClassName());
+ wxPrintf(wxT("info.object (%s)\n"), info.object->GetClassInfo()->GetClassName());
} else {
data_s.WriteString(TAG_EMPTY_OBJECT);
} else {
data_s.WriteString(TAG_EMPTY_OBJECT);
+ wxPrintf(wxT("info.object (NULL)\n"));
+ return;
}
data_s.WriteString(GetObjectName(info.object));
}
data_s.WriteString(GetObjectName(info.object));
@@
-80,6
+94,9
@@
void wxObjectOutputStream::AddChild(wxObject *obj)
info->duplicate = FALSE;
m_saved_objs.Append(obj);
}
info->duplicate = FALSE;
m_saved_objs.Append(obj);
}
+ if (!obj)
+ info->duplicate = FALSE;
+
info->n_children = 0;
info->object = obj;
info->parent = m_current_info; // Not useful here.
info->n_children = 0;
info->object = obj;
info->parent = m_current_info; // Not useful here.
@@
-135,6
+152,7
@@
bool wxObjectOutputStream::SaveObject(wxObject& obj)
m_stage = 0;
info.object = &obj;
info.n_children = 0;
m_stage = 0;
info.object = &obj;
info.n_children = 0;
+ info.duplicate = FALSE;
ProcessObjectDef(&info);
m_stage = 1;
ProcessObjectDef(&info);
m_stage = 1;
@@
-155,6
+173,7
@@
bool wxObjectOutputStream::SaveObject(wxObject& obj)
wxObjectInputStream::wxObjectInputStream(wxInputStream& s)
: wxFilterInputStream(s)
{
wxObjectInputStream::wxObjectInputStream(wxInputStream& s)
: wxFilterInputStream(s)
{
+ m_secondcall = FALSE;
}
wxObject *wxObjectInputStream::SolveName(const wxString& name) const
}
wxObject *wxObjectInputStream::SolveName(const wxString& name) const
@@
-180,11
+199,25
@@
wxObject *wxObjectInputStream::GetParent() const
return m_current_info->parent->object;
}
return m_current_info->parent->object;
}
+wxObject *wxObjectInputStream::GetChild()
+{
+ wxObject *obj = GetChild(0);
+
+ m_current_info->children_removed++;
+
+ return obj;
+}
+
wxObject *wxObjectInputStream::GetChild(int no) const
{
wxObject *wxObjectInputStream::GetChild(int no) const
{
- wxNode *node
= m_current_info->children.Nth(m_current_info->children_removed+no)
;
+ wxNode *node;
wxObjectStreamInfo *info;
wxObjectStreamInfo *info;
+ if (m_current_info->children_removed >= m_current_info->n_children)
+ return (wxObject *) NULL;
+
+ node = m_current_info->children.Nth(m_current_info->children_removed+no);
+
if (!node)
return (wxObject *) NULL;
if (!node)
return (wxObject *) NULL;
@@
-210,17
+243,18
@@
bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info)
return FALSE;
class_name = data_s.ReadString();
return FALSE;
class_name = data_s.ReadString();
- info->object_name = data_s.ReadString();
info->children_removed = 0;
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) {
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->object = SolveName(info->object_name);
- info->n_children = 0;
} else {
} else {
+ info->object_name = data_s.ReadString();
info->object = wxCreateDynamicObject( WXSTRINGCAST class_name);
info->object = wxCreateDynamicObject( WXSTRINGCAST class_name);
- info->n_children = data_s.Read
8
();
+ info->n_children = data_s.Read
32
();
}
return TRUE;
}
}
return TRUE;
}
@@
-261,6
+295,14
@@
void wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo *info)
ProcessObjectData((wxObjectStreamInfo *)node->Data());
node = node->Next();
}
ProcessObjectData((wxObjectStreamInfo *)node->Data());
node = node->Next();
}
+
+ m_current_info = info;
+
+ if (info->recall) {
+ m_secondcall = TRUE;
+ info->object->LoadObject(*this);
+ m_secondcall = FALSE;
+ }
}
wxObject *wxObjectInputStream::LoadObject()
}
wxObject *wxObjectInputStream::LoadObject()
@@
-279,3
+321,6
@@
wxObject *wxObjectInputStream::LoadObject()
return object;
}
return object;
}
+
+#endif // wxUSE_SERIAL && wxUSE_STREAMS
+