Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New wxStream classes: wxStreamBuffer and wxObject*Stream.

Browse Source 
* Changes: ofsInvalid => wxInvalidOffset in filefn.h
* Updates: all wxStream classes use wxStreamBuffer.
           wxObject basic declaration changes (added LoadObject, modified
           StoreObject)
* Some base of the serialization.
(I hope not to have forgotten any files)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-07-24 17:13:47 +00:00
parent 439b3bf1f5
commit 1678ad7802
13 changed files with 324 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/common/object.cpp
View File

@@ -20,7 +20,10 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/objstrm.h"
#endif
#include <string.h>
#include <assert.h>
@@ -114,36 +117,6 @@ void wxObject::operator delete[] (void * buf)
* Class info: provides run-time class type information.
*/
#ifdef USE_STORABLE_CLASSES
wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn,
wxStorableConstructorFn stoFn )
{
className = cName;
baseClassName1 = baseName1;
baseClassName2 = baseName2;
objectSize = sz;
objectConstructor = fn;
storableConstructor = stoFn;
next = first;
first = this;
baseInfo1 = NULL;
baseInfo2 = NULL;
}
wxObject* wxClassInfo::CreateObject( istream &stream, char *data )
{
if (storableConstructor)
return (wxObject *)(*storableConstructor)( stream, data );
else
return NULL;
}
#else
wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
{
className = cName;
@@ -160,8 +133,6 @@ wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz,
baseInfo2 = NULL;
}
#endif
wxObject *wxClassInfo::CreateObject(void)
{
if (objectConstructor)
@@ -250,16 +221,10 @@ wxObject *wxCreateDynamicObject(char *name)
#ifdef USE_STORABLE_CLASSES
wxObject* wxCreateStoredObject( char *name, istream &stream, char *data )
wxObject* wxCreateStoredObject( wxInputStream &stream )
{
wxClassInfo *info = wxClassInfo::first;
while (info)
{
if (info->className && strcmp(info->className, name) == 0)
return info->CreateObject( stream, data );
info = info->next;
}
return NULL;
wxObjectInputStream obj_s(stream);
return obj_s.LoadObject();
};
#endif