Project file updates; cast in strconv.cpp to compile with VC++ 6

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

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index dda2e77591d34a37316e50e017304a4958501574..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
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#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"


@@ -20,6 +30,7 @@
 #define WXOBJ_BEG_LEN 6
 
 #define TAG_EMPTY_OBJECT "NULL"
 #define WXOBJ_BEG_LEN 6
 
 #define TAG_EMPTY_OBJECT "NULL"

+#define TAG_DUPLICATE_OBJECT "DUPLIC"

 
 // ----------------------------------------------------------------------------
 // wxObjectOutputStream
 
 // ----------------------------------------------------------------------------
 // wxObjectOutputStream


@@ -35,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;
 }
 


@@ -45,16 +56,27 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info)
 
   Write(WXOBJ_BEGIN, WXOBJ_BEG_LEN);
 
 
   Write(WXOBJ_BEGIN, WXOBJ_BEG_LEN);
 

+  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());
   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));
 
   // I assume an object will not have millions of children
   }
 
   data_s.WriteString(GetObjectName(info.object));
 
   // I assume an object will not have millions of children

-  data_s.Write8(info.children.Number());
+  // Hmmm ... it could have (for example wxGrid)
+  data_s.Write32(info.children.Number());

 }
 
 void wxObjectOutputStream::AddChild(wxObject *obj)
 }
 
 void wxObjectOutputStream::AddChild(wxObject *obj)


@@ -65,6 +87,16 @@ void wxObjectOutputStream::AddChild(wxObject *obj)
     return;
 
   info = new wxObjectStreamInfo;
     return;
 
   info = new wxObjectStreamInfo;

+
+  if (m_saved_objs.Member(obj) != NULL) {
+    info->duplicate = TRUE;
+  } else {
+    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.


@@ -78,7 +110,7 @@ void wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo *info)
 
   m_current_info = info;
   // First stage: get children of obj
 
   m_current_info = info;
   // First stage: get children of obj

-  if (info->object)
+  if (info->object && !info->duplicate)

     info->object->StoreObject(*this);
 
   // Prepare and write the sub-entry about the child obj.
     info->object->StoreObject(*this);
 
   // Prepare and write the sub-entry about the child obj.


@@ -98,7 +130,7 @@ void wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo *info)
 
   m_current_info = info;
 
 
   m_current_info = info;
 

-  if (info->object)
+  if (info->object && !info->duplicate)

     info->object->StoreObject(*this);
 
   while (node) {
     info->object->StoreObject(*this);
 
   while (node) {


@@ -120,12 +152,14 @@ 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;
   ProcessObjectData(&info);
 
   info.children.Clear();
   ProcessObjectDef(&info);
 
   m_stage = 1;
   ProcessObjectData(&info);
 
   info.children.Clear();

+  m_saved_objs.Clear();

 
   m_saving = FALSE;
 
 
   m_saving = FALSE;
 


@@ -139,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


@@ -153,24 +188,38 @@ wxObject *wxObjectInputStream::SolveName(const wxString& name) const
 
     node = node->Next();
   }
 
     node = node->Next();
   }

-  return NULL;
+  return (wxObject *) NULL;

 }
 
 wxObject *wxObjectInputStream::GetParent() const
 {
   if (!m_current_info->parent)
 }
 
 wxObject *wxObjectInputStream::GetParent() const
 {
   if (!m_current_info->parent)

-    return NULL;
+    return (wxObject *) NULL;

 
   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)
   if (!node)

-    return NULL;
+    return (wxObject *) NULL;

 
   info = (wxObjectStreamInfo *)node->Data();
 
 
   info = (wxObjectStreamInfo *)node->Data();
 


@@ -194,17 +243,19 @@ bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info)
     return FALSE;
 
   class_name = data_s.ReadString();
     return FALSE;
 
   class_name = data_s.ReadString();

-  printf("class_name = %s\n", WXSTRINGCAST class_name);
-  if (class_name == TAG_EMPTY_OBJECT)
-    info->object = NULL;
-  else
-    info->object = wxCreateDynamicObject( WXSTRINGCAST class_name);
-  info->object_name = data_s.ReadString();
-  printf("object_name = %s\n", WXSTRINGCAST info->object_name);
-  info->n_children = data_s.Read8();

   info->children_removed = 0;
   info->children_removed = 0;

-  printf("n_children = %d\n", info->n_children);
+  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);
+  } else {
+    info->object_name = data_s.ReadString();
+    info->object = wxCreateDynamicObject( WXSTRINGCAST class_name);
+    info->n_children = data_s.Read32();
+  }

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -220,12 +271,12 @@ wxObjectStreamInfo *wxObjectInputStream::ProcessObjectDef(wxObjectStreamInfo *pa
   m_solver.Append(info);
 
   if (!ReadObjectDef(info))
   m_solver.Append(info);
 
   if (!ReadObjectDef(info))

-    return NULL;
+    return (wxObjectStreamInfo *) NULL;

 
   for (c=0;c<info->n_children;c++) {
     c_info = ProcessObjectDef(info);
     if (!c_info)
 
   for (c=0;c<info->n_children;c++) {
     c_info = ProcessObjectDef(info);
     if (!c_info)

-      return NULL;
+      return (wxObjectStreamInfo *) NULL;

     info->children.Append(c_info);
   }
 
     info->children.Append(c_info);
   }
 


@@ -235,7 +286,6 @@ wxObjectStreamInfo *wxObjectInputStream::ProcessObjectDef(wxObjectStreamInfo *pa
 void wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo *info)
 {
   wxNode *node = info->children.First();
 void wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo *info)
 {
   wxNode *node = info->children.First();

-  wxObjectStreamInfo *c_info;

 
   m_current_info = info;
 
 
   m_current_info = info;
 


@@ -245,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()


@@ -252,9 +310,9 @@ wxObject *wxObjectInputStream::LoadObject()
   wxObjectStreamInfo *info;
   wxObject *object;
 
   wxObjectStreamInfo *info;
   wxObject *object;
 

-  info = ProcessObjectDef(NULL);
+  info = ProcessObjectDef((wxObjectStreamInfo *) NULL);

   if (!info)
   if (!info)

-    return NULL;
+    return (wxObject *) NULL;

   ProcessObjectData(info);
 
   object = info->object;
   ProcessObjectData(info);
 
   object = info->object;


@@ -263,3 +321,6 @@ wxObject *wxObjectInputStream::LoadObject()
 
   return object;
 }
 
   return object;
 }

+
+#endif // wxUSE_SERIAL && wxUSE_STREAMS
+