X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50f65288b1760ffdfd0c274b7be6b2d09e558f58..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/richtext/richtexthtml.h

diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h
index f71ed68d9d..083bf35470 100644
--- a/include/wx/richtext/richtexthtml.h
+++ b/include/wx/richtext/richtexthtml.h
@@ -18,13 +18,16 @@
 
 #include "wx/richtext/richtextbuffer.h"
 
+// Use CSS styles where applicable, otherwise use non-CSS workarounds
+#define wxRICHTEXT_HANDLER_USE_CSS 0x1000
+
 /*!
  * wxRichTextHTMLHandler
  */
 
 class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler
 {
-    DECLARE_CLASS(wxRichTextHTMLHandler)
+    DECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler)
 public:
     wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML);
 
@@ -77,15 +80,15 @@ protected:
     virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
 
     /// Output character formatting
-    void BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxTextOutputStream& stream );
-    void EndCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxTextOutputStream& stream );
+    void BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream );
+    void EndCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream );
 
     /// Output paragraph formatting
-    void BeginParagraphFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxTextOutputStream& stream);
-    void EndParagraphFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxTextOutputStream& stream);
+    void BeginParagraphFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, wxTextOutputStream& stream);
+    void EndParagraphFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, wxTextOutputStream& stream);
 
     /// Output font tag
-    void OutputFont(const wxTextAttrEx& style, wxTextOutputStream& stream);
+    void OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream);
 
     /// Closes lists to level (-1 means close all)
     void CloseLists(int level, wxTextOutputStream& str);
@@ -103,13 +106,13 @@ protected:
     const wxChar* GetMimeType(int imageType);
 
     /// Gets the html equivalent of the specified value
-    wxString GetAlignment(const wxTextAttrEx& thisStyle);
+    wxString GetAlignment(const wxRichTextAttr& thisStyle);
 
     /// Generates   array for indentations
     wxString SymbolicIndent(long indent);
 
     /// Finds the html equivalent of the specified bullet
-    int TypeOfList(const wxTextAttrEx& thisStyle, wxString& tag);
+    int TypeOfList(const wxRichTextAttr& thisStyle, wxString& tag);
 #endif
 
 // Data members