Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 06670cb4868264281c9169b16d3c5e7aca79b09e..c21b00d2d42228185c4eb561fa77e610c9468900 100644 (file)
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-09-30
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-09-30

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -75,7 +74,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
     ClearTemporaryImageLocations();
 
 
     ClearTemporaryImageLocations();
 

-    buffer->Defragment();
+    wxRichTextDrawingContext context(buffer);
+    buffer->Defragment(context);

 
 #if wxUSE_UNICODE
     wxCSConv* customEncoding = NULL;
 
 #if wxUSE_UNICODE
     wxCSConv* customEncoding = NULL;


@@ -225,15 +225,25 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& curre
         m_font = true;
     }
 
         m_font = true;
     }
 

-    if (thisStyle.GetFontWeight() == wxBOLD)
+    if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)

         str << wxT("<b>");
         str << wxT("<b>");

-    if (thisStyle.GetFontStyle() == wxITALIC)
+    if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)

         str << wxT("<i>");
     if (thisStyle.GetFontUnderlined())
         str << wxT("<u>");
 
     if (thisStyle.HasURL())
         str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");
         str << wxT("<i>");
     if (thisStyle.GetFontUnderlined())
         str << wxT("<u>");
 
     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)


@@ -243,11 +253,21 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSE
 
     if (thisStyle.GetFontUnderlined())
         stream << wxT("</u>");
 
     if (thisStyle.GetFontUnderlined())
         stream << wxT("</u>");

-    if (thisStyle.GetFontStyle() == wxITALIC)
+    if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)

         stream << wxT("</i>");
         stream << wxT("</i>");

-    if (thisStyle.GetFontWeight() == wxBOLD)
+    if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)

         stream << wxT("</b>");
 
         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;


@@ -501,7 +521,7 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
             if (img.IsOk())
             {
                 wxString ext(image->GetImageBlock().GetExtension());
             if (img.IsOk())
             {
                 wxString ext(image->GetImageBlock().GetExtension());

-                wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
+                wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext.c_str()));

                 wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
 
                 m_imageLocations.Add(tempFilename);
                 wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
 
                 m_imageLocations.Add(tempFilename);


@@ -530,7 +550,7 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
                 tempDir = wxFileName::GetTempDir();
 
             wxString ext(image->GetImageBlock().GetExtension());
                 tempDir = wxFileName::GetTempDir();
 
             wxString ext(image->GetImageBlock().GetExtension());

-            wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext));
+            wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir.c_str(), sm_fileCounter, ext.c_str()));

             image->GetImageBlock().Write(tempFilename);
 
             m_imageLocations.Add(tempFilename);
             image->GetImageBlock().Write(tempFilename);
 
             m_imageLocations.Add(tempFilename);


@@ -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");