X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b806b98241ab649c169aaa1f134df85e80fb8b..7be2a7af39888b264eb0c5787fb2914005633d1b:/src/richtext/richtexthtml.cpp?ds=inline diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 06670cb486..8caec2e8ca 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -234,6 +234,16 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& curre if (thisStyle.HasURL()) str << wxT(""); + + if (thisStyle.HasTextEffects()) + { + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) + str << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + str << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) + str << wxT(""); + } } void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) @@ -248,6 +258,16 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSE if (thisStyle.GetFontWeight() == wxBOLD) stream << wxT(""); + if (thisStyle.HasTextEffects()) + { + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) + stream << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) + stream << wxT(""); + if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) + stream << wxT(""); + } + if (m_font) { m_font = false; @@ -588,7 +608,7 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType) { case wxBITMAP_TYPE_BMP: return wxT("image/bmp"); - case wxBITMAP_TYPE_TIF: + case wxBITMAP_TYPE_TIFF: return wxT("image/tiff"); case wxBITMAP_TYPE_GIF: return wxT("image/gif");