X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fdc2c5f2a4dd7f1394e374095b1cd3a34dfaa1b..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/richtext/richtexthtml.h diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h index 86cb17af69..9761384f81 100644 --- a/include/wx/richtext/richtexthtml.h +++ b/include/wx/richtext/richtexthtml.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 2005-09-30 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -27,7 +26,7 @@ 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); @@ -80,15 +79,15 @@ protected: virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream); /// Output character formatting - void BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& paraStyle, wxTextOutputStream& stream ); - void EndCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& 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 wxTextAttr& currentStyle, const wxTextAttr& thisStyle, wxTextOutputStream& stream); - void EndParagraphFormatting(const wxTextAttr& currentStyle, const wxTextAttr& 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 wxTextAttr& style, wxTextOutputStream& stream); + void OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream); /// Closes lists to level (-1 means close all) void CloseLists(int level, wxTextOutputStream& str); @@ -106,13 +105,13 @@ protected: const wxChar* GetMimeType(int imageType); /// Gets the html equivalent of the specified value - wxString GetAlignment(const wxTextAttr& 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 wxTextAttr& thisStyle, wxString& tag); + int TypeOfList(const wxRichTextAttr& thisStyle, wxString& tag); #endif // Data members