Reapply wxWeakRef patch again

[wxWidgets.git] / include / wx / xtistrm.h

diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h
index 1af026cfe9d17d20594357af15e45a218bdd83bf..0f62e428c747ebab1f39ed7e339938e02f4e7a7c 100644 (file)
--- a/include/wx/xtistrm.h
+++ b/include/wx/xtistrm.h
@@ -39,12 +39,14 @@ Main interfaces for streaming out objects.
 // or modify the value before it is streamed-out.
 // ----------------------------------------------------------------------------
 
 // or modify the value before it is streamed-out.
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxWriter ;
-class WXDLLIMPEXP_BASE wxReader ;
+class WXDLLIMPEXP_FWD_BASE wxWriter ;
+class WXDLLIMPEXP_FWD_BASE wxReader ;

 
 class WXDLLIMPEXP_BASE wxPersister
 {
 public :
 
 class WXDLLIMPEXP_BASE wxPersister
 {
 public :

+    virtual ~wxPersister() {}
+

     // will be called before an object is written, may veto by returning false
     virtual bool BeforeWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) , wxxVariantArray &WXUNUSED(metadata)) { return true ; }
 
     // will be called before an object is written, may veto by returning false
     virtual bool BeforeWriteObject( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object) , const wxClassInfo *WXUNUSED(classInfo) , wxxVariantArray &WXUNUSED(metadata)) { return true ; }
 


@@ -148,7 +150,7 @@ private :
 Streaming callbacks for depersisting XML to code, or running objects
 */
 
 Streaming callbacks for depersisting XML to code, or running objects
 */
 

-class WXDLLIMPEXP_BASE wxDepersister ;
+class WXDLLIMPEXP_FWD_BASE wxDepersister ;

 
 /*
 wxReader handles streaming in a class from a arbitrary format. While walking through
 
 /*
 wxReader handles streaming in a class from a arbitrary format. While walking through


@@ -186,6 +188,8 @@ private :
 class WXDLLIMPEXP_BASE wxDepersister
 {
 public :
 class WXDLLIMPEXP_BASE wxDepersister
 {
 public :

+    virtual ~wxDepersister() {}
+

     // allocate the new object on the heap, that object will have the passed in ID
     virtual void AllocateObject(int objectID, wxClassInfo *classInfo, wxxVariantArray &metadata) = 0;
 
     // allocate the new object on the heap, that object will have the passed in ID
     virtual void AllocateObject(int objectID, wxClassInfo *classInfo, wxxVariantArray &metadata) = 0;
 


@@ -343,7 +347,7 @@ an object into a C++ initialization function. this will move to
 a utility lib soon
 */
 
 a utility lib soon
 */
 

-class WXDLLIMPEXP_BASE wxTextOutputStream ;
+class WXDLLIMPEXP_FWD_BASE wxTextOutputStream ;

 
 class WXDLLIMPEXP_BASE wxCodeDepersister : public wxDepersister
 {
 
 class WXDLLIMPEXP_BASE wxCodeDepersister : public wxDepersister
 {