X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..3f659fd6b10a8a5c899eaa99adc76a55322b33fd:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 272e88a21f..8cbdcef7c4 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -22,7 +22,10 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
+#ifdef USE_SERIAL
 #include "wx/objstrm.h"
+#include "wx/serbase.h"
+#endif
 #endif
 
 #include <string.h>
@@ -38,8 +41,9 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
-wxClassInfo wxObject::classwxObject("wxObject", NULL, NULL, sizeof(wxObject), NULL);
-wxClassInfo *wxClassInfo::first = NULL;
+wxClassInfo wxObject::classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
+wxClassInfo *wxClassInfo::first = (wxClassInfo *) NULL;
+wxHashTable wxClassInfo::classTable(wxKEY_STRING);
 #endif
 
 /*
@@ -48,12 +52,19 @@ wxClassInfo *wxClassInfo::first = NULL;
 
 wxObject::wxObject(void)
 {
-  m_refData = NULL;
+  m_refData = (wxObjectRefData *) NULL;
+#ifdef USE_SERIAL
+  m_serialObj = (wxObject_Serialize *)NULL;
+#endif
 }
 
 wxObject::~wxObject(void)
 {
 	UnRef();
+#ifdef USE_SERIAL
+	if (m_serialObj)
+	  delete m_serialObj;
+#endif
 }
 
 /*
@@ -129,8 +140,8 @@ wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz,
   next = first;
   first = this;
 
-  baseInfo1 = NULL;
-  baseInfo2 = NULL;
+  baseInfo1 = (wxClassInfo *) NULL;
+  baseInfo2 = (wxClassInfo *) NULL;
 }
 
 wxObject *wxClassInfo::CreateObject(void)
@@ -138,7 +149,7 @@ wxObject *wxClassInfo::CreateObject(void)
   if (objectConstructor)
     return (wxObject *)(*objectConstructor)();
   else
-    return NULL;
+    return (wxObject *) NULL;
 }
 
 wxClassInfo *wxClassInfo::FindClass(char *c)
@@ -150,7 +161,7 @@ wxClassInfo *wxClassInfo::FindClass(char *c)
       return p;
     p = p->next;
   }
-  return NULL;
+  return (wxClassInfo *) NULL;
 }
 
 // Climb upwards through inheritance hierarchy.
@@ -184,14 +195,12 @@ bool wxClassInfo::IsKindOf(wxClassInfo *info)
 // Set pointers to base class(es) to speed up IsKindOf
 void wxClassInfo::InitializeClasses(void)
 {
-  wxHashTable table(wxKEY_STRING);
-
   // Index all class infos by their class name
   wxClassInfo *info = first;
   while (info)
   {
     if (info->className)
-      table.Put(info->className, (wxObject *)info);
+      classTable.Put(info->className, (wxObject *)info);
     info = info->next;
   }
 
@@ -200,26 +209,30 @@ void wxClassInfo::InitializeClasses(void)
   while (info)
   {
     if (info->GetBaseClassName1())
-      info->baseInfo1 = (wxClassInfo *)table.Get(info->GetBaseClassName1());
+      info->baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
     if (info->GetBaseClassName2())
-      info->baseInfo2 = (wxClassInfo *)table.Get(info->GetBaseClassName2());
+      info->baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
     info = info->next;
   }
+  first = NULL;
 }
 
 wxObject *wxCreateDynamicObject(char *name)
 {
-  wxClassInfo *info = wxClassInfo::first;
-  while (info)
-  {
-    if (info->className && strcmp(info->className, name) == 0)
-      return info->CreateObject();
-    info = info->next;
-  }
-  return NULL;
+  wxClassInfo *info;
+
+  info = (wxClassInfo *)wxClassInfo::classTable.Get(name);
+  if (!info)
+    return (wxObject *)NULL;
+
+  return info->CreateObject();
 }
 
-#ifdef USE_STORABLE_CLASSES
+#ifdef USE_SERIAL
+
+#include "wx/serbase.h"
+#include "wx/dynlib.h"
+#include "wx/msgdlg.h"
 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {
@@ -227,6 +240,56 @@ wxObject* wxCreateStoredObject( wxInputStream &stream )
   return obj_s.LoadObject();
 };
 
+void wxObject::StoreObject( wxObjectOutputStream& stream )
+{
+  wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
+  wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
+
+  if (!lib) {
+    wxMessageBox("Can't load wxSerial dynamic library.", "Alert !");
+    return;
+  }
+  if (!m_serialObj) {
+    m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+
+    if (!m_serialObj) {
+      wxString message;
+
+      message.Printf("Can't find the serialization object (%s) for the object %s",
+                     WXSTRINGCAST obj_name,
+                     WXSTRINGCAST GetClassInfo()->GetClassName());
+      wxMessageBox(message, "Alert !");
+      return;
+    }
+    m_serialObj->SetObject(this);
+  }
+
+  m_serialObj->StoreObject(stream);
+}
+
+void wxObject::LoadObject( wxObjectInputStream& stream )
+{
+  wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
+  wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
+
+  if (!m_serialObj) {
+    m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
+
+    if (!m_serialObj) {
+      wxString message;
+
+      message.Printf("Can't find the serialization object (%s) for the object %s",
+                     WXSTRINGCAST obj_name,
+                     WXSTRINGCAST GetClassInfo()->GetClassName());
+      wxMessageBox(message, "Alert !");
+      return;
+    }
+    m_serialObj->SetObject(this);
+  }
+
+  m_serialObj->LoadObject(stream);
+}
+
 #endif
 
 /*
@@ -252,7 +315,7 @@ void wxObject::UnRef(void)
         if (m_refData->m_count == 0)
             delete m_refData;
     }
-    m_refData = NULL;
+    m_refData = (wxObjectRefData *) NULL;
 }
 
 /*