| "), indentPixels);
+ int indentPixels = static_cast(indentLeftMM*10/4);
- OutputFont(thisStyle, str);
+ if ((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0)
+ {
+ // Use a table to do indenting if we don't have CSS
+ str << wxString::Format(wxT(" | "), indentPixels);
+ m_inTable = true;
+ }
- if (thisStyle.GetLeftSubIndent() < 0)
+ if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
{
str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
}
-
- m_inTable = true;
}
}
else
@@ -276,18 +378,39 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
CloseLists(-1, str);
wxString align = GetAlignment(thisStyle);
- str << wxString::Format(wxT(" "), align.c_str());
+ str << wxString::Format(wxT(" ");
}
+ OutputFont(thisStyle, str);
}
/// End paragraph formatting
-void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream)
{
+ if (thisStyle.HasFont())
+ stream << wxT("");
+
if (m_inTable)
{
- if (thisStyle.HasFont())
- stream << wxT("");
-
stream << wxT(" |
\n");
m_inTable = false;
}
@@ -319,7 +442,7 @@ void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str)
}
/// Output font tag
-void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream)
+void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream)
{
if (style.HasFont())
{
@@ -330,7 +453,7 @@ void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStre
}
}
-int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& tag )
+int wxRichTextHTMLHandler::TypeOfList( const wxRichTextAttr& thisStyle, wxString& tag )
{
// We can use number attribute of li tag but not all the browsers support it.
// also wxHtmlWindow doesn't support type attribute.
@@ -358,7 +481,7 @@ int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& ta
return 0;
}
-wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle )
+wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle )
{
switch( thisStyle.GetAlignment() )
{
@@ -384,20 +507,27 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
#if wxUSE_FILESYSTEM
if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{
- if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
image->LoadFromBlock();
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
+ if (image->GetImageBlock().IsOk())
{
- wxString ext(image->GetImageBlock().GetExtension());
- wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
- wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
+ wxImage img;
+ image->GetImageBlock().Load(img);
+ if (img.IsOk())
+ {
+ wxString ext(image->GetImageBlock().GetExtension());
+ wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
+ wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
- m_imageLocations.Add(tempFilename);
+ m_imageLocations.Add(tempFilename);
- str << wxT("memory:") << tempFilename;
+ str << wxT("memory:") << tempFilename;
+ }
}
else
str << wxT("memory:?");
@@ -406,12 +536,14 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
}
else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES)
{
- if (!image->GetImage().Ok() && image->GetImageBlock().GetData())
+#if 0
+ if (!image->GetImage().IsOk() && image->GetImageBlock().GetData())
image->LoadFromBlock();
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
- if (image->GetImage().Ok())
+ if (image->GetImageBlock().IsOk())
{
wxString tempDir(GetTempDir());
if (tempDir.IsEmpty())
@@ -436,14 +568,17 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
str << wxT("data:");
str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,");
-
- if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
+#if 0
+ if (image->GetImage().IsOk() && !image->GetImageBlock().GetData())
image->MakeBlock();
+#endif
+ 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;
-
- delete[] data;
+ delete[] data;
+ }
}
str << wxT("\" />");
@@ -473,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");
|