applied (slightly modified) wxGLApp patch for MSW

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

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index e5bb3d9dd6116c090f7d472f58d8c7754aa25540..6b89bea73d59ac11fb6b3181beb8ec9cade98c6c 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -10,22 +10,117 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "stream.h"
+#pragma implementation "serbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 

-#include <wx/serbase.h>
+#include "wx/serbase.h"
+#include "wx/datstrm.h"
+#include "wx/objstrm.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

+#if wxUSE_SERIAL
+

 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)

-#endif
+
+IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
+IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
+
+void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
+{
+  wxList *lst_object = (wxList *)Object();
+  wxNode *node = lst_object->First();
+
+  if (s.FirstStage()) {
+    while (node) {
+      s.AddChild(node->Data());
+      node = node->Next(); 
+    }
+    return;
+  }
+
+  wxDataOutputStream data_s(s);
+
+  data_s.Write8(lst_object->GetDeleteContents());
+  data_s.Write8(lst_object->GetKeyType());
+  data_s.Write32( lst_object->Number() );
+
+  if (lst_object->GetKeyType() == wxKEY_INTEGER) {
+    while (node) {
+      data_s.Write32((size_t)node->GetKeyInteger());
+      node = node->Next();
+    }
+  } else {
+    while (node) {
+      data_s.WriteString(node->GetKeyString());
+      node = node->Next();
+    }
+  }
+}
+
+void WXSERIAL(wxList)::LoadObject(wxObjectInputStream& s)
+{
+  wxDataInputStream data_s(s);
+  wxList *list = (wxList *)Object();
+  int number, i;
+
+  list->DeleteContents( data_s.Read8() != 0 );
+  list->SetKeyType( (wxKeyType) data_s.Read8() );
+  number = data_s.Read32();
+
+  if (list->GetKeyType() == wxKEY_INTEGER) {
+    for (i=0;i<number;i++)
+      list->Append( data_s.Read32(), s.GetChild() );
+  } else {
+    for (i=0;i<number;i++)
+      list->Append( data_s.ReadString(), s.GetChild() );
+  }
+}
+
+// ----------------------------------------------------------------------------
+
+void WXSERIAL(wxHashTable)::StoreObject(wxObjectOutputStream& s)
+{
+  wxHashTable *table = (wxHashTable *)Object();
+  int i;
+
+  if (s.FirstStage()) {
+    for (i=0;i<table->n;i++)
+      s.AddChild(table->hash_table[i]);
+    return;
+  }
+
+  wxDataOutputStream data_s(s);
+
+  data_s.Write8(table->key_type);
+  data_s.Write32(table->n);
+}
+
+void WXSERIAL(wxHashTable)::LoadObject(wxObjectInputStream& s)
+{
+  wxHashTable *table = (wxHashTable *)Object();
+  wxDataInputStream data_s(s);
+  int i, key, n;
+
+  key = data_s.Read8();
+  n = data_s.Read32();
+
+  table->Create(key, n);
+
+  for (i=0;i<n;i++)
+    table->hash_table[i] = (wxList *)s.GetChild();
+}
+
+#endif // wxUSE_SERIAL