Compile fixes for wxUSE_COLLPANE=0

[wxWidgets.git] / src / richtext / richtexthtml.cpp

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 7576075bc884577c27db9f51edc3109faf680726..8caec2e8cabfb46b79d821d07e4c2e741acf263c 100644 (file)
--- 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("<a href=\"") << thisStyle.GetURL() << wxT("\">");
 
     if (thisStyle.HasURL())
         str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");

+
+    if (thisStyle.HasTextEffects())
+    {
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+            str << wxT("<del>");
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+            str << wxT("<sup>");
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT)
+            str << wxT("<sub>");
+    }

 }
 
 void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream)
 }
 
 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("</b>");
 
     if (thisStyle.GetFontWeight() == wxBOLD)
         stream << wxT("</b>");
 

+    if (thisStyle.HasTextEffects())
+    {
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+            stream << wxT("</del>");
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+            stream << wxT("</sup>");
+        if (thisStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT)
+            stream << wxT("</sub>");
+    }
+

     if (m_font)
     {
         m_font = false;
     if (m_font)
     {
         m_font = false;


@@ -488,9 +508,9 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
     if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
     {
 #if 0
     if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
     {
 #if 0

-        if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+        if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())

             image->LoadFromBlock();
             image->LoadFromBlock();

-        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+        if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())

             image->MakeBlock();
 #endif
 
             image->MakeBlock();
 #endif
 


@@ -517,13 +537,13 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
     else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
     {
 #if 0
     else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
     {
 #if 0

-        if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+        if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())

             image->LoadFromBlock();
             image->LoadFromBlock();

-        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+        if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())

             image->MakeBlock();
 #endif
 
             image->MakeBlock();
 #endif
 

-        if (image->GetImageBlock().Ok())
+        if (image->GetImageBlock().IsOk())

         {
             wxString tempDir(GetTempDir());
             if (tempDir.IsEmpty())
         {
             wxString tempDir(GetTempDir());
             if (tempDir.IsEmpty())


@@ -549,10 +569,10 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
         str << GetMimeType(image->GetImageBlock().GetImageType());
         str << wxT(";base64,");
 #if 0
         str << GetMimeType(image->GetImageBlock().GetImageType());
         str << wxT(";base64,");
 #if 0

-        if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+        if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())

             image->MakeBlock();
 #endif
             image->MakeBlock();
 #endif

-        if (image->GetImageBlock().Ok())
+        if (image->GetImageBlock().IsOk())

         {
             wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
             str << data;
         {
             wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
             str << data;


@@ -588,7 +608,7 @@ const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
     {
     case wxBITMAP_TYPE_BMP:
         return wxT("image/bmp");
     {
     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");
         return wxT("image/tiff");
     case wxBITMAP_TYPE_GIF:
         return wxT("image/gif");