use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

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

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index a24b6f9db82aa8129a5ad767f102a785588f0615..e2371f649723e9846a941e5bcae3c649db60e6c2 100644 (file)
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -224,7 +224,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
         str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
     }
 
         str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
     }
 

-    if (thisStyle.HasLeftIndent())
+    if (thisStyle.HasLeftIndent() && thisStyle.GetLeftIndent() != 0)

     {
         if (thisStyle.HasBulletStyle())
         {
     {
         if (thisStyle.HasBulletStyle())
         {


@@ -394,7 +394,7 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
         if (image->GetImage().Ok())
         {        
             wxString ext(image->GetImageBlock().GetExtension());
         if (image->GetImage().Ok())
         {        
             wxString ext(image->GetImageBlock().GetExtension());

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

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


@@ -420,7 +420,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"), (const wxChar*) tempDir, sm_fileCounter, (const wxChar*) ext));
+            wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext));

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