need to overload assertEquals(int,short) too to resolve ambiguity

[wxWidgets.git] / include / wx / richtext / richtextxml.h

diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index ac8f29563ed47e7c69bee372b299c84ecddf07c5..493511f802cb1f5ae96ff7f3ffd2dd9621552df3 100644 (file)
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -17,6 +17,7 @@
  */
 
 #include "wx/richtext/richtextbuffer.h"
+#include "wx/richtext/richtextstyles.h"
 
 #if wxUSE_RICHTEXT && wxUSE_XML
 
@@ -24,9 +25,9 @@
  * wxRichTextXMLHandler
  */
 
-class WXDLLIMPEXP_XML wxXmlNode;
+class WXDLLIMPEXP_FWD_XML wxXmlNode;
 
-class WXDLLIMPEXP_ADV wxRichTextXMLHandler: public wxRichTextFileHandler
+class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
 {
     DECLARE_CLASS(wxRichTextXMLHandler)
 public:
@@ -35,20 +36,19 @@ public:
         { }
 
 #if wxUSE_STREAMS
-    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
-
     /// Recursively export an object
     bool ExportXML(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextObject& obj, int level);
+    bool ExportStyleDefinition(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextStyleDefinition* def, int level);
 
     /// Recursively import an object
     bool ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node);
+    bool ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node);
 
     /// Create style parameters
-    wxString CreateStyle(const wxTextAttrEx& attr, bool isPara = false);
+    wxString CreateStyle(const wxTextAttr& attr, bool isPara = false);
 
     /// Get style parameters
-    bool GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool isPara = false);
+    bool GetStyle(wxTextAttr& attr, wxXmlNode* node, bool isPara = false);
 #endif
 
     /// Can we save using this handler?
@@ -66,7 +66,10 @@ public:
     wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString, bool translate = false);
 
 protected:
-
+#if wxUSE_STREAMS
+    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
+    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
+#endif
 };
 
 #endif