X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50f65288b1760ffdfd0c274b7be6b2d09e558f58..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/richtext/richtexthtml.h diff --git a/include/wx/richtext/richtexthtml.h b/include/wx/richtext/richtexthtml.h index f71ed68d9d..dee3f7091f 100644 --- a/include/wx/richtext/richtexthtml.h +++ b/include/wx/richtext/richtexthtml.h @@ -77,15 +77,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 wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& paraStyle, wxTextOutputStream& stream ); + void EndCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& 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 wxTextAttr& currentStyle, const wxTextAttr& thisStyle, wxTextOutputStream& stream); + void EndParagraphFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, wxTextOutputStream& stream); /// Output font tag - void OutputFont(const wxTextAttrEx& style, wxTextOutputStream& stream); + void OutputFont(const wxTextAttr& style, wxTextOutputStream& stream); /// Closes lists to level (-1 means close all) void CloseLists(int level, wxTextOutputStream& str); @@ -103,13 +103,13 @@ protected: const wxChar* GetMimeType(int imageType); /// Gets the html equivalent of the specified value - wxString GetAlignment(const wxTextAttrEx& thisStyle); + wxString GetAlignment(const wxTextAttr& 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 wxTextAttr& thisStyle, wxString& tag); #endif // Data members