oops... conflict removed

[wxWidgets.git] / contrib / include / wx / xml / xml.h

diff --git a/contrib/include/wx/xml/xml.h b/contrib/include/wx/xml/xml.h
index 45aedba49fa3a80285eb9f122aa1660e743b267e..033a7240d3a1d5c9655475fe82cb2656ded05711 100644 (file)
--- a/contrib/include/wx/xml/xml.h
+++ b/contrib/include/wx/xml/xml.h
@@ -21,12 +21,12 @@
 #include "wx/list.h"
 
 
-class wxXmlNode;
-class wxXmlProperty;
-class wxXmlDocument;
-class wxXmlIOHandler;
-class wxInputStream;
-class wxOutputStream;
+class WXDLLEXPORT wxXmlNode;
+class WXDLLEXPORT wxXmlProperty;
+class WXDLLEXPORT wxXmlDocument;
+class WXDLLEXPORT wxXmlIOHandler;
+class WXDLLEXPORT wxInputStream;
+class WXDLLEXPORT wxOutputStream;
 
 
 // Represents XML node type.
@@ -168,7 +168,7 @@ class WXDLLEXPORT wxXmlNode
 class WXDLLEXPORT wxXmlDocument : public wxObject
 {
     public:
-        wxXmlDocument() : wxObject(), m_Version(_T("1.0")), m_Root(NULL)  {}
+        wxXmlDocument() : wxObject(), m_Version(wxT("1.0")), m_Root(NULL)  {}
         wxXmlDocument(const wxString& filename, wxXmlIOType io_type = wxXML_IO_AUTO);
         wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
         ~wxXmlDocument() { delete m_Root; }
@@ -184,8 +184,6 @@ class WXDLLEXPORT wxXmlDocument : public wxObject
         bool Load(wxInputStream& stream, wxXmlIOType io_type = wxXML_IO_AUTO);
         
         // Saves document as .xml file.
-        // NOTE: Any call to this method will result into linking against libxml
-        //       and app's binary size will grow by ca. 250kB
         bool Save(const wxString& filename, wxXmlIOType io_type) const;
         bool Save(wxOutputStream& stream, wxXmlIOType io_type) const;