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

57
include/wx/object.h
View File

@@ -29,9 +29,10 @@ class WXDLLEXPORT wxObject;
#endif
class WXDLLEXPORT wxClassInfo;
class WXDLLIMPORT istream;
class WXDLLIMPORT ostream;
class WXDLLEXPORT ostream;
class WXDLLEXPORT wxInputStream;
class WXDLLIMPORT wxObjectInputStream;
class WXDLLIMPORT wxObjectOutputStream;
/*
* Dynamic object system declarations
@@ -39,10 +40,6 @@ class WXDLLIMPORT ostream;
typedef wxObject * (*wxObjectConstructorFn) (void);
#ifdef USE_STORABLE_CLASSES
typedef wxObject* (*wxStorableConstructorFn) ( istream &stream, char *data );
#endif
class WXDLLEXPORT wxClassInfo
{
public:
@@ -52,10 +49,6 @@ class WXDLLEXPORT wxClassInfo
int objectSize;
wxObjectConstructorFn objectConstructor;
#ifdef USE_STORABLE_CLASSES
wxStorableConstructorFn storableConstructor;
#endif
// Pointers to base wxClassInfos: set in InitializeClasses
// called from wx_main.cc
wxClassInfo *baseInfo1;
@@ -64,19 +57,10 @@ class WXDLLEXPORT wxClassInfo
static wxClassInfo *first;
wxClassInfo *next;
#ifdef USE_STORABLE_CLASSES
wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn,
wxStorableConstructorFn stoFn = NULL );
#else
wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
#endif
wxObject *CreateObject(void);
#ifdef USE_STORABLE_CLASSES
wxObject* CreateObject( istream &stream, char *data );
#endif
inline char *GetClassName(void) const { return className; }
inline char *GetBaseClassName1(void) const { return baseClassName1; }
inline char *GetBaseClassName2(void) const { return baseClassName2; }
@@ -91,7 +75,7 @@ class WXDLLEXPORT wxClassInfo
wxObject* WXDLLEXPORT wxCreateDynamicObject(char *name);
#ifdef USE_STORABLE_CLASSES
wxObject* WXDLLEXPORT wxCreateStoredObject( char *name, istream &stream, char *data );
wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
#endif
#define DECLARE_DYNAMIC_CLASS(name) \
@@ -103,10 +87,6 @@ wxObject* WXDLLEXPORT wxCreateStoredObject( char *name, istream &stream, char *d
#define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
#ifdef USE_STORABLE_CLASSES
#define DECLARE_STORABLECLASS(name) DECLARE_DYNAMIC_CLASS(name)
#endif
//////
////// for concrete classes
//////
@@ -123,30 +103,6 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
{ return new name; }\
wxClassInfo name::class##name(#name, #basename1, #basename2, sizeof(name), wxConstructorFor##name);
//////
////// for storable classes
//////
#ifdef USE_STORABLE_CLASSES
#define IMPLEMENT_STORABLE_CLASS(name, basename) \
wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
{ return new name( stream, data ); }\
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
{ return new name; }\
wxClassInfo name::class##name(#name, #basename, NULL, sizeof(name), wxConstructorFor##name,\
wxStorableConstructorFor##name );
#define IMPLEMENT_STORABLE_CLASS2(name, basename1, basename2) \
wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
{ return new name( stream, data ); }\
wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
{ return new name; }\
wxClassInfo name::class##name(#name, #basename1, basename2, sizeof(name), wxConstructorFor##name,\
wxStorableConstructorFor##name );
#endif
//////
////// for abstract classes
//////
@@ -223,7 +179,8 @@ class WXDLLEXPORT wxObject
#endif
#ifdef USE_STORABLE_CLASSES
virtual void StoreObject( ostream &WXUNUSED(stream) ) {};
virtual void StoreObject( wxObjectOutputStream &WXUNUSED(stream) ) {};
virtual void LoadObject( wxObjectInputStream &WXUNUSED(stream) ) {};
#endif
// make a 'clone' of the object