rename the ID parameter

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

diff --git a/include/wx/xtixml.h b/include/wx/xtixml.h
index 7ddda9032e484eb9d4e46183061243b4e3660611..2466e4731c560e0630579e353d3d742b7d249bc5 100644 (file)
--- a/include/wx/xtixml.h
+++ b/include/wx/xtixml.h
@@ -2,7 +2,7 @@
 // Name:        wx/xtixml.h
 // Purpose:     xml streaming runtime metadata information (extended class info)
 // Author:      Stefan Csomor
 // Name:        wx/xtixml.h
 // Purpose:     xml streaming runtime metadata information (extended class info)
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor
 // Created:     27/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Stefan Csomor


@@ -12,10 +12,6 @@
 #ifndef _WX_XTIXMLH__
 #define _WX_XTIXMLH__
 
 #ifndef _WX_XTIXMLH__
 #define _WX_XTIXMLH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xtixml.h"
-#endif
-

 #include "wx/wx.h"
 
 #if wxUSE_EXTENDED_RTTI
 #include "wx/wx.h"
 
 #if wxUSE_EXTENDED_RTTI


@@ -29,7 +25,7 @@ class WXDLLIMPEXP_XML wxXmlWriter : public wxWriter
 public :
 
     wxXmlWriter( wxXmlNode * parent ) ;
 public :
 
     wxXmlWriter( wxXmlNode * parent ) ;

-    ~wxXmlWriter() ;
+    virtual ~wxXmlWriter() ;

 
     //
     // streaming callbacks
 
     //
     // streaming callbacks


@@ -66,14 +62,14 @@ public :
     virtual void DoBeginWriteElement() ;
     virtual void DoEndWriteElement() ;
 
     virtual void DoBeginWriteElement() ;
     virtual void DoEndWriteElement() ;
 

-    // insert an object reference to an already written object 
+    // insert an object reference to an already written object

     virtual void DoWriteRepeatedObject( int objectID )  ;
 
     // insert a null reference
     virtual void DoWriteNullObject()  ;
 
     // writes a delegate in the stream format
     virtual void DoWriteRepeatedObject( int objectID )  ;
 
     // insert a null reference
     virtual void DoWriteNullObject()  ;
 
     // writes a delegate in the stream format

-    virtual void DoWriteDelegate( const wxObject *object,  const wxClassInfo* classInfo , const wxPropertyInfo *propInfo , 
+    virtual void DoWriteDelegate( const wxObject *object,  const wxClassInfo* classInfo , const wxPropertyInfo *propInfo ,

         const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) ;
 private :
     struct wxXmlWriterInternal ;
         const wxObject *eventSink , int sinkObjectID , const wxClassInfo* eventSinkClassInfo , const wxHandlerInfo* handlerIndo ) ;
 private :
     struct wxXmlWriterInternal ;


@@ -88,7 +84,7 @@ class WXDLLIMPEXP_XML wxXmlReader : public wxReader
 {
 public:
     wxXmlReader(wxXmlNode *parent) { m_parent = parent ; }
 {
 public:
     wxXmlReader(wxXmlNode *parent) { m_parent = parent ; }

-    ~wxXmlReader() {}
+    virtual ~wxXmlReader() {}

 
     // Reads a component from XML.  The return value is the root object ID, which can
     // then be used to ask the depersister about that object
 
     // Reads a component from XML.  The return value is the root object ID, which can
     // then be used to ask the depersister about that object