WXIMPORT must specify default visibility too, otherwise things like typeinfo may...

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

diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index 175c51a31d9053a6ea9dc357a6b30d7c7d6fdd4b..5399ab5e3272aceb97c912bface3070a0e3ad08a 100644 (file)
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -17,16 +17,17 @@
  */
 
 #include "wx/richtext/richtextbuffer.h"
  */
 
 #include "wx/richtext/richtextbuffer.h"

+#include "wx/richtext/richtextstyles.h"

 
 

-#if wxUSE_RICHTEXT
+#if wxUSE_RICHTEXT && wxUSE_XML

 
 /*!
  * wxRichTextXMLHandler
  */
 
 
 /*!
  * 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:
 {
     DECLARE_CLASS(wxRichTextXMLHandler)
 public:


@@ -35,14 +36,13 @@ public:
         { }
 
 #if wxUSE_STREAMS
         { }
 
 #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);
     /// 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);
 
     /// 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);
 
     /// Create style parameters
     wxString CreateStyle(const wxTextAttrEx& attr, bool isPara = false);


@@ -66,47 +66,14 @@ public:
     wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString, bool translate = false);
 
 protected:
     wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString, bool translate = false);
 
 protected:

-
-};
-
-/*!
- * wxRichTextHTMLHandler
- */
-
-class WXDLLIMPEXP_ADV wxRichTextHTMLHandler: public wxRichTextFileHandler
-{
-    DECLARE_CLASS(wxRichTextHTMLHandler)
-public:
-    wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML)
-        : wxRichTextFileHandler(name, ext, type)
-        { }
-

 #if wxUSE_STREAMS
     virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
     virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
 #endif
 #if wxUSE_STREAMS
     virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
     virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
 #endif

-
-    /// Can we save using this handler?
-    virtual bool CanSave() const { return true; }
-
-    /// Can we load using this handler?
-    virtual bool CanLoad() const { return false; }
-
-    /// Can we handle this filename (if using files)? By default, checks the extension.
-    virtual bool CanHandle(const wxString& filename) const;
-
-    /// Output character formatting
-    virtual void OutputCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start);
-
-    /// Output paragraph formatting
-    virtual void OutputParagraphFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream, bool start);
-
-protected:
-

 };
 
 #endif
 };
 
 #endif

-    // wxUSE_RICHTEXT
+    // wxUSE_RICHTEXT && wxUSE_XML

 
 #endif
     // _WX_RICHTEXTXML_H_
 
 #endif
     // _WX_RICHTEXTXML_H_