No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / src / richtext / richtextstyles.cpp
diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp

index 3cfec1ff071926d95524d0d85766aec5b4f27026..ab98d93d0ad2486d993aaa8519c0cc334d36dbf3 100644 (file)
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -4,7 +4,6 @@
  // Author:      Julian Smart
  // Modified by:
  // Created:     2005-09-30
-// RCS-ID:      $Id$
  // Copyright:   (c) Julian Smart
  // Licence:     wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
@@ -740,11 +739,20 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
      if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
          isCentred = true;
  
+    str << wxT("<html><head></head>");
+    str << wxT("<body");
+    if (attr.GetBackgroundColour().Ok())
+        str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
+    str << wxT(">");
+
      if (isCentred)
          str << wxT("<center>");
  
+    str << wxT("<table");
+    if (attr.GetBackgroundColour().Ok())
+        str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
  
-    str << wxT("<table><tr>");
+    str << wxT("><tr>");
  
      if (attr.GetLeftIndent() > 0)
      {
@@ -837,6 +845,9 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
      if (attr.GetTextColour().IsOk())
          str << wxT(" color=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\"");
  
+    if (attr.GetBackgroundColour().Ok())
+        str << wxT(" bgcolor=\"#") << ColourToHexString(attr.GetBackgroundColour()) << wxT("\"");
+
      str << wxT(">");
  
      bool hasBold = false;
@@ -876,6 +887,7 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
      if (isCentred)
          str << wxT("</center>");
  
+    str << wxT("</body></html>");
      return str;
  }