generic template must not carry linkage clause

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

diff --git a/include/wx/xtistrm.h b/include/wx/xtistrm.h
index 876f6ab0c4c384f5212ca980471d686f79e25c51..d24ea83dec980f95ddfa669d49e74f3340c7a15e 100644 (file)
--- a/include/wx/xtistrm.h
+++ b/include/wx/xtistrm.h
@@ -43,10 +43,10 @@ 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 wxWriter ;
-class wxReader ;
+class WXDLLIMPEXP_BASE wxWriter ;
+class WXDLLIMPEXP_BASE wxReader ;

 
 

-class wxPersister
+class WXDLLIMPEXP_BASE wxPersister

 {
 public :
     // will be called before an object is written, may veto by returning false
 {
 public :
     // will be called before an object is written, may veto by returning false


@@ -70,11 +70,11 @@ public :
     virtual bool BeforeWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) , 
         const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { return true ; } 
 
     virtual bool BeforeWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) , 
         const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { return true ; } 
 

-    virtual void AfterWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) , 
-        const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { } 
+        virtual void AfterWriteDelegate( wxWriter *WXUNUSED(writer) , const wxObject *WXUNUSED(object),  const wxClassInfo* WXUNUSED(classInfo) , const wxPropertyInfo *WXUNUSED(propInfo) , 
+            const wxObject *&WXUNUSED(eventSink) , const wxHandlerInfo* &WXUNUSED(handlerInfo) ) { } 

 } ;
 
 } ;
 

-class wxWriter : public wxObject
+class WXDLLIMPEXP_BASE wxWriter : public wxObject

 {
 public :
     wxWriter() ;
 {
 public :
     wxWriter() ;


@@ -90,7 +90,7 @@ public :
     // made without wanting to have duplicate objects written, the object identity table will be reset manually
 
     virtual void ClearObjectContext() ;
     // made without wanting to have duplicate objects written, the object identity table will be reset manually
 
     virtual void ClearObjectContext() ;

-    
+

     // gets the object Id for a passed in object in the context
     int GetObjectID(const wxObject *obj) ;
 
     // gets the object Id for a passed in object in the context
     int GetObjectID(const wxObject *obj) ;
 


@@ -152,14 +152,14 @@ private :
 Streaming callbacks for depersisting XML to code, or running objects
 */
 
 Streaming callbacks for depersisting XML to code, or running objects
 */
 

-class wxDepersister ;
+class WXDLLIMPEXP_BASE wxDepersister ;

 
 /*
 wxReader handles streaming in a class from a arbitrary format. While walking through
 it issues calls out to interfaces to depersist the guts from the underlying storage format.
 */
 
 
 /*
 wxReader handles streaming in a class from a arbitrary format. While walking through
 it issues calls out to interfaces to depersist the guts from the underlying storage format.
 */
 

-class wxReader : public wxObject
+class WXDLLIMPEXP_BASE wxReader : public wxObject

 {
 public :
     wxReader() ;
 {
 public :
     wxReader() ;


@@ -185,7 +185,7 @@ private :
 // When generating code, these will just create statements of C++
 // code to create the objects.
 
 // When generating code, these will just create statements of C++
 // code to create the objects.
 

-class wxDepersister
+class WXDLLIMPEXP_BASE wxDepersister

 {
 public :
     // allocate the new object on the heap, that object will have the passed in ID
 {
 public :
     // allocate the new object on the heap, that object will have the passed in ID


@@ -246,13 +246,14 @@ wxRuntimeDepersister implements the callbacks that will depersist
 an object into a running memory image, as opposed to writing
 C++ initialization code to bring the object to life.
 */
 an object into a running memory image, as opposed to writing
 C++ initialization code to bring the object to life.
 */

-class wxRuntimeDepersister : public wxDepersister
+
+class WXDLLIMPEXP_BASE wxRuntimeDepersister : public wxDepersister

 {
     struct wxRuntimeDepersisterInternal ;
     wxRuntimeDepersisterInternal * m_data ;
 public :
 {
     struct wxRuntimeDepersisterInternal ;
     wxRuntimeDepersisterInternal * m_data ;
 public :

-    wxRuntimeDepersister() ;
-    ~wxRuntimeDepersister() ;
+    wxRuntimeDepersister();
+    virtual ~wxRuntimeDepersister();

 
     // returns the object having the corresponding ID fully constructed 
     wxObject *GetObject(int objectID) ;
 
     // returns the object having the corresponding ID fully constructed 
     wxObject *GetObject(int objectID) ;


@@ -314,12 +315,13 @@ public :
 
 /*
 wxDepersisterCode implements the callbacks that will depersist
 
 /*
 wxDepersisterCode implements the callbacks that will depersist

-an object into a C++ initialization function.
+an object into a C++ initialization function. this will move to 
+a utility lib soon

 */
 
 */
 

-class wxTextOutputStream ;
+class WXDLLIMPEXP_BASE wxTextOutputStream ;

 
 

-class wxCodeDepersister : public wxDepersister
+class WXDLLIMPEXP_BASE wxCodeDepersister : public wxDepersister

 {
 private :
     struct wxCodeDepersisterInternal ;
 {
 private :
     struct wxCodeDepersisterInternal ;


@@ -327,8 +329,8 @@ private :
     wxTextOutputStream *m_fp;
     wxString ValueAsCode( const wxxVariant &param ) ;
 public:
     wxTextOutputStream *m_fp;
     wxString ValueAsCode( const wxxVariant &param ) ;
 public:

-    wxCodeDepersister(wxTextOutputStream *out) ;
-    ~wxCodeDepersister() ;
+    wxCodeDepersister(wxTextOutputStream *out);
+    virtual ~wxCodeDepersister();

 
     // allocate the new object on the heap, that object will have the passed in ID
     virtual void AllocateObject(int objectID, wxClassInfo *classInfo ,
 
     // allocate the new object on the heap, that object will have the passed in ID
     virtual void AllocateObject(int objectID, wxClassInfo *classInfo ,