moved helpbest and htmllbox to wxHTML

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

diff --git a/contrib/include/wx/xrc/xml.h b/contrib/include/wx/xrc/xml.h
index 7d5f4e05a638a10620f445b7f0eb37ba3756f28e..c3122942e479845cc22599b3548993527ff349a6 100644 (file)
--- a/contrib/include/wx/xrc/xml.h
+++ b/contrib/include/wx/xrc/xml.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XML_H_
 #define _WX_XML_H_
 
 #ifndef _WX_XML_H_
 #define _WX_XML_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "xml.h"
 #endif
 
 #pragma interface "xml.h"
 #endif
 


@@ -164,7 +164,7 @@ private:
 class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:
 class WXXMLDLLEXPORT wxXmlDocument : public wxObject
 {
 public:

-    wxXmlDocument() : wxObject(), m_version(wxT("1.0")), m_root(NULL)  {}
+    wxXmlDocument();

     wxXmlDocument(const wxString& filename,
                   const wxString& encoding = wxT("UTF-8"));
     wxXmlDocument(wxInputStream& stream,
     wxXmlDocument(const wxString& filename,
                   const wxString& encoding = wxT("UTF-8"));
     wxXmlDocument(wxInputStream& stream,


@@ -180,7 +180,7 @@ public:
               const wxString& encoding = wxT("UTF-8"));
     bool Load(wxInputStream& stream,
               const wxString& encoding = wxT("UTF-8"));
               const wxString& encoding = wxT("UTF-8"));
     bool Load(wxInputStream& stream,
               const wxString& encoding = wxT("UTF-8"));

-
+    

     // Saves document as .xml file.
     bool Save(const wxString& filename) const;
     bool Save(wxOutputStream& stream) const;
     // Saves document as .xml file.
     bool Save(const wxString& filename) const;
     bool Save(wxOutputStream& stream) const;


@@ -193,7 +193,7 @@ public:
     // Returns version of document (may be empty).
     wxString GetVersion() const { return m_version; }
     // Returns encoding of document (may be empty).
     // Returns version of document (may be empty).
     wxString GetVersion() const { return m_version; }
     // Returns encoding of document (may be empty).

-    // Note: this is the encoding original fail was saved in, *not* the
+    // Note: this is the encoding original file was saved in, *not* the

     // encoding of in-memory representation!
     wxString GetFileEncoding() const { return m_fileEncoding; }
 
     // encoding of in-memory representation!
     wxString GetFileEncoding() const { return m_fileEncoding; }
 


@@ -207,6 +207,7 @@ public:
     // (same as passed to Load or ctor, defaults to UTF-8).
     // NB: this is meaningless in Unicode build where data are stored as wchar_t*
     wxString GetEncoding() const { return m_encoding; }
     // (same as passed to Load or ctor, defaults to UTF-8).
     // NB: this is meaningless in Unicode build where data are stored as wchar_t*
     wxString GetEncoding() const { return m_encoding; }

+    void SetEncoding(const wxString& enc) { m_encoding = enc; }

 #endif
 
 private:
 #endif
 
 private: