add -mno-cygwin detection: we should treat cygwin as Windows, not Unix, when it's...

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index ab68f2f3930344cc652a16559070bfeb9e8c8f72..064e792bad167417d640f0049e1337d6511ca236 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtextbuffer.cpp
+// Name:        src/richtext/richtextbuffer.cpp

 // Purpose:     Buffer for wxRichTextCtrl
 // Author:      Julian Smart
 // Purpose:     Buffer for wxRichTextCtrl
 // Author:      Julian Smart

-// Modified by: 
+// Modified by:

 // Created:     2005-09-30
 // Created:     2005-09-30

-// RCS-ID:      
+// RCS-ID:      $Id$

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


@@ -13,32 +13,38 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
+#if wxUSE_RICHTEXT

 
 

-#include "wx/image.h"
+#include "wx/richtext/richtextbuffer.h"

 
 

-#if wxUSE_RICHTEXT
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/dataobj.h"
+    #include "wx/module.h"
+#endif

 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"

-#include "wx/module.h"

 #include "wx/mstream.h"
 #include "wx/sstream.h"
 #include "wx/mstream.h"
 #include "wx/sstream.h"

+#include "wx/textfile.h"

 
 

-#include "wx/richtext/richtextbuffer.h"

 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/listimpl.cpp"
 
 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxRichTextObjectList);
-WX_DEFINE_LIST(wxRichTextLineList);
+WX_DEFINE_LIST(wxRichTextObjectList)
+WX_DEFINE_LIST(wxRichTextLineList)
+
+// Switch off if the platform doesn't like it for some reason
+#define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1

 
 /*!
  * wxRichTextObject
 
 /*!
  * wxRichTextObject


@@ -79,11 +85,12 @@ void wxRichTextObject::Copy(const wxRichTextObject& obj)
     m_range = obj.m_range;
     m_attributes = obj.m_attributes;
     m_descent = obj.m_descent;
     m_range = obj.m_range;
     m_attributes = obj.m_attributes;
     m_descent = obj.m_descent;

-
+/*

     if (!m_attributes.GetFont().Ok())
         wxLogDebug(wxT("No font!"));
     if (!obj.m_attributes.GetFont().Ok())
         wxLogDebug(wxT("Parent has no font!"));
     if (!m_attributes.GetFont().Ok())
         wxLogDebug(wxT("No font!"));
     if (!obj.m_attributes.GetFont().Ok())
         wxLogDebug(wxT("Parent has no font!"));

+*/

 }
 
 void wxRichTextObject::SetMargins(int margin)
 }
 
 void wxRichTextObject::SetMargins(int margin)


@@ -99,11 +106,21 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin
     m_bottomMargin = bottomMargin;
 }
 
     m_bottomMargin = bottomMargin;
 }
 

-// Convert units in tends of a millimetre to device units
+// Convert units in tenths of a millimetre to device units

 int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units)
 {
 int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units)
 {

-    int ppi = dc.GetPPI().x;
+    int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units);

 
 

+    // Unscale
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer)
+        p = (int) ((double)p / buffer->GetScale());
+    return p;
+}
+
+// Convert units in tenths of a millimetre to device units
+int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units)
+{

     // There are ppi pixels in 254.1 "1/10 mm"
 
     double pixels = ((double) units * (double)ppi) / 254.1;
     // There are ppi pixels in 254.1 "1/10 mm"
 
     double pixels = ((double) units * (double)ppi) / 254.1;


@@ -119,6 +136,14 @@ void wxRichTextObject::Dump(wxTextOutputStream& stream)
     stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n");
 }
 
     stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n");
 }
 

+/// Gets the containing buffer
+wxRichTextBuffer* wxRichTextObject::GetBuffer() const
+{
+    const wxRichTextObject* obj = this;
+    while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer)))
+        obj = obj->GetParent();
+    return wxDynamicCast(obj, wxRichTextBuffer);
+}

 
 /*!
  * wxRichTextCompositeObject
 
 /*!
  * wxRichTextCompositeObject


@@ -174,9 +199,10 @@ bool wxRichTextCompositeObject::RemoveChild(wxRichTextObject* child, bool delete
     wxRichTextObjectList::compatibility_iterator node = m_children.Find(child);
     if (node)
     {
     wxRichTextObjectList::compatibility_iterator node = m_children.Find(child);
     if (node)
     {

+        wxRichTextObject* obj = node->GetData();
+        m_children.Erase(node);

         if (deleteChild)
         if (deleteChild)

-            delete node->GetData();
-        delete node;
+            delete obj;

 
         return true;
     }
 
         return true;
     }


@@ -195,7 +221,7 @@ bool wxRichTextCompositeObject::DeleteChildren()
         child->Dereference(); // Only delete if reference count is zero
 
         node = node->GetNext();
         child->Dereference(); // Only delete if reference count is zero
 
         node = node->GetNext();

-        delete oldNode;
+        m_children.Erase(oldNode);

     }
 
     return true;
     }
 
     return true;


@@ -218,7 +244,9 @@ void wxRichTextCompositeObject::Copy(const wxRichTextCompositeObject& obj)
     while (node)
     {
         wxRichTextObject* child = node->GetData();
     while (node)
     {
         wxRichTextObject* child = node->GetData();

-        m_children.Append(child->Clone());
+        wxRichTextObject* newChild = child->Clone();
+        newChild->SetParent(this);
+        m_children.Append(newChild);

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -293,12 +321,12 @@ void wxRichTextCompositeObject::CalculateRange(long start, long& end)
 bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();

-    
+

     while (node)
     {
         wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
         wxRichTextObjectList::compatibility_iterator next = node->GetNext();
     while (node)
     {
         wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
         wxRichTextObjectList::compatibility_iterator next = node->GetNext();

-        
+

         // Delete the range in each paragraph
 
         // When a chunk has been deleted, internally the content does not
         // Delete the range in each paragraph
 
         // When a chunk has been deleted, internally the content does not


@@ -307,7 +335,7 @@ bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
         // If you may delete content from the same object twice, recalculate
         // the ranges inbetween DeleteRange calls by calling CalculateRanges, and
         // adjust the range you're deleting accordingly.
         // If you may delete content from the same object twice, recalculate
         // the ranges inbetween DeleteRange calls by calling CalculateRanges, and
         // adjust the range you're deleting accordingly.

-        
+

         if (!obj->GetRange().IsOutside(range))
         {
             obj->DeleteRange(range);
         if (!obj->GetRange().IsOutside(range))
         {
             obj->DeleteRange(range);


@@ -318,13 +346,13 @@ bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
             {
                 // An empty paragraph has length 1, so won't be deleted unless the
                 // whole range is deleted.
             {
                 // An empty paragraph has length 1, so won't be deleted unless the
                 // whole range is deleted.

-                RemoveChild(obj, true);       
+                RemoveChild(obj, true);

             }
         }
             }
         }

-        
+

         node = next;
     }
         node = next;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -340,9 +368,9 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range
         if (!child->GetRange().IsOutside(range))
         {
             childRange.LimitTo(child->GetRange());
         if (!child->GetRange().IsOutside(range))
         {
             childRange.LimitTo(child->GetRange());

-            
+

             wxString childText = child->GetTextForRange(childRange);
             wxString childText = child->GetTextForRange(childRange);

-            
+

             text += childText;
         }
         node = node->GetNext();
             text += childText;
         }
         node = node->GetNext();


@@ -359,7 +387,7 @@ bool wxRichTextCompositeObject::Defragment()
     {
         wxRichTextObject* child = node->GetData();
         wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
     {
         wxRichTextObject* child = node->GetData();
         wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);

-        if (composite)        
+        if (composite)

             composite->Defragment();
 
         if (node->GetNext())
             composite->Defragment();
 
         if (node->GetNext())


@@ -368,7 +396,7 @@ bool wxRichTextCompositeObject::Defragment()
             if (child->CanMerge(nextChild) && child->Merge(nextChild))
             {
                 nextChild->Dereference();
             if (child->CanMerge(nextChild) && child->Merge(nextChild))
             {
                 nextChild->Dereference();

-                delete node->GetNext();
+                m_children.Erase(node->GetNext());

 
                 // Don't set node -- we'll see if we can merge again with the next
                 // child.
 
                 // Don't set node -- we'll see if we can merge again with the next
                 // child.


@@ -440,13 +468,13 @@ bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
 }
 
 /// Get/set the size for the given range. Assume only has one child.
 }
 
 /// Get/set the size for the given range. Assume only has one child.

-bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const
+bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const

 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     if (node)
     {
         wxRichTextObject* child = node->GetData();
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     if (node)
     {
         wxRichTextObject* child = node->GetData();

-        return child->GetRangeSize(range, size, descent, dc, flags);
+        return child->GetRangeSize(range, size, descent, dc, flags, position);

     }
     else
         return false;
     }
     else
         return false;


@@ -480,10 +508,12 @@ void wxRichTextParagraphLayoutBox::Init()
     // For now, assume is the only box and has no initial size.
     m_range = wxRichTextRange(0, -1);
 
     // For now, assume is the only box and has no initial size.
     m_range = wxRichTextRange(0, -1);
 

+    m_invalidRange.SetRange(-1, -1);

     m_leftMargin = 4;
     m_rightMargin = 4;
     m_topMargin = 4;
     m_bottomMargin = 4;
     m_leftMargin = 4;
     m_rightMargin = 4;
     m_topMargin = 4;
     m_bottomMargin = 4;

+    m_partialParagraph = false;

 }
 
 /// Draw the item
 }
 
 /// Draw the item


@@ -494,17 +524,22 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
     {
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (child != NULL);
     {
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (child != NULL);

-        
+

         if (child && !child->GetRange().IsOutside(range))
         {
             wxRect childRect(child->GetPosition(), child->GetCachedSize());
         if (child && !child->GetRange().IsOutside(range))
         {
             wxRect childRect(child->GetPosition(), child->GetCachedSize());

-            
-            if (childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop())
+
+            if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom())
+            {
+                // Stop drawing
+                break;
+            }
+            else if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetBottom() < rect.GetTop())

             {
                 // Skip
             }
             else
             {
                 // Skip
             }
             else

-                child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style);
+                child->Draw(dc, range, selectionRange, childRect, descent, style);

         }
 
         node = node->GetNext();
         }
 
         node = node->GetNext();


@@ -515,7 +550,34 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
 /// Lay the item out
 bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style)
 {
 /// Lay the item out
 bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style)
 {

-    wxRect availableSpace(rect.x + m_leftMargin,
+    wxRect availableSpace;
+    bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
+
+    // If only laying out a specific area, the passed rect has a different meaning:
+    // the visible part of the buffer. This is used in wxRichTextCtrl::OnSize,
+    // so that during a size, only the visible part will be relaid out, or
+    // it would take too long causing flicker. As an approximation, we assume that
+    // everything up to the start of the visible area is laid out correctly.
+    if (formatRect)
+    {
+        availableSpace = wxRect(0 + m_leftMargin,
+                          0 + m_topMargin,
+                          rect.width - m_leftMargin - m_rightMargin,
+                          rect.height);
+
+        // Invalidate the part of the buffer from the first visible line
+        // to the end. If other parts of the buffer are currently invalid,
+        // then they too will be taken into account if they are above
+        // the visible point.
+        long startPos = 0;
+        wxRichTextLine* line = GetLineAtYPosition(rect.y);
+        if (line)
+            startPos = line->GetAbsoluteRange().GetStart();
+
+        Invalidate(wxRichTextRange(startPos, GetRange().GetEnd()));
+    }
+    else
+        availableSpace = wxRect(rect.x + m_leftMargin,

                           rect.y + m_topMargin,
                           rect.width - m_leftMargin - m_rightMargin,
                           rect.height - m_topMargin - m_bottomMargin);
                           rect.y + m_topMargin,
                           rect.width - m_leftMargin - m_rightMargin,
                           rect.height - m_topMargin - m_bottomMargin);


@@ -523,18 +585,95 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
     int maxWidth = 0;
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     int maxWidth = 0;
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();

+
+    bool layoutAll = true;
+
+    // Get invalid range, rounding to paragraph start/end.
+    wxRichTextRange invalidRange = GetInvalidRange(true);
+
+    if (invalidRange == wxRICHTEXT_NONE && !formatRect)
+        return true;
+
+    if (invalidRange == wxRICHTEXT_ALL)
+        layoutAll = true;
+    else    // If we know what range is affected, start laying out from that point on.
+        if (invalidRange.GetStart() > GetRange().GetStart())
+    {
+        wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart());
+        if (firstParagraph)
+        {
+            wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph);
+            wxRichTextObjectList::compatibility_iterator previousNode;
+            if ( firstNode )
+                previousNode = firstNode->GetPrevious();
+            if (firstNode && previousNode)
+            {
+                wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
+                availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+
+                // Now we're going to start iterating from the first affected paragraph.
+                node = firstNode;
+
+                layoutAll = false;
+            }
+        }
+    }
+
+    // A way to force speedy rest-of-buffer layout (the 'else' below)
+    bool forceQuickLayout = false;
+

     while (node)
     {
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
     while (node)
     {
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);

-        wxASSERT (child != NULL);
+        wxCHECK_MSG( child, false, _T("Unknown object in layout") );

 
 

-        child->Layout(dc, availableSpace, style);
+        // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
+        if ( !forceQuickLayout &&
+                (layoutAll ||
+                    child->GetLines().IsEmpty() ||
+                        !child->GetRange().IsOutside(invalidRange)) )
+        {
+            child->Layout(dc, availableSpace, style);
+
+            // Layout must set the cached size
+            availableSpace.y += child->GetCachedSize().y;
+            maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+
+            // If we're just formatting the visible part of the buffer,
+            // and we're now past the bottom of the window, start quick
+            // layout.
+            if (formatRect && child->GetPosition().y > rect.GetBottom())
+                forceQuickLayout = true;
+        }
+        else
+        {
+            // We're outside the immediately affected range, so now let's just
+            // move everything up or down. This assumes that all the children have previously
+            // been laid out and have wrapped line lists associated with them.
+            // TODO: check all paragraphs before the affected range.
+
+            int inc = availableSpace.y - child->GetPosition().y;
+
+            while (node)
+            {
+                wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+                if (child)
+                {
+                    if (child->GetLines().GetCount() == 0)
+                        child->Layout(dc, availableSpace, style);
+                    else
+                        child->SetPosition(wxPoint(child->GetPosition().x, child->GetPosition().y + inc));

 
 

-        // Layout must set the cached size
-        availableSpace.y += child->GetCachedSize().y;
-        maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+                    availableSpace.y += child->GetCachedSize().y;
+                    maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+                }
+
+                node = node->GetNext();
+            }
+            break;
+        }

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -542,6 +681,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
     SetCachedSize(wxSize(maxWidth, availableSpace.y));
 
     m_dirty = false;
     SetCachedSize(wxSize(maxWidth, availableSpace.y));
 
     m_dirty = false;

+    m_invalidRange = wxRICHTEXT_NONE;

 
     return true;
 }
 
     return true;
 }


@@ -550,15 +690,17 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
 void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
 {
     wxRichTextBox::Copy(obj);
 void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
 {
     wxRichTextBox::Copy(obj);

+
+    m_partialParagraph = obj.m_partialParagraph;

 }
 
 /// Get/set the size for the given range.
 }
 
 /// Get/set the size for the given range.

-bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const
+bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const

 {
     wxSize sz;
 
 {
     wxSize sz;
 

-    wxRichTextObjectList::compatibility_iterator startPara = NULL;
-    wxRichTextObjectList::compatibility_iterator endPara = NULL;
+    wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator();
+    wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator();

 
     // First find the first paragraph whose starting position is within the range.
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
     // First find the first paragraph whose starting position is within the range.
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();


@@ -609,7 +751,7 @@ bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wx
         wxSize childSize;
 
         int childDescent = 0;
         wxSize childSize;
 
         int childDescent = 0;

-        child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags);
+        child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags, position);

 
         descent = wxMax(childDescent, descent);
 
 
         descent = wxMax(childDescent, descent);
 


@@ -670,15 +812,17 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c
         {
             wxRichTextLine* line = node2->GetData();
 
         {
             wxRichTextLine* line = node2->GetData();
 

-            if (line->GetRange().Contains(pos) ||
+            wxRichTextRange range = line->GetAbsoluteRange();
+
+            if (range.Contains(pos) ||

 
                 // If the position is end-of-paragraph, then return the last line of
                 // of the paragraph.
 
                 // If the position is end-of-paragraph, then return the last line of
                 // of the paragraph.

-                (line->GetRange().GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))
+                (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))

                 return line;
 
             node2 = node2->GetNext();
                 return line;
 
             node2 = node2->GetNext();

-        }          
+        }

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -710,7 +854,7 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtYPosition(int y) const
                 return line;
 
             node2 = node2->GetNext();
                 return line;
 
             node2 = node2->GetNext();

-        }          
+        }

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -744,7 +888,7 @@ int wxRichTextParagraphLayoutBox::GetLineCount() const
 /// Get the paragraph for a given line
 wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const
 {
 /// Get the paragraph for a given line
 wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const
 {

-    return GetParagraphAtPosition(line->GetRange().GetStart());
+    return GetParagraphAtPosition(line->GetAbsoluteRange().GetStart());

 }
 
 /// Get the line size at the given position
 }
 
 /// Get the line size at the given position


@@ -761,8 +905,17 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP
 
 
 /// Convenience function to add a paragraph of text
 
 
 /// Convenience function to add a paragraph of text

-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)

 {
 {

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    // Don't use the base style, just the default style, and the base style will
+    // be combined at display time.
+    // Divide into paragraph and character styles.
+    
+    wxTextAttrEx defaultCharStyle;
+    wxTextAttrEx defaultParaStyle;
+    wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+#else

     wxTextAttrEx style(GetAttributes());
 
     // Apply default style. If the style has no attributes set,
     wxTextAttrEx style(GetAttributes());
 
     // Apply default style. If the style has no attributes set,


@@ -770,7 +923,13 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text)
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 

-    wxRichTextParagraph* para = new wxRichTextParagraph(text, this, & style);
+    wxTextAttrEx defaultCharStyle = style;
+    wxTextAttrEx defaultParaStyle = style;
+#endif
+    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
+    wxTextAttrEx* cStyle = & defaultCharStyle;
+
+    wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);

 
     AppendChild(para);
 
 
     AppendChild(para);
 


@@ -781,37 +940,58 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text)
 }
 
 /// Adds multiple paragraphs, based on newlines.
 }
 
 /// Adds multiple paragraphs, based on newlines.

-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)

 {
 {

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    // Don't use the base style, just the default style, and the base style will
+    // be combined at display time.
+    // Divide into paragraph and character styles.
+    
+    wxTextAttrEx defaultCharStyle;
+    wxTextAttrEx defaultParaStyle;
+    wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+#else

     wxTextAttrEx style(GetAttributes());
     wxTextAttrEx style(GetAttributes());

-    //wxLogDebug("Initial style = %s", style.GetFont().GetFaceName());
-    //wxLogDebug("Initial size = %d", style.GetFont().GetPointSize());

 
     // Apply default style. If the style has no attributes set,
     // then the attributes will remain the 'basic style' (i.e. the
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 
 
     // Apply default style. If the style has no attributes set,
     // then the attributes will remain the 'basic style' (i.e. the
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 

-    //wxLogDebug("Style after applying default style = %s", style.GetFont().GetFaceName());
-    //wxLogDebug("Size after applying default style = %d", style.GetFont().GetPointSize());
+    wxTextAttrEx defaultCharStyle = style;
+    wxTextAttrEx defaultParaStyle = style;
+#endif
+
+    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
+    wxTextAttrEx* cStyle = & defaultCharStyle;

 
     wxRichTextParagraph* firstPara = NULL;
     wxRichTextParagraph* lastPara = NULL;
 
     wxRichTextRange range(-1, -1);
 
     wxRichTextParagraph* firstPara = NULL;
     wxRichTextParagraph* lastPara = NULL;
 
     wxRichTextRange range(-1, -1);

+

     size_t i = 0;
     size_t i = 0;

-    size_t len = text.Length();
+    size_t len = text.length();

     wxString line;
     wxString line;

+    wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+
+    AppendChild(para);
+
+    firstPara = para;
+    lastPara = para;
+

     while (i < len)
     {
         wxChar ch = text[i];
         if (ch == wxT('\n') || ch == wxT('\r'))
         {
     while (i < len)
     {
         wxChar ch = text[i];
         if (ch == wxT('\n') || ch == wxT('\r'))
         {

-            wxRichTextParagraph* para = new wxRichTextParagraph(line, this, & style);
+            wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+            plainText->SetText(line);
+
+            para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);

 
             AppendChild(para);
 
             AppendChild(para);

-            if (!firstPara)
-                firstPara = para;
+

             lastPara = para;
             line = wxEmptyString;
         }
             lastPara = para;
             line = wxEmptyString;
         }


@@ -820,32 +1000,32 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
 
         i ++;
     }
 
         i ++;
     }

-    if (!line.IsEmpty())
+
+    if (!line.empty())

     {
     {

-        lastPara = new wxRichTextParagraph(line, this, & style);
-        //wxLogDebug("Para Face = %s", lastPara->GetAttributes().GetFont().GetFaceName());
-        AppendChild(lastPara);
+        wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+        plainText->SetText(line);

     }
 
     }
 

-    if (firstPara)
-        range.SetStart(firstPara->GetRange().GetStart());
-    else if (lastPara)
-        range.SetStart(lastPara->GetRange().GetStart());
-
-    if (lastPara)
-        range.SetEnd(lastPara->GetRange().GetEnd());
-    else if (firstPara)
-        range.SetEnd(firstPara->GetRange().GetEnd());
-

     UpdateRanges();
     UpdateRanges();

+

     SetDirty(false);
 
     SetDirty(false);
 

-    return GetRange();
+    return wxRichTextRange(firstPara->GetRange().GetStart(), lastPara->GetRange().GetEnd());

 }
 
 /// Convenience function to add an image
 }
 
 /// Convenience function to add an image

-wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)

 {
 {

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    // Don't use the base style, just the default style, and the base style will
+    // be combined at display time.
+    // Divide into paragraph and character styles.
+    
+    wxTextAttrEx defaultCharStyle;
+    wxTextAttrEx defaultParaStyle;
+    wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+#else

     wxTextAttrEx style(GetAttributes());
 
     // Apply default style. If the style has no attributes set,
     wxTextAttrEx style(GetAttributes());
 
     // Apply default style. If the style has no attributes set,


@@ -853,9 +1033,16 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image)
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 
     // layout box's style).
     wxRichTextApplyStyle(style, GetDefaultStyle());
 

-    wxRichTextParagraph* para = new wxRichTextParagraph(this, & style);
+    wxTextAttrEx defaultCharStyle = style;
+    wxTextAttrEx defaultParaStyle = style;
+#endif
+
+    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
+    wxTextAttrEx* cStyle = & defaultCharStyle;
+
+    wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);

     AppendChild(para);
     AppendChild(para);

-    para->AppendChild(new wxRichTextImage(image, this));
+    para->AppendChild(new wxRichTextImage(image, this, cStyle));

 
     UpdateRanges();
     SetDirty(true);
 
     UpdateRanges();
     SetDirty(true);


@@ -867,10 +1054,8 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image)
 /// Insert fragment into this box at the given position. If partialParagraph is true,
 /// it is assumed that the last (or only) paragraph is just a piece of data with no paragraph
 /// marker.
 /// Insert fragment into this box at the given position. If partialParagraph is true,
 /// it is assumed that the last (or only) paragraph is just a piece of data with no paragraph
 /// marker.

-/// TODO: if fragment is inserted inside styled fragment, must apply that style to
-/// to the data (if it has a default style, anyway).

 
 

-bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragment& fragment)
+bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment)

 {
     SetDirty(true);
 
 {
     SetDirty(true);
 


@@ -898,11 +1083,16 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT (firstPara != NULL);
 
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT (firstPara != NULL);
 

+            // Apply the new paragraph attributes to the existing paragraph
+            wxTextAttrEx attr(para->GetAttributes());
+            wxRichTextApplyStyle(attr, firstPara->GetAttributes());
+            para->SetAttributes(attr);
+

             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();
             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();

-                
+

                 if (!nextObject)
                 {
                     // Append
                 if (!nextObject)
                 {
                     // Append


@@ -913,7 +1103,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
                     // Insert before nextObject
                     para->InsertChild(newObj, nextObject);
                 }
                     // Insert before nextObject
                     para->InsertChild(newObj, nextObject);
                 }

-                
+

                 objectNode = objectNode->GetNext();
             }
 
                 objectNode = objectNode->GetNext();
             }
 


@@ -949,10 +1139,10 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();
             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();

-                
+

                 // Append
                 para->AppendChild(newObj);
                 // Append
                 para->AppendChild(newObj);

-                
+

                 objectNode = objectNode->GetNext();
             }
 
                 objectNode = objectNode->GetNext();
             }
 


@@ -978,7 +1168,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
                 if (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else
                 if (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else

-                    AppendChild(finalPara);                
+                    AppendChild(finalPara);

             }
             else while (i)
             {
             }
             else while (i)
             {


@@ -991,7 +1181,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);

-                
+

                 i = i->GetNext();
             }
 
                 i = i->GetNext();
             }
 


@@ -1003,8 +1193,7 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
                 // Ensure there's at least one object
                 if (finalPara->GetChildCount() == 0)
                 {
                 // Ensure there's at least one object
                 if (finalPara->GetChildCount() == 0)
                 {

-                    wxRichTextPlainText* text = new wxRichTextPlainText(wxT(""));
-                    text->SetAttributes(finalPara->GetAttributes());
+                    wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);

 
                     finalPara->AppendChild(text);
                 }
 
                     finalPara->AppendChild(text);
                 }


@@ -1021,21 +1210,19 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm
         {
             wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
             wxASSERT( para != NULL );
         {
             wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
             wxASSERT( para != NULL );

-            
+

             AppendChild(para->Clone());
             AppendChild(para->Clone());

-            
+

             i = i->GetNext();
         }
 
         return true;
     }
             i = i->GetNext();
         }
 
         return true;
     }

-
-    return false;

 }
 
 /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'.
 /// If there was an incomplete paragraph at the end, partialParagraph is set to true.
 }
 
 /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'.
 /// If there was an incomplete paragraph at the end, partialParagraph is set to true.

-bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wxRichTextFragment& fragment)
+bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wxRichTextParagraphLayoutBox& fragment)

 {
     wxRichTextObjectList::compatibility_iterator i = GetChildren().GetFirst();
     while (i)
 {
     wxRichTextObjectList::compatibility_iterator i = GetChildren().GetFirst();
     while (i)


@@ -1046,7 +1233,7 @@ bool wxRichTextParagraphLayoutBox::CopyFragment(const wxRichTextRange& range, wx
         if (!para->GetRange().IsOutside(range))
         {
             fragment.AppendChild(para->Clone());
         if (!para->GetRange().IsOutside(range))
         {
             fragment.AppendChild(para->Clone());

-        }        
+        }

         i = i->GetNext();
     }
 
         i = i->GetNext();
     }
 


@@ -1123,20 +1310,21 @@ long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosi
             while (node2)
             {
                 wxRichTextLine* line = node2->GetData();
             while (node2)
             {
                 wxRichTextLine* line = node2->GetData();

-                
-                if (line->GetRange().Contains(pos))
+                wxRichTextRange lineRange = line->GetAbsoluteRange();
+
+                if (lineRange.Contains(pos))

                 {
                     // If the caret is displayed at the end of the previous wrapped line,
                     // we want to return the line it's _displayed_ at (not the actual line
                     // containing the position).
                 {
                     // If the caret is displayed at the end of the previous wrapped line,
                     // we want to return the line it's _displayed_ at (not the actual line
                     // containing the position).

-                    if (line->GetRange().GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)
+                    if (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)

                         return lineCount - 1;
                     else
                         return lineCount;
                 }
 
                 lineCount ++;
                         return lineCount - 1;
                     else
                         return lineCount;
                 }
 
                 lineCount ++;

-                
+

                 node2 = node2->GetNext();
             }
             // If we didn't find it in the lines, it must be
                 node2 = node2->GetNext();
             }
             // If we didn't find it in the lines, it must be


@@ -1170,14 +1358,14 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long l
             while (node2)
             {
                 wxRichTextLine* line = node2->GetData();
             while (node2)
             {
                 wxRichTextLine* line = node2->GetData();

-                
+

                 if (lineCount == lineNumber)
                     return line;
 
                 lineCount ++;
                 if (lineCount == lineNumber)
                     return line;
 
                 lineCount ++;

-                
+

                 node2 = node2->GetNext();
                 node2 = node2->GetNext();

-            }          
+            }

         }
         else
             lineCount += child->GetLines().GetCount();
         }
         else
             lineCount += child->GetLines().GetCount();


@@ -1193,14 +1381,14 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long l
 bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();

-    
+

     while (node)
     {
         wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (obj != NULL);
 
         wxRichTextObjectList::compatibility_iterator next = node->GetNext();
     while (node)
     {
         wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (obj != NULL);
 
         wxRichTextObjectList::compatibility_iterator next = node->GetNext();

-        
+

         // Delete the range in each paragraph
 
         if (!obj->GetRange().IsOutside(range))
         // Delete the range in each paragraph
 
         if (!obj->GetRange().IsOutside(range))


@@ -1249,7 +1437,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
                             }
 
                             wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
                             }
 
                             wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();

-                            delete node1;
+                            nextParagraph->GetChildren().Erase(node1);

 
                             node1 = next1;
                         }
 
                             node1 = next1;
                         }


@@ -1258,14 +1446,14 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
                         RemoveChild(nextParagraph, true);
 
                     }
                         RemoveChild(nextParagraph, true);
 
                     }

-                }                
+                }

 
             }
         }
 
             }
         }

-        
+

         node = next;
     }
         node = next;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1280,15 +1468,18 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {

-            if (lineCount > 0)
-                text += wxT("\n");
+//            if (lineCount > 0)
+//                text += wxT("\n");

             wxRichTextRange childRange = range;
             childRange.LimitTo(child->GetRange());
             wxRichTextRange childRange = range;
             childRange.LimitTo(child->GetRange());

-            
+

             wxString childText = child->GetTextForRange(childRange);
             wxString childText = child->GetTextForRange(childRange);

-            
+

             text += childText;
 
             text += childText;
 

+            if (childRange.GetEnd() == child->GetRange().GetEnd())
+                text += wxT("\n");
+

             lineCount ++;
         }
         node = node->GetNext();
             lineCount ++;
         }
         node = node->GetNext();


@@ -1306,7 +1497,7 @@ wxString wxRichTextParagraphLayoutBox::GetText() const
 /// Get the paragraph by number
 wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtLine(long paragraphNumber) const
 {
 /// Get the paragraph by number
 wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtLine(long paragraphNumber) const
 {

-    if ((size_t) paragraphNumber <= GetChildCount())
+    if ((size_t) paragraphNumber >= GetChildCount())

         return NULL;
 
     return (wxRichTextParagraph*) GetChild((size_t) paragraphNumber);
         return NULL;
 
     return (wxRichTextParagraph*) GetChild((size_t) paragraphNumber);


@@ -1378,13 +1569,13 @@ wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long pos
     if (para)
     {
         wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();
     if (para)
     {
         wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();

-        
+

         while (node)
         {
             wxRichTextObject* child = node->GetData();
             if (child->GetRange().Contains(position))
                 return child;
         while (node)
         {
             wxRichTextObject* child = node->GetData();
             if (child->GetRange().Contains(position))
                 return child;

-            
+

             node = node->GetNext();
         }
         if (position == para->GetRange().GetEnd() && para->GetChildCount() > 0)
             node = node->GetNext();
         }
         if (position == para->GetRange().GetEnd() && para->GetChildCount() > 0)


@@ -1394,7 +1585,7 @@ wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long pos
 }
 
 /// Set character or paragraph text attributes: apply character styles only to immediate text nodes
 }
 
 /// Set character or paragraph text attributes: apply character styles only to immediate text nodes

-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, bool withUndo)
+bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)

 {
     bool characterStyle = false;
     bool paragraphStyle = false;
 {
     bool characterStyle = false;
     bool paragraphStyle = false;


@@ -1404,13 +1595,22 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     if (style.IsParagraphStyle())
         paragraphStyle = true;
 
     if (style.IsParagraphStyle())
         paragraphStyle = true;
 

+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+    bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
+    bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0);
+
+    // Limit the attributes to be set to the content to only character attributes.
+    wxRichTextAttr characterAttributes(style);
+    characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
+

     // If we are associated with a control, make undoable; otherwise, apply immediately
     // to the data.
 
     bool haveControl = (GetRichTextCtrl() != NULL);
 
     wxRichTextAction* action = NULL;
     // If we are associated with a control, make undoable; otherwise, apply immediately
     // to the data.
 
     bool haveControl = (GetRichTextCtrl() != NULL);
 
     wxRichTextAction* action = NULL;

-    
+

     if (haveControl && withUndo)
     {
         action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
     if (haveControl && withUndo)
     {
         action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());


@@ -1434,8 +1634,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
             {
                 // We'll be using a copy of the paragraph to make style changes,
                 // not updating the buffer directly.
             {
                 // We'll be using a copy of the paragraph to make style changes,
                 // not updating the buffer directly.

-                wxRichTextParagraph* newPara = NULL;
-                
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+

                 if (haveControl && withUndo)
                 {
                     newPara = new wxRichTextParagraph(*para);
                 if (haveControl && withUndo)
                 {
                     newPara = new wxRichTextParagraph(*para);


@@ -1447,31 +1647,56 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 else
                     newPara = para;
 
                 else
                     newPara = para;
 

-                if (paragraphStyle)
-                    wxRichTextApplyStyle(newPara->GetAttributes(), style);
+                if (paragraphStyle && !charactersOnly)
+                {
+                    if (applyMinimal)
+                    {
+                        // Only apply attributes that will make a difference to the combined
+                        // style as seen on the display
+                        wxRichTextAttr combinedAttr(para->GetCombinedAttributes());
+                        wxRichTextApplyStyle(newPara->GetAttributes(), style, & combinedAttr);
+                    }
+                    else
+                        wxRichTextApplyStyle(newPara->GetAttributes(), style);
+                }
+
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+                // If applying paragraph styles dynamically, don't change the text objects' attributes
+                // since they will computed as needed. Only apply the character styling if it's _only_
+                // character styling. This policy is subject to change and might be put under user control.
+
+                // Hm. we might well be applying a mix of paragraph and character styles, in which
+                // case we _do_ want to apply character styles regardless of what para styles are set.
+                // But if we're applying a paragraph style, which has some character attributes, but
+                // we only want the paragraphs to hold this character style, then we _don't_ want to
+                // apply the character style. So we need to be able to choose.

 
 

+                // if (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
+                if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
+#else

                 if (characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
                 if (characterStyle && range.GetStart() != newPara->GetRange().GetEnd())

+#endif

                 {
                     wxRichTextRange childRange(range);
                     childRange.LimitTo(newPara->GetRange());
                 {
                     wxRichTextRange childRange(range);
                     childRange.LimitTo(newPara->GetRange());

-                    
+

                     // Find the starting position and if necessary split it so
                     // we can start applying a different style.
                     // TODO: check that the style actually changes or is different
                     // from style outside of range
                     // Find the starting position and if necessary split it so
                     // we can start applying a different style.
                     // TODO: check that the style actually changes or is different
                     // from style outside of range

-                    wxRichTextObject* firstObject = NULL;
-                    wxRichTextObject* lastObject = NULL;
-                    
+                    wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL);
+                    wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL);
+

                     if (childRange.GetStart() == newPara->GetRange().GetStart())
                         firstObject = newPara->GetChildren().GetFirst()->GetData();
                     else
                         firstObject = newPara->SplitAt(range.GetStart());
                     if (childRange.GetStart() == newPara->GetRange().GetStart())
                         firstObject = newPara->GetChildren().GetFirst()->GetData();
                     else
                         firstObject = newPara->SplitAt(range.GetStart());

-                    
+

                     // Increment by 1 because we're apply the style one _after_ the split point
                     long splitPoint = childRange.GetEnd();
                     if (splitPoint != newPara->GetRange().GetEnd())
                         splitPoint ++;
                     // Increment by 1 because we're apply the style one _after_ the split point
                     long splitPoint = childRange.GetEnd();
                     if (splitPoint != newPara->GetRange().GetEnd())
                         splitPoint ++;

-                    
+

                     // Find last object
                     if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1))
                         lastObject = newPara->GetChildren().GetLast()->GetData();
                     // Find last object
                     if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1))
                         lastObject = newPara->GetChildren().GetLast()->GetData();


@@ -1479,29 +1704,38 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                         // lastObject is set as a side-effect of splitting. It's
                         // returned as the object before the new object.
                         (void) newPara->SplitAt(splitPoint, & lastObject);
                         // lastObject is set as a side-effect of splitting. It's
                         // returned as the object before the new object.
                         (void) newPara->SplitAt(splitPoint, & lastObject);

-                    
+

                     wxASSERT(firstObject != NULL);
                     wxASSERT(lastObject != NULL);
                     wxASSERT(firstObject != NULL);
                     wxASSERT(lastObject != NULL);

-                    
+

                     if (!firstObject || !lastObject)
                         continue;
                     if (!firstObject || !lastObject)
                         continue;

-                    
+

                     wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
                     wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
                     wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
                     wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);

-                    
-                    wxASSERT(firstNode != NULL);
-                    wxASSERT(lastNode != NULL);
-                    
+
+                    wxASSERT(firstNode);
+                    wxASSERT(lastNode);
+

                     wxRichTextObjectList::compatibility_iterator node2 = firstNode;
                     wxRichTextObjectList::compatibility_iterator node2 = firstNode;

-                    
+

                     while (node2)
                     {
                         wxRichTextObject* child = node2->GetData();
                     while (node2)
                     {
                         wxRichTextObject* child = node2->GetData();

-                        
-                        wxRichTextApplyStyle(child->GetAttributes(), style);
+
+                        if (applyMinimal)
+                        {
+                            // Only apply attributes that will make a difference to the combined
+                            // style as seen on the display
+                            wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes()));
+                            wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr);
+                        }
+                        else
+                            wxRichTextApplyStyle(child->GetAttributes(), characterAttributes);
+

                         if (node2 == lastNode)
                             break;
                         if (node2 == lastNode)
                             break;

-                        
+

                         node2 = node2->GetNext();
                     }
                 }
                         node2 = node2->GetNext();
                     }
                 }


@@ -1519,88 +1753,593 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
 }
 
 /// Set text attributes
 }
 
 /// Set text attributes

-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, bool withUndo)
+bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags)

 {
     wxRichTextAttr richStyle = style;
 {
     wxRichTextAttr richStyle = style;

-    return SetStyle(range, richStyle, withUndo);
+    return SetStyle(range, richStyle, flags);

 }
 
 /// Get the text attributes for this position.
 }
 
 /// Get the text attributes for this position.

-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const
+bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style)

 {
 {

-    wxRichTextObject* obj = NULL;
-    if (style.IsParagraphStyle())
-        obj = GetParagraphAtPosition(position);
-    else
-        obj = GetLeafObjectAtPosition(position);
-    if (obj)
-    {
-        style = obj->GetAttributes();
-        return true;
-    }
-    else
-        return false;
+    return DoGetStyle(position, style, true);

 }
 
 /// Get the text attributes for this position.
 }
 
 /// Get the text attributes for this position.

-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const
+bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)

 {
 {

-    wxRichTextObject* obj = NULL;
-    if (style.IsParagraphStyle())
-        obj = GetParagraphAtPosition(position);
-    else
-        obj = GetLeafObjectAtPosition(position);
-    if (obj)
+    wxTextAttrEx textAttrEx(style);
+    if (GetStyle(position, textAttrEx))

     {
     {

-        style = obj->GetAttributes();
+        style = textAttrEx;

         return true;
     }
     else
         return false;
 }
 
         return true;
     }
     else
         return false;
 }
 

-/// Set default style
-bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style)
+/// Get the content (uncombined) attributes for this position.
+bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style)

 {
 {

-    m_defaultAttributes = style;
+    return DoGetStyle(position, style, false);
+}

 
 

-    return true;
+bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
+{
+    wxTextAttrEx textAttrEx(style);
+    if (GetUncombinedStyle(position, textAttrEx))
+    {
+        style = textAttrEx;
+        return true;
+    }
+    else
+        return false;

 }
 
 }
 

-/// Test if this whole range has character attributes of the specified kind. If any
-/// of the attributes are different within the range, the test fails. You
-/// can use this to implement, for example, bold button updating. style must have
-/// flags indicating which attributes are of interest.
-bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
+/// context attributes.
+bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles)

 {
 {

-    int foundCount = 0;
-    int matchingCount = 0;
+    wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);

 
 

-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    if (style.IsParagraphStyle())

     {
     {

-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
-
-        if (para)
+        obj = GetParagraphAtPosition(position);
+        if (obj)

         {
         {

-            // Stop searching if we're beyond the range of interest
-            if (para->GetRange().GetStart() > range.GetEnd())
-                return foundCount == matchingCount;
-
-            if (!para->GetRange().IsOutside(range))
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+            if (combineStyles)

             {
             {

-                wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
-
-                while (node2)
-                {
-                    wxRichTextObject* child = node2->GetData();
-                    if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
-                    {
-                        foundCount ++;
-                        if (wxTextAttrEqPartial(child->GetAttributes(), style, style.GetFlags()))
-                            matchingCount ++;
-                    }
+                // Start with the base style
+                style = GetAttributes();
+
+                // Apply the paragraph style
+                wxRichTextApplyStyle(style, obj->GetAttributes());
+            }
+            else
+                style = obj->GetAttributes();
+#else
+            style = obj->GetAttributes();
+#endif
+            return true;
+        }
+    }
+    else
+    {
+        obj = GetLeafObjectAtPosition(position);
+        if (obj)
+        {
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+            if (combineStyles)
+            {
+                wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);
+                style = para ? para->GetCombinedAttributes(obj->GetAttributes()) : obj->GetAttributes();
+            }
+            else
+                style = obj->GetAttributes();
+#else
+            style = obj->GetAttributes();
+#endif
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool wxHasStyle(long flags, long style)
+{
+    return (flags & style) != 0;
+}
+
+/// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of
+/// content.
+bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, const wxTextAttrEx& style, long& multipleStyleAttributes)
+{
+    if (style.HasFont())
+    {
+        if (style.HasSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
+        {
+            if (currentStyle.GetFont().Ok() && currentStyle.HasSize())
+            {
+                if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize())
+                {
+                    // Clash of style - mark as such
+                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE;
+                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_SIZE);
+                }
+            }
+            else
+            {
+                if (!currentStyle.GetFont().Ok())
+                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
+                wxFont font(currentStyle.GetFont());
+                font.SetPointSize(style.GetFont().GetPointSize());
+
+                wxSetFontPreservingStyles(currentStyle, font);
+                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
+            }
+        }
+
+        if (style.HasItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))
+        {
+            if (currentStyle.GetFont().Ok() && currentStyle.HasItalic())
+            {
+                if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle())
+                {
+                    // Clash of style - mark as such
+                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC;
+                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_ITALIC);
+                }
+            }
+            else
+            {
+                if (!currentStyle.GetFont().Ok())
+                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
+                wxFont font(currentStyle.GetFont());
+                font.SetStyle(style.GetFont().GetStyle());
+                wxSetFontPreservingStyles(currentStyle, font);
+                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
+            }
+        }
+
+        if (style.HasWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
+        {
+            if (currentStyle.GetFont().Ok() && currentStyle.HasWeight())
+            {
+                if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight())
+                {
+                    // Clash of style - mark as such
+                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT;
+                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT);
+                }
+            }
+            else
+            {
+                if (!currentStyle.GetFont().Ok())
+                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
+                wxFont font(currentStyle.GetFont());
+                font.SetWeight(style.GetFont().GetWeight());
+                wxSetFontPreservingStyles(currentStyle, font);
+                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
+            }
+        }
+
+        if (style.HasFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))
+        {
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFaceName())
+            {
+                wxString faceName1(currentStyle.GetFont().GetFaceName());
+                wxString faceName2(style.GetFont().GetFaceName());
+
+                if (faceName1 != faceName2)
+                {
+                    // Clash of style - mark as such
+                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_FACE;
+                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_FACE);
+                }
+            }
+            else
+            {
+                if (!currentStyle.GetFont().Ok())
+                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
+                wxFont font(currentStyle.GetFont());
+                font.SetFaceName(style.GetFont().GetFaceName());
+                wxSetFontPreservingStyles(currentStyle, font);
+                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
+            }
+        }
+
+        if (style.HasUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))
+        {
+            if (currentStyle.GetFont().Ok() && currentStyle.HasUnderlined())
+            {
+                if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined())
+                {
+                    // Clash of style - mark as such
+                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE;
+                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_UNDERLINE);
+                }
+            }
+            else
+            {
+                if (!currentStyle.GetFont().Ok())
+                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
+                wxFont font(currentStyle.GetFont());
+                font.SetUnderlined(style.GetFont().GetUnderlined());
+                wxSetFontPreservingStyles(currentStyle, font);
+                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
+            }
+        }
+    }
+
+    if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR))
+    {
+        if (currentStyle.HasTextColour())
+        {
+            if (currentStyle.GetTextColour() != style.GetTextColour())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_TEXT_COLOUR;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TEXT_COLOUR);
+            }
+        }
+        else
+            currentStyle.SetTextColour(style.GetTextColour());
+    }
+
+    if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR))
+    {
+        if (currentStyle.HasBackgroundColour())
+        {
+            if (currentStyle.GetBackgroundColour() != style.GetBackgroundColour())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BACKGROUND_COLOUR;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
+            }
+        }
+        else
+            currentStyle.SetBackgroundColour(style.GetBackgroundColour());
+    }
+
+    if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_ALIGNMENT))
+    {
+        if (currentStyle.HasAlignment())
+        {
+            if (currentStyle.GetAlignment() != style.GetAlignment())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_ALIGNMENT;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_ALIGNMENT);
+            }
+        }
+        else
+            currentStyle.SetAlignment(style.GetAlignment());
+    }
+
+    if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TABS))
+    {
+        if (currentStyle.HasTabs())
+        {
+            if (!wxRichTextTabsEq(currentStyle.GetTabs(), style.GetTabs()))
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_TABS;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TABS);
+            }
+        }
+        else
+            currentStyle.SetTabs(style.GetTabs());
+    }
+
+    if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LEFT_INDENT))
+    {
+        if (currentStyle.HasLeftIndent())
+        {
+            if (currentStyle.GetLeftIndent() != style.GetLeftIndent() || currentStyle.GetLeftSubIndent() != style.GetLeftSubIndent())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_LEFT_INDENT;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT);
+            }
+        }
+        else
+            currentStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    }
+
+    if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT))
+    {
+        if (currentStyle.HasRightIndent())
+        {
+            if (currentStyle.GetRightIndent() != style.GetRightIndent())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_RIGHT_INDENT;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_RIGHT_INDENT);
+            }
+        }
+        else
+            currentStyle.SetRightIndent(style.GetRightIndent());
+    }
+
+    if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER))
+    {
+        if (currentStyle.HasParagraphSpacingAfter())
+        {
+            if (currentStyle.HasParagraphSpacingAfter() != style.HasParagraphSpacingAfter())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_AFTER);
+            }
+        }
+        else
+            currentStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    }
+
+    if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE))
+    {
+        if (currentStyle.HasParagraphSpacingBefore())
+        {
+            if (currentStyle.HasParagraphSpacingBefore() != style.HasParagraphSpacingBefore())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARA_SPACING_BEFORE);
+            }
+        }
+        else
+            currentStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    }
+
+    if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LINE_SPACING))
+    {
+        if (currentStyle.HasLineSpacing())
+        {
+            if (currentStyle.HasLineSpacing() != style.HasLineSpacing())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LINE_SPACING);
+            }
+        }
+        else
+            currentStyle.SetLineSpacing(style.GetLineSpacing());
+    }
+
+    if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
+    {
+        if (currentStyle.HasCharacterStyleName())
+        {
+            if (currentStyle.HasCharacterStyleName() != style.HasCharacterStyleName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+    }
+
+    if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
+    {
+        if (currentStyle.HasParagraphStyleName())
+        {
+            if (currentStyle.HasParagraphStyleName() != style.HasParagraphStyleName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_PARAGRAPH_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    }
+
+    if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME))
+    {
+        if (currentStyle.HasListStyleName())
+        {
+            if (currentStyle.HasListStyleName() != style.HasListStyleName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LIST_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetListStyleName(style.GetListStyleName());
+    }
+
+    if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE))
+    {
+        if (currentStyle.HasBulletStyle())
+        {
+            if (currentStyle.HasBulletStyle() != style.HasBulletStyle())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_STYLE);
+            }
+        }
+        else
+            currentStyle.SetBulletStyle(style.GetBulletStyle());
+    }
+
+    if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER))
+    {
+        if (currentStyle.HasBulletNumber())
+        {
+            if (currentStyle.HasBulletNumber() != style.HasBulletNumber())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NUMBER);
+            }
+        }
+        else
+            currentStyle.SetBulletNumber(style.GetBulletNumber());
+    }
+
+    if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT))
+    {
+        if (currentStyle.HasBulletText())
+        {
+            if (currentStyle.HasBulletText() != style.HasBulletText())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT);
+            }
+        }
+        else
+        {
+            currentStyle.SetBulletText(style.GetBulletText());
+            currentStyle.SetBulletFont(style.GetBulletFont());
+        }
+    }
+
+    if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME))
+    {
+        if (currentStyle.HasBulletName())
+        {
+            if (currentStyle.HasBulletName() != style.HasBulletName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME);
+            }
+        }
+        else
+        {
+            currentStyle.SetBulletName(style.GetBulletName());
+        }
+    }
+
+    if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL))
+    {
+        if (currentStyle.HasURL())
+        {
+            if (currentStyle.HasURL() != style.HasURL())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_URL;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL);
+            }
+        }
+        else
+        {
+            currentStyle.SetURL(style.GetURL());
+        }
+    }
+
+    return true;
+}
+
+/// Get the combined style for a range - if any attribute is different within the range,
+/// that attribute is not present within the flags.
+/// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself
+/// nested.
+bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttrEx& style)
+{
+    style = wxTextAttrEx();
+
+    // The attributes that aren't valid because of multiple styles within the range
+    long multipleStyleAttributes = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData();
+        if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
+        {
+            if (para->GetChildren().GetCount() == 0)
+            {
+                wxTextAttrEx paraStyle = para->GetCombinedAttributes();
+
+                CollectStyle(style, paraStyle, multipleStyleAttributes);
+            }
+            else
+            {
+                wxRichTextRange paraRange(para->GetRange());
+                paraRange.LimitTo(range);
+
+                // First collect paragraph attributes only
+                wxTextAttrEx paraStyle = para->GetCombinedAttributes();
+                paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
+                CollectStyle(style, paraStyle, multipleStyleAttributes);
+
+                wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
+
+                while (childNode)
+                {
+                    wxRichTextObject* child = childNode->GetData();
+                    if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
+                    {
+                        wxTextAttrEx childStyle = para->GetCombinedAttributes(child->GetAttributes());
+
+                        // Now collect character attributes only
+                        childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
+
+                        CollectStyle(style, childStyle, multipleStyleAttributes);
+                    }
+
+                    childNode = childNode->GetNext();
+                }
+            }
+        }
+        node = node->GetNext();
+    }
+    return true;
+}
+
+/// Set default style
+bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style)
+{
+    m_defaultAttributes = style;
+    return true;
+}
+
+/// Test if this whole range has character attributes of the specified kind. If any
+/// of the attributes are different within the range, the test fails. You
+/// can use this to implement, for example, bold button updating. style must have
+/// flags indicating which attributes are of interest.
+bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+{
+    int foundCount = 0;
+    int matchingCount = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                return foundCount == matchingCount;
+
+            if (!para->GetRange().IsOutside(range))
+            {
+                wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
+
+                while (node2)
+                {
+                    wxRichTextObject* child = node2->GetData();
+                    if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
+                    {
+                        foundCount ++;
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+                        wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes());
+#else
+                        const wxTextAttrEx& textAttr = child->GetAttributes();
+#endif
+                        if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
+                            matchingCount ++;
+                    }

 
                     node2 = node2->GetNext();
                 }
 
                     node2 = node2->GetNext();
                 }


@@ -1610,23 +2349,388 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return foundCount == matchingCount;
+    return foundCount == matchingCount;
+}
+
+bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
+{
+    wxRichTextAttr richStyle = style;
+    return HasCharacterAttributes(range, richStyle);
+}
+
+/// Test if this whole range has paragraph attributes of the specified kind. If any
+/// of the attributes are different within the range, the test fails. You
+/// can use this to implement, for example, centering button updating. style must have
+/// flags indicating which attributes are of interest.
+bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+{
+    int foundCount = 0;
+    int matchingCount = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                return foundCount == matchingCount;
+
+            if (!para->GetRange().IsOutside(range))
+            {
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+                wxTextAttrEx textAttr = GetAttributes();
+                // Apply the paragraph style
+                wxRichTextApplyStyle(textAttr, para->GetAttributes());
+
+#else
+                const wxTextAttrEx& textAttr = para->GetAttributes();
+#endif
+                foundCount ++;
+                if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
+                    matchingCount ++;
+            }
+        }
+
+        node = node->GetNext();
+    }
+    return foundCount == matchingCount;
+}
+
+bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
+{
+    wxRichTextAttr richStyle = style;
+    return HasParagraphAttributes(range, richStyle);
+}
+
+void wxRichTextParagraphLayoutBox::Clear()
+{
+    DeleteChildren();
+}
+
+void wxRichTextParagraphLayoutBox::Reset()
+{
+    Clear();
+
+    AddParagraph(wxEmptyString);
+    
+    Invalidate(wxRICHTEXT_ALL);
+}
+
+/// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange)
+{
+    SetDirty(true);
+
+    if (invalidRange == wxRICHTEXT_ALL)
+    {
+        m_invalidRange = wxRICHTEXT_ALL;
+        return;
+    }
+
+    // Already invalidating everything
+    if (m_invalidRange == wxRICHTEXT_ALL)
+        return;
+
+    if ((invalidRange.GetStart() < m_invalidRange.GetStart()) || m_invalidRange.GetStart() == -1)
+        m_invalidRange.SetStart(invalidRange.GetStart());
+    if (invalidRange.GetEnd() > m_invalidRange.GetEnd())
+        m_invalidRange.SetEnd(invalidRange.GetEnd());
+}
+
+/// Get invalid range, rounding to entire paragraphs if argument is true.
+wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const
+{
+    if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE)
+        return m_invalidRange;
+
+    wxRichTextRange range = m_invalidRange;
+
+    if (wholeParagraphs)
+    {
+        wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
+        wxRichTextParagraph* para2 = GetParagraphAtPosition(range.GetEnd());
+        if (para1)
+            range.SetStart(para1->GetRange().GetStart());
+        if (para2)
+            range.SetEnd(para2->GetRange().GetEnd());
+    }
+    return range;
+}
+
+/// Apply the style sheet to the buffer, for example if the styles have changed.
+bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
+{
+    wxASSERT(styleSheet != NULL);
+    if (!styleSheet)
+        return false;
+
+    int foundCount = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para)
+        {
+            // Combine paragraph and list styles. If there is a list style in the original attributes,
+            // the current indentation overrides anything else and is used to find the item indentation.
+            // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have,
+            // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list
+            // exception as above).
+            // Problem: when changing from one list style to another, there's a danger that the level info will get lost.
+            // So when changing a list style interactively, could retrieve level based on current style, then
+            // set appropriate indent and apply new style.
+
+            if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                int currentIndent = para->GetAttributes().GetLeftIndent();
+
+                wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+                if (paraDef && !listDef)
+                {
+                    para->GetAttributes() = paraDef->GetStyle();
+                    foundCount ++;
+                }
+                else if (listDef && !paraDef)
+                {
+                    // Set overall style defined for the list style definition
+                    para->GetAttributes() = listDef->GetStyle();
+
+                    // Apply the style for this level
+                    wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+                    foundCount ++;
+                }
+                else if (listDef && paraDef)
+                {
+                    // Combines overall list style, style for level, and paragraph style
+                    para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyle());
+                    foundCount ++;
+                }
+            }
+            else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                int currentIndent = para->GetAttributes().GetLeftIndent();
+
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+
+                // Overall list definition style
+                para->GetAttributes() = listDef->GetStyle();
+
+                // Style for this level
+                wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+
+                foundCount ++;
+            }
+            else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+                if (def)
+                {
+                    para->GetAttributes() = def->GetStyle();
+                    foundCount ++;
+                }
+            }
+        }
+
+        node = node->GetNext();
+    }
+    return foundCount != 0;
+}
+
+/// Set list style
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+    bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
+    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
+
+    // Current number, if numbering
+    int n = startFrom;
+
+    wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
+
+    bool haveControl = (GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+    }
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para && para->GetChildCount() > 0)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
+
+            if (!para->GetRange().IsOutside(range))
+            {
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
+
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
+
+                if (def)
+                {
+                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
+                    int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent);
+
+                    // How is numbering going to work?
+                    // If we are renumbering, or numbering for the first time, we need to keep
+                    // track of the number for each level. But we might be simply applying a different
+                    // list style.
+                    // In Word, applying a style to several paragraphs, even if at different levels,
+                    // reverts the level back to the same one. So we could do the same here.
+                    // Renumbering will need to be done when we promote/demote a paragraph.
+
+                    // Apply the overall list style, and item style for this level
+                    wxTextAttrEx listStyle(def->GetCombinedStyleForLevel(thisLevel));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+
+                    // Now we need to do numbering
+                    if (renumber)
+                    {
+                        newPara->GetAttributes().SetBulletNumber(n);
+                    }
+
+                    n ++;
+                }
+                else if (!newPara->GetAttributes().GetListStyleName().IsEmpty())
+                {
+                    // if def is NULL, remove list style, applying any associated paragraph style
+                    // to restore the attributes
+
+                    newPara->GetAttributes().SetListStyleName(wxEmptyString);
+                    newPara->GetAttributes().SetLeftIndent(0, 0);
+                    newPara->GetAttributes().SetBulletText(wxEmptyString);
+
+                    // Eliminate the main list-related attributes
+                    newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_TEXT & wxTEXT_ATTR_LIST_STYLE_NAME);
+
+                    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+                    if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty())
+                    {
+                        wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName());
+                        if (def)
+                        {
+                            newPara->GetAttributes() = def->GetStyle();
+                        }
+                    }
+                }
+            }
+        }
+
+        node = node->GetNext();
+    }
+
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+
+    return true;

 }
 
 }
 

-bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)

 {
 {

-    wxRichTextAttr richStyle = style;
-    return HasCharacterAttributes(range, richStyle);
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName);
+        if (def)
+            return SetListStyle(range, def, flags, startFrom, specifiedLevel);
+    }
+    return false;

 }
 
 }
 

-/// Test if this whole range has paragraph attributes of the specified kind. If any
-/// of the attributes are different within the range, the test fails. You
-/// can use this to implement, for example, centering button updating. style must have
-/// flags indicating which attributes are of interest.
-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+/// Clear list for given range
+bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags)

 {
 {

-    int foundCount = 0;
-    int matchingCount = 0;
+    return SetListStyle(range, NULL, flags);
+}
+
+/// Number/renumber any list elements in the given range
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    return DoNumberList(range, range, 0, def, flags, startFrom, specifiedLevel);
+}
+
+/// Number/renumber any list elements in the given range. Also do promotion or demotion of items, if specified
+bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy,
+                                                wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+#ifdef __WXDEBUG__
+    bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
+#endif
+
+    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
+
+    // Max number of levels
+    const int maxLevels = 10;
+
+    // The level we're looking at now
+    int currentLevel = -1;
+
+    // The item number for each level
+    int levels[maxLevels];
+    int i;
+
+    // Reset all numbering
+    for (i = 0; i < maxLevels; i++)
+    {
+        if (startFrom != -1)
+            levels[i] = startFrom-1;
+        else if (renumber) // start again
+            levels[i] = 0;
+        else
+            levels[i] = -1; // start from the number we found, if any
+    }
+
+    wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
+
+    bool haveControl = (GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+    }

 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -1634,63 +2738,220 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange&
         wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (para != NULL);
 
         wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         wxASSERT (para != NULL);
 

-        if (para)
+        if (para && para->GetChildCount() > 0)

         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())
         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())

-                return foundCount == matchingCount;
+                break;

 
             if (!para->GetRange().IsOutside(range))
             {
 
             if (!para->GetRange().IsOutside(range))
             {

-                foundCount ++;
-                if (wxTextAttrEqPartial(para->GetAttributes(), style, style.GetFlags()))
-                    matchingCount ++;
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
+
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
+
+                wxRichTextListStyleDefinition* defToUse = def;
+                if (!defToUse)
+                {
+                    wxRichTextStyleSheet* sheet = GetStyleSheet();
+
+                    if (sheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
+                        defToUse = sheet->FindListStyle(newPara->GetAttributes().GetListStyleName());
+                }
+
+                if (defToUse)
+                {
+                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
+                    int thisLevel = defToUse->FindLevelForIndent(thisIndent);
+
+                    // If we've specified a level to apply to all, change the level.
+                    if (specifiedLevel != -1)
+                        thisLevel = specifiedLevel;
+
+                    // Do promotion if specified
+                    if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange))
+                    {
+                        thisLevel = thisLevel - promoteBy;
+                        if (thisLevel < 0)
+                            thisLevel = 0;
+                        if (thisLevel > 9)
+                            thisLevel = 9;
+                    }
+
+                    // Apply the overall list style, and item style for this level
+                    wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+
+                    // OK, we've (re)applied the style, now let's get the numbering right.
+
+                    if (currentLevel == -1)
+                        currentLevel = thisLevel;
+
+                    // Same level as before, do nothing except increment level's number afterwards
+                    if (currentLevel == thisLevel)
+                    {
+                    }
+                    // A deeper level: start renumbering all levels after current level
+                    else if (thisLevel > currentLevel)
+                    {
+                        for (i = currentLevel+1; i <= thisLevel; i++)
+                        {
+                            levels[i] = 0;
+                        }
+                        currentLevel = thisLevel;
+                    }
+                    else if (thisLevel < currentLevel)
+                    {
+                        currentLevel = thisLevel;
+                    }
+
+                    // Use the current numbering if -1 and we have a bullet number already
+                    if (levels[currentLevel] == -1)
+                    {
+                        if (newPara->GetAttributes().HasBulletNumber())
+                            levels[currentLevel] = newPara->GetAttributes().GetBulletNumber();
+                        else
+                            levels[currentLevel] = 1;
+                    }
+                    else
+                    {
+                        levels[currentLevel] ++;
+                    }
+
+                    newPara->GetAttributes().SetBulletNumber(levels[currentLevel]);
+
+                    // Create the bullet text if an outline list
+                    if (listStyle.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
+                    {
+                        wxString text;
+                        for (i = 0; i <= currentLevel; i++)
+                        {
+                            if (!text.IsEmpty())
+                                text += wxT(".");
+                            text += wxString::Format(wxT("%d"), levels[i]);
+                        }
+                        newPara->GetAttributes().SetBulletText(text);
+                    }
+                }

             }
         }
 
         node = node->GetNext();
     }
             }
         }
 
         node = node->GetNext();
     }

-    return foundCount == matchingCount;
-}

 
 

-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
-{
-    wxRichTextAttr richStyle = style;
-    return HasParagraphAttributes(range, richStyle);
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+
+    return true;

 }
 
 }
 

-void wxRichTextParagraphLayoutBox::Clear()
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)

 {
 {

-    DeleteChildren();
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = GetStyleSheet()->FindListStyle(defName);
+        return NumberList(range, def, flags, startFrom, specifiedLevel);
+    }
+    return false;

 }
 
 }
 

-void wxRichTextParagraphLayoutBox::Reset()
+/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1
+bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel)

 {
 {

-    Clear();
+    // TODO
+    // One strategy is to first work out the range within which renumbering must occur. Then could pass these two ranges
+    // to NumberList with a flag indicating promotion is required within one of the ranges.
+    // Find first and last paragraphs in range. Then for first, calculate new indentation and look back until we find
+    // a paragraph that either has no list style, or has one that is different or whose indentation is less.
+    // We start renumbering from the para after that different para we found. We specify that the numbering of that
+    // list position will start from 1.
+    // Similarly, we look after the last para in the promote range for an indentation that is less (or no list style).
+    // We can end the renumbering at this point.

 
 

-    AddParagraph(wxT(""));
-}
-
-/*!
- * wxRichTextFragment class declaration
- * This is a lind of paragraph layout box used for storing
- * paragraphs for Undo/Redo, for example.
- */
+    // For now, only renumber within the promotion range.

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxRichTextFragment, wxRichTextParagraphLayoutBox)
+    return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel);
+}

 
 

-/// Initialise
-void wxRichTextFragment::Init()
+bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)

 {
 {

-    m_partialParagraph = false;
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = GetStyleSheet()->FindListStyle(defName);
+        return PromoteList(promoteBy, range, def, flags, specifiedLevel);
+    }
+    return false;

 }
 
 }
 

-/// Copy
-void wxRichTextFragment::Copy(const wxRichTextFragment& obj)
+/// Fills in the attributes for numbering a paragraph after previousParagraph. It also finds the
+/// position of the paragraph that it had to start looking from.
+bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const

 {
 {

-    wxRichTextParagraphLayoutBox::Copy(obj);
+    if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
+        return false;
+    
+    wxRichTextStyleSheet* sheet = GetStyleSheet();
+    if (sheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
+    {
+        wxRichTextListStyleDefinition* def = sheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
+        if (def)
+        {
+            // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
+            // int thisLevel = def->FindLevelForIndent(thisIndent);
+            
+            bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;

 
 

-    m_partialParagraph = obj.m_partialParagraph;
+            attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME));
+            if (previousParagraph->GetAttributes().HasBulletName())
+                attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
+            attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
+            attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());
+            
+            int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
+            attr.SetBulletNumber(nextNumber);
+            
+            if (isOutline)
+            {
+                wxString text = previousParagraph->GetAttributes().GetBulletText();
+                if (!text.IsEmpty())
+                {
+                    int pos = text.Find(wxT('.'), true);
+                    if (pos != wxNOT_FOUND)
+                    {
+                        text = text.Mid(0, text.Length() - pos - 1);
+                    }
+                    else
+                        text = wxEmptyString;
+                    if (!text.IsEmpty())
+                        text += wxT(".");
+                    text += wxString::Format(wxT("%d"), nextNumber);
+                    attr.SetBulletText(text);
+                }
+            }
+            
+            return true;
+        }
+        else
+            return false;
+    }
+    else
+        return false;

 }
 
 /*!
 }
 
 /*!


@@ -1700,24 +2961,22 @@ void wxRichTextFragment::Copy(const wxRichTextFragment& obj)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox)
 

+wxArrayInt wxRichTextParagraph::sm_defaultTabs;
+

 wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style):
     wxRichTextBox(parent)
 {
 wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style):
     wxRichTextBox(parent)
 {

-    if (parent && !style)
-        SetAttributes(parent->GetAttributes());

     if (style)
         SetAttributes(*style);
 }
 
     if (style)
         SetAttributes(*style);
 }
 

-wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
+wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* paraStyle, wxTextAttrEx* charStyle):

     wxRichTextBox(parent)
 {
     wxRichTextBox(parent)
 {

-    if (parent && !style)
-        SetAttributes(parent->GetAttributes());
-    if (style)
-        SetAttributes(*style);
+    if (paraStyle)
+        SetAttributes(*paraStyle);

 
 

-    AppendChild(new wxRichTextPlainText(text, this));
+    AppendChild(new wxRichTextPlainText(text, this, charStyle));

 }
 
 wxRichTextParagraph::~wxRichTextParagraph()
 }
 
 wxRichTextParagraph::~wxRichTextParagraph()


@@ -1726,70 +2985,78 @@ wxRichTextParagraph::~wxRichTextParagraph()
 }
 
 /// Draw the item
 }
 
 /// Draw the item

-bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
+bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)

 {
 {

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxTextAttrEx attr = GetCombinedAttributes();
+#else
+    const wxTextAttrEx& attr = GetAttributes();
+#endif
+

     // Draw the bullet, if any
     // Draw the bullet, if any

-    if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)

     {
     {

-        if (GetAttributes().GetLeftSubIndent() != 0)
+        if (attr.GetLeftSubIndent() != 0)

         {
         {

-            int spaceBeforePara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingBefore());
-            // int spaceAfterPara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingAfter());
-            int leftIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftIndent());
-            // int leftSubIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftSubIndent());
-            // int rightIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetRightIndent());
+            int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
+            int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
+
+            wxTextAttrEx bulletAttr(GetCombinedAttributes());
+
+            // Get line height from first line, if any
+            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
+
+            wxPoint linePos;
+            int lineHeight wxDUMMY_INITIALIZE(0);
+            if (line)
+            {
+                lineHeight = line->GetSize().y;
+                linePos = line->GetPosition() + GetPosition();
+            }
+            else
+            {
+                wxFont font;
+                if (bulletAttr.GetFont().Ok())
+                    font = bulletAttr.GetFont();
+                else
+                    font = (*wxNORMAL_FONT);
+
+                dc.SetFont(font);
+
+                lineHeight = dc.GetCharHeight();
+                linePos = GetPosition();
+                linePos.y += spaceBeforePara;
+            }

 
 

-            if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)
+            wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight);
+
+            if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)

             {
             {

-                // TODO
+                if (wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect);
+            }
+            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)                
+            {                
+                if (wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect);

             }
             else
             {
                 wxString bulletText = GetBulletText();
             }
             else
             {
                 wxString bulletText = GetBulletText();

-                if (!bulletText.IsEmpty())
-                {
-                    if (GetAttributes().GetFont().Ok())
-                        dc.SetFont(GetAttributes().GetFont());
-                    
-                    if (GetAttributes().GetTextColour().Ok())
-                        dc.SetTextForeground(GetAttributes().GetTextColour());
-                    
-                    dc.SetBackgroundMode(wxTRANSPARENT);
-                    
-                    // Get line height from first line, if any
-                    wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
-                    
-                    wxPoint linePos;
-                    int lineHeight = 0;
-                    if (line)
-                    {
-                        lineHeight = line->GetSize().y;
-                        linePos = line->GetPosition() + GetPosition();
-                    }
-                    else
-                    {
-                        lineHeight = dc.GetCharHeight();
-                        linePos = GetPosition();
-                        linePos.y += spaceBeforePara;
-                    }
-                    
-                    int charHeight = dc.GetCharHeight();
-                    
-                    int x = GetPosition().x + leftIndent;
-                    int y = linePos.y + (lineHeight - charHeight);
-                    
-                    dc.DrawText(bulletText, x, y);
-                }
+                
+                if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);

             }
         }
     }
             }
         }
     }

-    
+

     // Draw the range for each line, one object at a time.
 
     wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
     while (node)
     {
         wxRichTextLine* line = node->GetData();
     // Draw the range for each line, one object at a time.
 
     wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
     while (node)
     {
         wxRichTextLine* line = node->GetData();

+        wxRichTextRange lineRange = line->GetAbsoluteRange();

 
         int maxDescent = line->GetDescent();
 
 
         int maxDescent = line->GetDescent();
 


@@ -1803,15 +3070,16 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
         while (node2)
         {
             wxRichTextObject* child = node2->GetData();
         while (node2)
         {
             wxRichTextObject* child = node2->GetData();

-            if (!child->GetRange().IsOutside(line->GetRange()))
+            
+            if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))

             {
                 // Draw this part of the line at the correct position
                 wxRichTextRange objectRange(child->GetRange());
             {
                 // Draw this part of the line at the correct position
                 wxRichTextRange objectRange(child->GetRange());

-                objectRange.LimitTo(line->GetRange());
+                objectRange.LimitTo(lineRange);

 
                 wxSize objectSize;
                 int descent = 0;
 
                 wxSize objectSize;
                 int descent = 0;

-                child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED);
+                child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);

 
                 // Use the child object's width, but the whole line's height
                 wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
 
                 // Use the child object's width, but the whole line's height
                 wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));


@@ -1819,7 +3087,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
 
                 objectPosition.x += objectSize.x;
             }
 
                 objectPosition.x += objectSize.x;
             }

-            else if (child->GetRange().GetStart() > line->GetRange().GetEnd())
+            else if (child->GetRange().GetStart() > lineRange.GetEnd())

                 // Can break out of inner loop now since we've passed this line's range
                 break;
 
                 // Can break out of inner loop now since we've passed this line's range
                 break;
 


@@ -1827,7 +3095,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
         }
 
         node = node->GetNext();
         }
 
         node = node->GetNext();

-    }    
+    }

 
     return true;
 }
 
     return true;
 }


@@ -1835,29 +3103,35 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
 /// Lay the item out
 bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
 {
 /// Lay the item out
 bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
 {

-    ClearLines();
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxTextAttrEx attr = GetCombinedAttributes();
+#else
+    const wxTextAttrEx& attr = GetAttributes();
+#endif
+
+    // ClearLines();

 
     // Increase the size of the paragraph due to spacing
 
     // Increase the size of the paragraph due to spacing

-    int spaceBeforePara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingBefore());
-    int spaceAfterPara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingAfter());
-    int leftIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftIndent());
-    int leftSubIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetLeftSubIndent());
-    int rightIndent = ConvertTenthsMMToPixels(dc, GetAttributes().GetRightIndent());
+    int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
+    int spaceAfterPara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingAfter());
+    int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
+    int leftSubIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftSubIndent());
+    int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());

 
     int lineSpacing = 0;
 
     // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.
 
     int lineSpacing = 0;
 
     // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.

-    if (GetAttributes().GetLineSpacing() > 10 && GetAttributes().GetFont().Ok())
+    if (attr.GetLineSpacing() > 10 && attr.GetFont().Ok())

     {
     {

-        dc.SetFont(GetAttributes().GetFont());
-        lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * GetAttributes().GetLineSpacing())/10;
+        dc.SetFont(attr.GetFont());
+        lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10;

     }
 
     // Available space for text on each line differs.
     int availableTextSpaceFirstLine = rect.GetWidth() - leftIndent - rightIndent;
 
     // Bullets start the text at the same position as subsequent lines
     }
 
     // Available space for text on each line differs.
     int availableTextSpaceFirstLine = rect.GetWidth() - leftIndent - rightIndent;
 
     // Bullets start the text at the same position as subsequent lines

-    if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)

         availableTextSpaceFirstLine -= leftSubIndent;
 
     int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent;
         availableTextSpaceFirstLine -= leftSubIndent;
 
     int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent;


@@ -1868,12 +3142,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
 
     // If we have a bullet in this paragraph, the start position for the first line's text
     // is actually leftIndent + leftSubIndent.
 
     // If we have a bullet in this paragraph, the start position for the first line's text
     // is actually leftIndent + leftSubIndent.

-    if (GetAttributes().GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)

         startPositionFirstLine = startPositionSubsequentLines;
 
         startPositionFirstLine = startPositionSubsequentLines;
 

-    //bool restrictWidth = wxRichTextHasStyle(style, wxRICHTEXT_FIXED_WIDTH);
-    //bool restrictHeight = wxRichTextHasStyle(style, wxRICHTEXT_FIXED_HEIGHT);
-

     long lastEndPos = GetRange().GetStart()-1;
     long lastCompletedEndPos = lastEndPos;
 
     long lastEndPos = GetRange().GetStart()-1;
     long lastCompletedEndPos = lastEndPos;
 


@@ -1924,7 +3195,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
             childDescent = child->GetDescent();
         }
         else
             childDescent = child->GetDescent();
         }
         else

-            GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);
+            GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED,rect.GetPosition());

 
         if (childSize.x + currentWidth > availableSpaceForText)
         {
 
         if (childSize.x + currentWidth > availableSpaceForText)
         {


@@ -1943,7 +3214,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
                 wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd());
 
             // wxLogDebug(wxT("Split at %ld"), wrapPosition);
                 wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd());
 
             // wxLogDebug(wxT("Split at %ld"), wrapPosition);

-            
+

             // Let's find the actual size of the current line now
             wxSize actualSize;
             wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
             // Let's find the actual size of the current line now
             wxSize actualSize;
             wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);


@@ -1951,28 +3222,28 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
             currentWidth = actualSize.x;
             lineHeight = wxMax(lineHeight, actualSize.y);
             maxDescent = wxMax(childDescent, maxDescent);
             currentWidth = actualSize.x;
             lineHeight = wxMax(lineHeight, actualSize.y);
             maxDescent = wxMax(childDescent, maxDescent);

-            
+

             // Add a new line
             // Add a new line

-            wxRichTextLine* line = new wxRichTextLine(this);            
-            line->SetRange(actualRange);
+            wxRichTextLine* line = AllocateLine(lineCount);
+
+            // Set relative range so we won't have to change line ranges when paragraphs are moved
+            line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart()));

             line->SetPosition(currentPosition);
             line->SetSize(wxSize(currentWidth, lineHeight));
             line->SetDescent(maxDescent);
 
             line->SetPosition(currentPosition);
             line->SetSize(wxSize(currentWidth, lineHeight));
             line->SetDescent(maxDescent);
 

-            m_cachedLines.Append(line);
-            

             // Now move down a line. TODO: add margins, spacing
             currentPosition.y += lineHeight;
             currentPosition.y += lineSpacing;
             currentWidth = 0;
             maxDescent = 0;
             // Now move down a line. TODO: add margins, spacing
             currentPosition.y += lineHeight;
             currentPosition.y += lineSpacing;
             currentWidth = 0;
             maxDescent = 0;

-            maxWidth = wxMax(maxWidth, currentWidth); 
-            
+            maxWidth = wxMax(maxWidth, currentWidth);
+

             lineCount ++;
 
             // TODO: account for zero-length objects, such as fields
             wxASSERT(wrapPosition > lastCompletedEndPos);
             lineCount ++;
 
             // TODO: account for zero-length objects, such as fields
             wxASSERT(wrapPosition > lastCompletedEndPos);

-            
+

             lastEndPos = wrapPosition;
             lastCompletedEndPos = lastEndPos;
 
             lastEndPos = wrapPosition;
             lastCompletedEndPos = lastEndPos;
 


@@ -2005,15 +3276,19 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     {
         currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
 
     {
         currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
 

-        wxRichTextLine* line = new wxRichTextLine(this);
-        
-        line->SetRange(lastCompletedEndPos+1, GetRange().GetEnd()-1);
+        wxRichTextLine* line = AllocateLine(lineCount);
+
+        wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1);
+
+        // Set relative range so we won't have to change line ranges when paragraphs are moved
+        line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart()));
+

         line->SetPosition(currentPosition);
 
         if (lineHeight == 0)
         {
         line->SetPosition(currentPosition);
 
         if (lineHeight == 0)
         {

-            if (GetAttributes().GetFont().Ok())
-                dc.SetFont(GetAttributes().GetFont());
+            if (attr.GetFont().Ok())
+                dc.SetFont(attr.GetFont());

             lineHeight = dc.GetCharHeight();
         }
         if (maxDescent == 0)
             lineHeight = dc.GetCharHeight();
         }
         if (maxDescent == 0)


@@ -2027,12 +3302,13 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         currentPosition.y += lineHeight;
         currentPosition.y += lineSpacing;
         lineCount ++;
         currentPosition.y += lineHeight;
         currentPosition.y += lineSpacing;
         lineCount ++;

-        
-        m_cachedLines.Append(line);

     }
 
     }
 

+    // Remove remaining unused line objects, if any
+    ClearUnusedLines(lineCount);
+

     // Apply styles to wrapped lines
     // Apply styles to wrapped lines

-    ApplyParagraphStyle(rect);
+    ApplyParagraphStyle(attr, rect);

 
     SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara));
 
 
     SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara));
 


@@ -2042,9 +3318,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
 }
 
 /// Apply paragraph styles, such as centering, to wrapped lines
 }
 
 /// Apply paragraph styles, such as centering, to wrapped lines

-void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect)
+void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wxRect& rect)

 {
 {

-    if (!GetAttributes().HasAlignment())
+    if (!attr.HasAlignment())

         return;
 
     wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
         return;
 
     wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();


@@ -2056,14 +3332,14 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect)
         wxSize size = line->GetSize();
 
         // centering, right-justification
         wxSize size = line->GetSize();
 
         // centering, right-justification

-        if (GetAttributes().HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
+        if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)

         {
             pos.x = (rect.GetWidth() - size.x)/2 + pos.x;
             line->SetPosition(pos);
         }
         {
             pos.x = (rect.GetWidth() - size.x)/2 + pos.x;
             line->SetPosition(pos);
         }

-        else if (GetAttributes().HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+        else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)

         {
         {

-            pos.x = rect.GetRight() - size.x;
+            pos.x = pos.x + rect.GetWidth() - size.x;

             line->SetPosition(pos);
         }
 
             line->SetPosition(pos);
         }
 


@@ -2075,7 +3351,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect)
 bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 {
     wxRichTextObject* childToUse = NULL;
 bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 {
     wxRichTextObject* childToUse = NULL;

-    wxRichTextObjectList::compatibility_iterator nodeToUse = NULL;
+    wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator();

 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)


@@ -2102,7 +3378,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
                                text + textObject->GetText().Mid(posInString);
             textObject->SetText(newText);
 
                                text + textObject->GetText().Mid(posInString);
             textObject->SetText(newText);
 

-            int textLength = text.Length();
+            int textLength = text.length();

 
             textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(),
                                                  textObject->GetRange().GetEnd() + textLength));
 
             textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(),
                                                  textObject->GetRange().GetEnd() + textLength));


@@ -2116,7 +3392,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
                 wxRichTextObject* child = node->GetData();
                 child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength,
                                                  textObject->GetRange().GetEnd() + textLength));
                 wxRichTextObject* child = node->GetData();
                 child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength,
                                                  textObject->GetRange().GetEnd() + textLength));

-                
+

                 node = node->GetNext();
             }
 
                 node = node->GetNext();
             }
 


@@ -2154,7 +3430,7 @@ void wxRichTextParagraph::ClearLines()
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.

-bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags) const
+bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const

 {
     if (!range.IsWithin(GetRange()))
         return false;
 {
     if (!range.IsWithin(GetRange()))
         return false;


@@ -2173,12 +3449,12 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
             if (!child->GetRange().IsOutside(range))
             {
                 wxSize childSize;
             if (!child->GetRange().IsOutside(range))
             {
                 wxSize childSize;

-                
+

                 wxRichTextRange rangeToUse = range;
                 rangeToUse.LimitTo(child->GetRange());
                 int childDescent = 0;
                 wxRichTextRange rangeToUse = range;
                 rangeToUse.LimitTo(child->GetRange());
                 int childDescent = 0;

-                
-                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags))
+
+                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))

                 {
                     sz.y = wxMax(sz.y, childSize.y);
                     sz.x += childSize.x;
                 {
                     sz.y = wxMax(sz.y, childSize.y);
                     sz.x += childSize.x;


@@ -2206,30 +3482,31 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
         while (node)
         {
             wxRichTextLine* line = node->GetData();
         while (node)
         {
             wxRichTextLine* line = node->GetData();

-            if (!line->GetRange().IsOutside(range))
+            wxRichTextRange lineRange = line->GetAbsoluteRange();
+            if (!lineRange.IsOutside(range))

             {
                 wxSize lineSize;
             {
                 wxSize lineSize;

-                        
+

                 wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
                 while (node2)
                 {
                     wxRichTextObject* child = node2->GetData();
                 wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
                 while (node2)
                 {
                     wxRichTextObject* child = node2->GetData();

-                    
-                    if (!child->GetRange().IsOutside(line->GetRange()))
+
+                    if (!child->GetRange().IsOutside(lineRange))

                     {
                     {

-                        wxRichTextRange rangeToUse = line->GetRange();
+                        wxRichTextRange rangeToUse = lineRange;

                         rangeToUse.LimitTo(child->GetRange());
                         rangeToUse.LimitTo(child->GetRange());

-                        
+

                         wxSize childSize;
                         int childDescent = 0;
                         wxSize childSize;
                         int childDescent = 0;

-                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags))
+                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))

                         {
                             lineSize.y = wxMax(lineSize.y, childSize.y);
                             lineSize.x += childSize.x;
                         }
                         descent = wxMax(descent, childDescent);
                     }
                         {
                             lineSize.y = wxMax(lineSize.y, childSize.y);
                             lineSize.x += childSize.x;
                         }
                         descent = wxMax(descent, childDescent);
                     }

-                    
+

                     node2 = node2->GetNext();
                 }
 
                     node2 = node2->GetNext();
                 }
 


@@ -2260,8 +3537,6 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h
         if (line)
             pt = pt + line->GetPosition();
 
         if (line)
             pt = pt + line->GetPosition();
 

-        *height = dc.GetCharHeight();
-

         return true;
     }
 
         return true;
     }
 


@@ -2296,12 +3571,13 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h
     while (node)
     {
         wxRichTextLine* line = node->GetData();
     while (node)
     {
         wxRichTextLine* line = node->GetData();

-        if (index >= line->GetRange().GetStart() && index <= line->GetRange().GetEnd())
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
+        if (index >= lineRange.GetStart() && index <= lineRange.GetEnd())

         {
             // If this is the last point in the line, and we're forcing the
             // returned value to be the start of the next line, do the required
             // thing.
         {
             // If this is the last point in the line, and we're forcing the
             // returned value to be the start of the next line, do the required
             // thing.

-            if (index == line->GetRange().GetEnd() && forceLineStart)
+            if (index == lineRange.GetEnd() && forceLineStart)

             {
                 if (node->GetNext())
                 {
             {
                 if (node->GetNext())
                 {


@@ -2314,7 +3590,7 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h
 
             pt.y = line->GetPosition().y + GetPosition().y;
 
 
             pt.y = line->GetPosition().y + GetPosition().y;
 

-            wxRichTextRange r(line->GetRange().GetStart(), index);
+            wxRichTextRange r(lineRange.GetStart(), index);

             wxSize rangeSize;
             int descent = 0;
 
             wxSize rangeSize;
             int descent = 0;
 


@@ -2322,7 +3598,7 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h
             // then we can add this size to the line start position and
             // paragraph start position to find the actual position.
 
             // then we can add this size to the line start position and
             // paragraph start position to find the actual position.
 

-            if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED))
+            if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition()))

             {
                 pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x;
                 *height = line->GetSize().y;
             {
                 pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x;
                 *height = line->GetSize().y;


@@ -2350,31 +3626,32 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
         wxRichTextLine* line = node->GetData();
         wxPoint linePos = paraPos + line->GetPosition();
         wxSize lineSize = line->GetSize();
         wxRichTextLine* line = node->GetData();
         wxPoint linePos = paraPos + line->GetPosition();
         wxSize lineSize = line->GetSize();

+        wxRichTextRange lineRange = line->GetAbsoluteRange();

 
         if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y)
         {
             if (pt.x < linePos.x)
             {
 
         if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y)
         {
             if (pt.x < linePos.x)
             {

-                textPosition = line->GetRange().GetStart();
+                textPosition = lineRange.GetStart();

                 return wxRICHTEXT_HITTEST_BEFORE;
             }
             else if (pt.x >= (linePos.x + lineSize.x))
             {
                 return wxRICHTEXT_HITTEST_BEFORE;
             }
             else if (pt.x >= (linePos.x + lineSize.x))
             {

-                textPosition = line->GetRange().GetEnd();
+                textPosition = lineRange.GetEnd();

                 return wxRICHTEXT_HITTEST_AFTER;
             }
             else
             {
                 long i;
                 int lastX = linePos.x;
                 return wxRICHTEXT_HITTEST_AFTER;
             }
             else
             {
                 long i;
                 int lastX = linePos.x;

-                for (i = line->GetRange().GetStart(); i <= line->GetRange().GetEnd(); i++)
+                for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++)

                 {
                     wxSize childSize;
                     int descent = 0;
                 {
                     wxSize childSize;
                     int descent = 0;

-                    
-                    wxRichTextRange rangeToUse(line->GetRange().GetStart(), i);
-                    
-                    GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED);
+
+                    wxRichTextRange rangeToUse(lineRange.GetStart(), i);
+
+                    GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos);

 
                     int nextX = childSize.x + linePos.x;
 
 
                     int nextX = childSize.x + linePos.x;
 


@@ -2399,7 +3676,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
                 }
             }
         }
                 }
             }
         }

-        
+

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 


@@ -2418,7 +3695,12 @@ wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** prev
         if (pos == child->GetRange().GetStart())
         {
             if (previousObject)
         if (pos == child->GetRange().GetStart())
         {
             if (previousObject)

-                *previousObject = child;
+            {
+                if (node->GetPrevious())
+                    *previousObject = node->GetPrevious()->GetData();
+                else
+                    *previousObject = NULL;
+            }

 
             return child;
         }
 
             return child;
         }


@@ -2478,7 +3760,7 @@ void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list)
 /// Add content back from list
 void wxRichTextParagraph::MoveFromList(wxList& list)
 {
 /// Add content back from list
 void wxRichTextParagraph::MoveFromList(wxList& list)
 {

-    for (wxNode* node = list.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
         AppendChild((wxRichTextObject*) node->GetData());
     }
     {
         AppendChild((wxRichTextObject*) node->GetData());
     }


@@ -2504,7 +3786,7 @@ wxRichTextObject* wxRichTextParagraph::FindObjectAtPosition(long position)
         wxRichTextObject* obj = node->GetData();
         if (obj->GetRange().Contains(position))
             return obj;
         wxRichTextObject* obj = node->GetData();
         if (obj->GetRange().Contains(position))
             return obj;

-        
+

         node = node->GetNext();
     }
     return NULL;
         node = node->GetNext();
     }
     return NULL;


@@ -2588,7 +3870,7 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d
         int spacePos = plainText.Find(wxT(' '), true);
         if (spacePos != wxNOT_FOUND)
         {
         int spacePos = plainText.Find(wxT(' '), true);
         if (spacePos != wxNOT_FOUND)
         {

-            int positionsFromEndOfString = plainText.Length() - spacePos - 1;
+            int positionsFromEndOfString = plainText.length() - spacePos - 1;

             breakPosition = breakPosition - positionsFromEndOfString;
         }
     }
             breakPosition = breakPosition - positionsFromEndOfString;
         }
     }


@@ -2608,7 +3890,7 @@ wxString wxRichTextParagraph::GetBulletText()
     int number = GetAttributes().GetBulletNumber();
 
     wxString text;
     int number = GetAttributes().GetBulletNumber();
 
     wxString text;

-    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC)
+    if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE))

     {
         text.Printf(wxT("%d"), number);
     }
     {
         text.Printf(wxT("%d"), number);
     }


@@ -2624,41 +3906,37 @@ wxString wxRichTextParagraph::GetBulletText()
     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
     {
     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
     {

-        // TODO: convert from number to roman numeral
-        if (number == 1)
-            text = wxT("I");
-        else if (number == 2)
-            text = wxT("II");
-        else if (number == 3)
-            text = wxT("III");
-        else if (number == 4)
-            text = wxT("IV");
-        else
-            text = wxT("TODO");
+        text = wxRichTextDecimalToRoman(number);

     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
     {
     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
     {

-        // TODO: convert from number to roman numeral
-        if (number == 1)
-            text = wxT("i");
-        else if (number == 2)
-            text = wxT("ii");
-        else if (number == 3)
-            text = wxT("iii");
-        else if (number == 4)
-            text = wxT("iv");
-        else
-            text = wxT("TODO");
+        text = wxRichTextDecimalToRoman(number);
+        text.MakeLower();

     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
     {
     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
     {

-        text = GetAttributes().GetBulletSymbol();
+        text = GetAttributes().GetBulletText();
+    }
+    
+    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
+    {
+        // The outline style relies on the text being computed statically,
+        // since it depends on other levels points (e.g. 1.2.1.1). So normally the bullet text
+        // should be stored in the attributes; if not, just use the number for this
+        // level, as previously computed.
+        if (!GetAttributes().GetBulletText().IsEmpty())
+            text = GetAttributes().GetBulletText();

     }
 
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES)
     {
         text = wxT("(") + text + wxT(")");
     }
     }
 
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES)
     {
         text = wxT("(") + text + wxT(")");
     }

+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS)
+    {
+        text = text + wxT(")");
+    }
+

     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
     {
         text += wxT(".");
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
     {
         text += wxT(".");


@@ -2667,6 +3945,90 @@ wxString wxRichTextParagraph::GetBulletText()
     return text;
 }
 
     return text;
 }
 

+/// Allocate or reuse a line object
+wxRichTextLine* wxRichTextParagraph::AllocateLine(int pos)
+{
+    if (pos < (int) m_cachedLines.GetCount())
+    {
+        wxRichTextLine* line = m_cachedLines.Item(pos)->GetData();
+        line->Init(this);
+        return line;
+    }
+    else
+    {
+        wxRichTextLine* line = new wxRichTextLine(this);
+        m_cachedLines.Append(line);
+        return line;
+    }
+}
+
+/// Clear remaining unused line objects, if any
+bool wxRichTextParagraph::ClearUnusedLines(int lineCount)
+{
+    int cachedLineCount = m_cachedLines.GetCount();
+    if ((int) cachedLineCount > lineCount)
+    {
+        for (int i = 0; i < (int) (cachedLineCount - lineCount); i ++)
+        {
+            wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetLast();
+            wxRichTextLine* line = node->GetData();
+            m_cachedLines.Erase(node);
+            delete line;
+        }
+    }
+    return true;
+}
+
+/// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically
+/// retrieve the actual style.
+wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& contentStyle) const
+{
+    wxTextAttrEx attr;
+    wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
+    if (buf)
+    {
+        attr = buf->GetBasicStyle();
+        wxRichTextApplyStyle(attr, GetAttributes());
+    }
+    else
+        attr = GetAttributes();
+
+    wxRichTextApplyStyle(attr, contentStyle);
+    return attr;
+}
+
+/// Get combined attributes of the base style and paragraph style.
+wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes() const
+{
+    wxTextAttrEx attr;
+    wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
+    if (buf)
+    {
+        attr = buf->GetBasicStyle();
+        wxRichTextApplyStyle(attr, GetAttributes());
+    }
+    else
+        attr = GetAttributes();
+
+    return attr;
+}
+
+/// Create default tabstop array
+void wxRichTextParagraph::InitDefaultTabs()
+{
+    // create a default tab list at 10 mm each.
+    for (int i = 0; i < 20; ++i)
+    {
+        sm_defaultTabs.Add(i*100);
+    }
+}
+
+/// Clear default tabstop array
+void wxRichTextParagraph::ClearDefaultTabs()
+{
+    sm_defaultTabs.Clear();
+}
+

 
 /*!
  * wxRichTextLine
 
 /*!
  * wxRichTextLine


@@ -2677,15 +4039,16 @@ wxString wxRichTextParagraph::GetBulletText()
 
 wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent)
 {
 
 wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent)
 {

-    Init();
-
-    m_parent = parent;
+    Init(parent);

 }
 
 /// Initialisation
 }
 
 /// Initialisation

-void wxRichTextLine::Init()
+void wxRichTextLine::Init(wxRichTextParagraph* parent)

 {
 {

-    m_parent = NULL;
+    m_parent = parent;
+    m_range.SetRange(-1, -1);
+    m_pos = wxPoint(0, 0);
+    m_size = wxSize(0, 0);

     m_descent = 0;
 }
 
     m_descent = 0;
 }
 


@@ -2701,6 +4064,14 @@ wxPoint wxRichTextLine::GetAbsolutePosition() const
     return m_parent->GetPosition() + m_pos;
 }
 
     return m_parent->GetPosition() + m_pos;
 }
 

+/// Get the absolute range
+wxRichTextRange wxRichTextLine::GetAbsoluteRange() const
+{
+    wxRichTextRange range(m_range.GetStart() + m_parent->GetRange().GetStart(), 0);
+    range.SetEnd(range.GetStart() + m_range.GetLength()-1);
+    return range;
+}
+

 /*!
  * wxRichTextPlainText
  * This object represents a single piece of text.
 /*!
  * wxRichTextPlainText
  * This object represents a single piece of text.


@@ -2711,17 +4082,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
 wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
     wxRichTextObject(parent)
 {
 wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
     wxRichTextObject(parent)
 {

-    if (parent && !style)
-        SetAttributes(parent->GetAttributes());

     if (style)
         SetAttributes(*style);
 
     m_text = text;
 }
 
     if (style)
         SetAttributes(*style);
 
     m_text = text;
 }
 

+#define USE_KERNING_FIX 1
+

 /// Draw the item
 bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {
 /// Draw the item
 bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
+    wxASSERT (para != NULL);
+
+    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+#else
+    wxTextAttrEx textAttr(GetAttributes());
+#endif
+

     int offset = GetRange().GetStart();
 
     long len = range.GetLength();
     int offset = GetRange().GetStart();
 
     long len = range.GetLength();


@@ -2735,30 +4115,19 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
     // Test for the optimized situations where all is selected, or none
     // is selected.
 
     // Test for the optimized situations where all is selected, or none
     // is selected.
 

-    if (GetAttributes().GetFont().Ok())
-        dc.SetFont(GetAttributes().GetFont());
+    if (textAttr.GetFont().Ok())
+        dc.SetFont(textAttr.GetFont());

 
     // (a) All selected.
     if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
     {
 
     // (a) All selected.
     if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
     {

-        // Draw all selected
-        dc.SetBrush(*wxBLACK_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        wxCoord w, h;
-        dc.GetTextExtent(stringChunk, & w, & h);
-        wxRect selRect(x, rect.y, w, rect.GetHeight());
-        dc.DrawRectangle(selRect);
-        dc.SetTextForeground(*wxWHITE);
-        dc.SetBackgroundMode(wxTRANSPARENT);
-        dc.DrawText(stringChunk, x, y);
+        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, true);

     }
     // (b) None selected.
     else if (selectionRange.GetEnd() < range.GetStart() || selectionRange.GetStart() > range.GetEnd())
     {
         // Draw all unselected
     }
     // (b) None selected.
     else if (selectionRange.GetEnd() < range.GetStart() || selectionRange.GetStart() > range.GetEnd())
     {
         // Draw all unselected

-        dc.SetTextForeground(GetAttributes().GetTextColour());
-        dc.SetBackgroundMode(wxTRANSPARENT);
-        dc.DrawText(stringChunk, x, y);
+        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, false);

     }
     else
     {
     }
     else
     {


@@ -2766,7 +4135,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
         // Let's draw unselected chunk, selected chunk, then unselected chunk.
 
         dc.SetBackgroundMode(wxTRANSPARENT);
         // Let's draw unselected chunk, selected chunk, then unselected chunk.
 
         dc.SetBackgroundMode(wxTRANSPARENT);

-    
+

         // 1. Initial unselected chunk, if any, up until start of selection.
         if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd())
         {
         // 1. Initial unselected chunk, if any, up until start of selection.
         if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd())
         {


@@ -2777,12 +4146,24 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(r1 - offset, fragmentLen);
 
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(r1 - offset, fragmentLen);
 

-            dc.SetTextForeground(GetAttributes().GetTextColour());
-            dc.DrawText(stringFragment, x, y);
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);

 
 

-            wxCoord w, h;
-            dc.GetTextExtent(stringFragment, & w, & h);
-            x += w;
+#if USE_KERNING_FIX
+            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
+            {
+                // Compensate for kerning difference
+                wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1));
+                wxString stringFragment3(m_text.Mid(r1 - offset + fragmentLen, 1));
+
+                wxCoord w1, h1, w2, h2, w3, h3;
+                dc.GetTextExtent(stringFragment,  & w1, & h1);
+                dc.GetTextExtent(stringFragment2, & w2, & h2);
+                dc.GetTextExtent(stringFragment3, & w3, & h3);
+
+                int kerningDiff = (w1 + w3) - w2;
+                x = x - kerningDiff;
+            }
+#endif

         }
 
         // 2. Selected chunk, if any.
         }
 
         // 2. Selected chunk, if any.


@@ -2796,17 +4177,24 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(s1 - offset, fragmentLen);
 
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(s1 - offset, fragmentLen);
 

-            wxCoord w, h;
-            dc.GetTextExtent(stringFragment, & w, & h);
-            wxRect selRect(x, rect.y, w, rect.GetHeight());
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);

 
 

-            dc.SetBrush(*wxBLACK_BRUSH);
-            dc.SetPen(*wxBLACK_PEN);
-            dc.DrawRectangle(selRect);
-            dc.SetTextForeground(*wxWHITE);
-            dc.DrawText(stringFragment, x, y);
+#if USE_KERNING_FIX
+            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
+            {
+                // Compensate for kerning difference
+                wxString stringFragment2(m_text.Mid(s1 - offset, fragmentLen+1));
+                wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1));

 
 

-            x += w;
+                wxCoord w1, h1, w2, h2, w3, h3;
+                dc.GetTextExtent(stringFragment,  & w1, & h1);
+                dc.GetTextExtent(stringFragment2, & w2, & h2);
+                dc.GetTextExtent(stringFragment3, & w3, & h3);
+
+                int kerningDiff = (w1 + w3) - w2;
+                x = x - kerningDiff;
+            }
+#endif

         }
 
         // 3. Remaining unselected chunk, if any
         }
 
         // 3. Remaining unselected chunk, if any


@@ -2820,19 +4208,111 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen);
 
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
             wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen);
 

-            dc.SetTextForeground(GetAttributes().GetTextColour());
-            dc.DrawText(stringFragment, x, y);
-        }        
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
+        }
+    }
+
+    return true;
+}
+
+bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected)
+{
+    bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND);
+
+    wxArrayInt tabArray;
+    int tabCount;
+    if (hasTabs)
+    {
+        if (attr.GetTabs().IsEmpty())
+            tabArray = wxRichTextParagraph::GetDefaultTabs();
+        else
+            tabArray = attr.GetTabs();
+        tabCount = tabArray.GetCount();
+
+        for (int i = 0; i < tabCount; ++i)
+        {
+            int pos = tabArray[i];
+            pos = ConvertTenthsMMToPixels(dc, pos);
+            tabArray[i] = pos;
+        }
+    }
+    else
+        tabCount = 0;
+
+    int nextTabPos = -1;
+    int tabPos = -1;
+    wxCoord w, h;
+
+    if (selected)
+    {
+        dc.SetBrush(*wxBLACK_BRUSH);
+        dc.SetPen(*wxBLACK_PEN);
+        dc.SetTextForeground(*wxWHITE);
+        dc.SetBackgroundMode(wxTRANSPARENT);
+    }
+    else
+    {
+        dc.SetTextForeground(attr.GetTextColour());
+        dc.SetBackgroundMode(wxTRANSPARENT);
+    }
+
+    while (hasTabs)
+    {
+        // the string has a tab
+        // break up the string at the Tab
+        wxString stringChunk = str.BeforeFirst(wxT('\t'));
+        str = str.AfterFirst(wxT('\t'));
+        dc.GetTextExtent(stringChunk, & w, & h);
+        tabPos = x + w;
+        bool not_found = true;
+        for (int i = 0; i < tabCount && not_found; ++i)
+        {
+            nextTabPos = tabArray.Item(i);
+            if (nextTabPos > tabPos)
+            {
+                not_found = false;
+                if (selected)
+                {
+                    w = nextTabPos - x;
+                    wxRect selRect(x, rect.y, w, rect.GetHeight());
+                    dc.DrawRectangle(selRect);
+                }
+                dc.DrawText(stringChunk, x, y);
+                x = nextTabPos;
+            }
+        }
+        hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND);

     }
 
     }
 

+    if (!str.IsEmpty())
+    {
+        dc.GetTextExtent(str, & w, & h);
+        if (selected)
+        {
+            wxRect selRect(x, rect.y, w, rect.GetHeight());
+            dc.DrawRectangle(selRect);
+        }
+        dc.DrawText(str, x, y);
+        x += w;
+    }

     return true;
     return true;

+

 }
 
 /// Lay the item out
 bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
 {
 }
 
 /// Lay the item out
 bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
 {

-    if (GetAttributes().GetFont().Ok())
-        dc.SetFont(GetAttributes().GetFont());
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
+    wxASSERT (para != NULL);
+
+    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+#else
+    wxTextAttrEx textAttr(GetAttributes());
+#endif
+
+    if (textAttr.GetFont().Ok())
+        dc.SetFont(textAttr.GetFont());

 
     wxCoord w, h;
     dc.GetTextExtent(m_text, & w, & h, & m_descent);
 
     wxCoord w, h;
     dc.GetTextExtent(m_text, & w, & h, & m_descent);


@@ -2851,24 +4331,76 @@ void wxRichTextPlainText::Copy(const wxRichTextPlainText& obj)
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.

-bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags)) const
+bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position) const

 {
     if (!range.IsWithin(GetRange()))
         return false;
 
 {
     if (!range.IsWithin(GetRange()))
         return false;
 

+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
+    wxASSERT (para != NULL);
+
+    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+#else
+    wxTextAttrEx textAttr(GetAttributes());
+#endif
+

     // Always assume unformatted text, since at this level we have no knowledge
     // of line breaks - and we don't need it, since we'll calculate size within
     // formatted text by doing it in chunks according to the line ranges
 
     // Always assume unformatted text, since at this level we have no knowledge
     // of line breaks - and we don't need it, since we'll calculate size within
     // formatted text by doing it in chunks according to the line ranges
 

-    if (GetAttributes().GetFont().Ok())
-        dc.SetFont(GetAttributes().GetFont());
+    if (textAttr.GetFont().Ok())
+        dc.SetFont(textAttr.GetFont());

 
     int startPos = range.GetStart() - GetRange().GetStart();
     long len = range.GetLength();
     wxString stringChunk = m_text.Mid(startPos, (size_t) len);
     wxCoord w, h;
 
     int startPos = range.GetStart() - GetRange().GetStart();
     long len = range.GetLength();
     wxString stringChunk = m_text.Mid(startPos, (size_t) len);
     wxCoord w, h;

+    int width = 0;
+    if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND)
+    {
+        // the string has a tab
+        wxArrayInt tabArray;
+        if (textAttr.GetTabs().IsEmpty())
+            tabArray = wxRichTextParagraph::GetDefaultTabs();
+        else
+            tabArray = textAttr.GetTabs();
+
+        int tabCount = tabArray.GetCount();
+
+        for (int i = 0; i < tabCount; ++i)
+        {
+            int pos = tabArray[i];
+            pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos);
+            tabArray[i] = pos;
+        }
+
+        int nextTabPos = -1;
+
+        while (stringChunk.Find(wxT('\t')) >= 0)
+        {
+            // the string has a tab
+            // break up the string at the Tab
+            wxString stringFragment = stringChunk.BeforeFirst(wxT('\t'));
+            stringChunk = stringChunk.AfterFirst(wxT('\t'));
+            dc.GetTextExtent(stringFragment, & w, & h);
+            width += w;
+            int absoluteWidth = width + position.x;
+            bool notFound = true;
+            for (int i = 0; i < tabCount && notFound; ++i)
+            {
+                nextTabPos = tabArray.Item(i);
+                if (nextTabPos > absoluteWidth)
+                {
+                    notFound = false;
+                    width = nextTabPos - position.x;
+                }
+            }
+        }
+    }

     dc.GetTextExtent(stringChunk, & w, & h, & descent);
     dc.GetTextExtent(stringChunk, & w, & h, & descent);

-    size = wxSize(w, dc.GetCharHeight());
+    width += w;
+    size = wxSize(width, dc.GetCharHeight());

 
     return true;
 }
 
     return true;
 }


@@ -2878,7 +4410,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {
     int index = pos - GetRange().GetStart();
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {
     int index = pos - GetRange().GetStart();

-    if (index < 0 || index >= (int) m_text.Length())
+    if (index < 0 || index >= (int) m_text.length())

         return NULL;
 
     wxString firstPart = m_text.Mid(0, index);
         return NULL;
 
     wxString firstPart = m_text.Mid(0, index);


@@ -2898,7 +4430,7 @@ wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 /// Calculate range
 void wxRichTextPlainText::CalculateRange(long start, long& end)
 {
 /// Calculate range
 void wxRichTextPlainText::CalculateRange(long start, long& end)
 {

-    end = start + m_text.Length() - 1;
+    end = start + m_text.length() - 1;

     m_range.SetRange(start, end);
 }
 
     m_range.SetRange(start, end);
 }
 


@@ -2939,7 +4471,7 @@ wxString wxRichTextPlainText::GetTextForRange(const wxRichTextRange& range) cons
 bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const
 {
     return object->GetClassInfo() == CLASSINFO(wxRichTextPlainText) &&
 bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const
 {
     return object->GetClassInfo() == CLASSINFO(wxRichTextPlainText) &&

-        (m_text.IsEmpty() || wxTextAttrEq(GetAttributes(), object->GetAttributes()));
+        (m_text.empty() || wxTextAttrEq(GetAttributes(), object->GetAttributes()));

 }
 
 /// Returns true if this object merged itself with the given one.
 }
 
 /// Returns true if this object merged itself with the given one.


@@ -2972,7 +4504,10 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
 

-wxList wxRichTextBuffer::sm_handlers;
+wxList                  wxRichTextBuffer::sm_handlers;
+wxRichTextRenderer*     wxRichTextBuffer::sm_renderer = NULL;
+int                     wxRichTextBuffer::sm_bulletRightMargin = 20;
+float                   wxRichTextBuffer::sm_bulletProportion = (float) 0.3;

 
 /// Initialisation
 void wxRichTextBuffer::Init()
 
 /// Initialisation
 void wxRichTextBuffer::Init()


@@ -2983,6 +4518,8 @@ void wxRichTextBuffer::Init()
     m_batchedCommandDepth = 0;
     m_batchedCommand = NULL;
     m_suppressUndo = 0;
     m_batchedCommandDepth = 0;
     m_batchedCommand = NULL;
     m_suppressUndo = 0;

+    m_handlerFlags = 0;
+    m_scale = 1.0;

 }
 
 /// Initialisation
 }
 
 /// Initialisation


@@ -2992,73 +4529,200 @@ wxRichTextBuffer::~wxRichTextBuffer()
     delete m_batchedCommand;
 
     ClearStyleStack();
     delete m_batchedCommand;
 
     ClearStyleStack();

+    ClearEventHandlers();

 }
 
 }
 

-void wxRichTextBuffer::Clear()
+void wxRichTextBuffer::ResetAndClearCommands()

 {
 {

-    DeleteChildren();
+    Reset();
+    

     GetCommandProcessor()->ClearCommands();
     GetCommandProcessor()->ClearCommands();

+

     Modify(false);
     Modify(false);

+    Invalidate(wxRICHTEXT_ALL);

 }
 
 }
 

-void wxRichTextBuffer::Reset()
+void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj)

 {
 {

-    DeleteChildren();
-    AddParagraph(wxT(""));
-    GetCommandProcessor()->ClearCommands();
-    Modify(false);
+    wxRichTextParagraphLayoutBox::Copy(obj);
+
+    m_styleSheet = obj.m_styleSheet;
+    m_modified = obj.m_modified;
+    m_batchedCommandDepth = obj.m_batchedCommandDepth;
+    m_batchedCommand = obj.m_batchedCommand;
+    m_suppressUndo = obj.m_suppressUndo;
+}
+
+/// Push style sheet to top of stack
+bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet)
+{
+    if (m_styleSheet)
+        styleSheet->InsertSheet(m_styleSheet);
+
+    SetStyleSheet(styleSheet);
+
+    return true;
+}
+
+/// Pop style sheet from top of stack
+wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet()
+{
+    if (m_styleSheet)
+    {
+        wxRichTextStyleSheet* oldSheet = m_styleSheet;
+        m_styleSheet = oldSheet->GetNextSheet();
+        oldSheet->Unlink();
+
+        return oldSheet;
+    }
+    else
+        return NULL;
+}
+
+/// Submit command to insert paragraphs
+bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
+
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxTextAttrEx attr(GetDefaultStyle());
+#else
+    wxTextAttrEx attr(GetBasicStyle());
+    wxRichTextApplyStyle(attr, GetDefaultStyle());
+#endif
+
+    wxTextAttrEx* p = NULL;
+    wxTextAttrEx paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+    else
+        p = & attr;
+
+    action->GetNewParagraphs() = paragraphs;
+
+    if (p)
+    {
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
+        while (node)
+        {
+            wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData();
+            obj->SetAttributes(*p);
+            node = node->GetPrevious();
+        }
+    }
+
+    action->SetPosition(pos);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1));
+
+    SubmitAction(action);
+
+    return true;

 }
 
 /// Submit command to insert the given text
 }
 
 /// Submit command to insert the given text

-bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl)
+bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)

 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 

-    action->GetNewParagraphs().AddParagraphs(text);
-    if (action->GetNewParagraphs().GetChildCount() == 1)
+    wxTextAttrEx* p = NULL;
+    wxTextAttrEx paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    action->GetNewParagraphs().AddParagraphs(text, p);
+
+    int length = action->GetNewParagraphs().GetRange().GetLength();
+
+    if (text.length() > 0 && text.Last() != wxT('\n'))
+    {
+        // Don't count the newline when undoing
+        length --;

         action->GetNewParagraphs().SetPartialParagraph(true);
         action->GetNewParagraphs().SetPartialParagraph(true);

+    }

 
     action->SetPosition(pos);
 
     // Set the range we'll need to delete in Undo
 
     action->SetPosition(pos);
 
     // Set the range we'll need to delete in Undo

-    action->SetRange(wxRichTextRange(pos, pos + text.Length() - 1));
-    
+    action->SetRange(wxRichTextRange(pos, pos + length - 1));
+

     SubmitAction(action);
     SubmitAction(action);

-        
+

     return true;
 }
 
 /// Submit command to insert the given text
     return true;
 }
 
 /// Submit command to insert the given text

-bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl)
+bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags)

 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 

+    wxTextAttrEx* p = NULL;
+    wxTextAttrEx paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxTextAttrEx attr(GetDefaultStyle());
+#else

     wxTextAttrEx attr(GetBasicStyle());
     wxRichTextApplyStyle(attr, GetDefaultStyle());
     wxTextAttrEx attr(GetBasicStyle());
     wxRichTextApplyStyle(attr, GetDefaultStyle());

-    
-    wxRichTextParagraph* newPara = new wxRichTextParagraph(wxT(""), this, & attr);
+#endif
+
+    wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);

     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
     action->GetNewParagraphs().SetPartialParagraph(false);
     action->SetPosition(pos);
 
     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
     action->GetNewParagraphs().SetPartialParagraph(false);
     action->SetPosition(pos);
 

+    if (p)
+        newPara->SetAttributes(*p);
+

     // Set the range we'll need to delete in Undo
     action->SetRange(wxRichTextRange(pos, pos));
     // Set the range we'll need to delete in Undo
     action->SetRange(wxRichTextRange(pos, pos));

-    
+

     SubmitAction(action);
     SubmitAction(action);

-        
+

     return true;
 }
 
 /// Submit command to insert the given image
     return true;
 }
 
 /// Submit command to insert the given image

-bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl)
+bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags)

 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false);
 

+    wxTextAttrEx* p = NULL;
+    wxTextAttrEx paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    wxTextAttrEx attr(GetDefaultStyle());
+#else

     wxTextAttrEx attr(GetBasicStyle());
     wxRichTextApplyStyle(attr, GetDefaultStyle());
     wxTextAttrEx attr(GetBasicStyle());
     wxRichTextApplyStyle(attr, GetDefaultStyle());

-    
+#endif
+

     wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
     wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);

+    if (p)
+        newPara->SetAttributes(*p);
+

     wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
     newPara->AppendChild(imageObject);
     action->GetNewParagraphs().AppendChild(newPara);
     wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
     newPara->AppendChild(imageObject);
     action->GetNewParagraphs().AppendChild(newPara);


@@ -3070,22 +4734,83 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
 
     // Set the range we'll need to delete in Undo
     action->SetRange(wxRichTextRange(pos, pos));
 
     // Set the range we'll need to delete in Undo
     action->SetRange(wxRichTextRange(pos, pos));

-    
+

     SubmitAction(action);
     SubmitAction(action);

-        
+

     return true;
 }
 
     return true;
 }
 

+/// Get the style that is appropriate for a new paragraph at this position.
+/// If the previous paragraph has a paragraph style name, look up the next-paragraph
+/// style.
+wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition) const
+{
+    wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
+    if (para)
+    {
+        wxRichTextAttr attr;
+        bool foundAttributes = false;
+        
+        // Look for a matching paragraph style
+        if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
+        {
+            wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+            if (paraDef)
+            {
+                if (!paraDef->GetNextStyle().IsEmpty())
+                {
+                    wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
+                    if (nextParaDef)
+                    {
+                        foundAttributes = true;
+                        attr = nextParaDef->GetStyle();
+                    }
+                }
+                
+                // If we didn't find the 'next style', use this style instead.
+                if (!foundAttributes)
+                {
+                    foundAttributes = true;
+                    attr = paraDef->GetStyle();
+                }
+            }
+        }
+        if (!foundAttributes)
+        {
+            attr = para->GetAttributes();
+            int flags = attr.GetFlags();
+
+            // Eliminate character styles
+            flags &= ( (~ wxTEXT_ATTR_FONT) |
+                    (~ wxTEXT_ATTR_TEXT_COLOUR) |
+                    (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
+            attr.SetFlags(flags);
+        }
+        
+        // Now see if we need to number the paragraph.
+        if (attr.HasBulletStyle())
+        {
+            wxRichTextAttr numberingAttr;
+            if (FindNextParagraphNumber(para, numberingAttr))
+                wxRichTextApplyStyle(attr, (const wxRichTextAttr&) numberingAttr);
+        }
+
+        return attr;
+    }
+    else
+        return wxRichTextAttr();
+}
+

 /// Submit command to delete this range
 bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl)
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
 /// Submit command to delete this range
 bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl)
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);

-    
+

     action->SetPosition(initialCaretPosition);
 
     // Set the range to delete
     action->SetRange(range);
     action->SetPosition(initialCaretPosition);
 
     // Set the range to delete
     action->SetRange(range);

-    
+

     // Copy the fragment that we'll need to restore in Undo
     CopyFragment(range, action->GetOldParagraphs());
 
     // Copy the fragment that we'll need to restore in Undo
     CopyFragment(range, action->GetOldParagraphs());
 


@@ -3110,7 +4835,7 @@ bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long in
     }
 
     SubmitAction(action);
     }
 
     SubmitAction(action);

-        
+

     return true;
 }
 
     return true;
 }
 


@@ -3127,7 +4852,7 @@ bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName)
         m_batchedCommand = new wxRichTextCommand(cmdName);
     }
 
         m_batchedCommand = new wxRichTextCommand(cmdName);
     }
 

-    m_batchedCommandDepth ++;    
+    m_batchedCommandDepth ++;

 
     return true;
 }
 
     return true;
 }


@@ -3169,7 +4894,7 @@ bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
 /// Begin suppressing undo/redo commands.
 bool wxRichTextBuffer::BeginSuppressUndo()
 {
 /// Begin suppressing undo/redo commands.
 bool wxRichTextBuffer::BeginSuppressUndo()
 {

-    m_suppressUndo ++;    
+    m_suppressUndo ++;

 
     return true;
 }
 
     return true;
 }


@@ -3177,7 +4902,7 @@ bool wxRichTextBuffer::BeginSuppressUndo()
 /// End suppressing undo/redo commands.
 bool wxRichTextBuffer::EndSuppressUndo()
 {
 /// End suppressing undo/redo commands.
 bool wxRichTextBuffer::EndSuppressUndo()
 {

-    m_suppressUndo --;    
+    m_suppressUndo --;

 
     return true;
 }
 
     return true;
 }


@@ -3203,15 +4928,15 @@ bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style)
 /// End the style
 bool wxRichTextBuffer::EndStyle()
 {
 /// End the style
 bool wxRichTextBuffer::EndStyle()
 {

-    if (m_attributeStack.GetFirst() == NULL)
+    if (!m_attributeStack.GetFirst())

     {
         wxLogDebug(_("Too many EndStyle calls!"));
         return false;
     }
 
     {
         wxLogDebug(_("Too many EndStyle calls!"));
         return false;
     }
 

-    wxNode* node = m_attributeStack.GetLast();
+    wxList::compatibility_iterator node = m_attributeStack.GetLast();

     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
     wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();

-    delete node;
+    m_attributeStack.Erase(node);

 
     SetDefaultStyle(*attr);
 
 
     SetDefaultStyle(*attr);
 


@@ -3230,7 +4955,7 @@ bool wxRichTextBuffer::EndAllStyles()
 /// Clear the style stack
 void wxRichTextBuffer::ClearStyleStack()
 {
 /// Clear the style stack
 void wxRichTextBuffer::ClearStyleStack()
 {

-    for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())

         delete (wxTextAttrEx*) node->GetData();
     m_attributeStack.Clear();
 }
         delete (wxTextAttrEx*) node->GetData();
     m_attributeStack.Clear();
 }


@@ -3243,7 +4968,7 @@ bool wxRichTextBuffer::BeginBold()
 
     wxTextAttrEx attr;
     attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT);
 
     wxTextAttrEx attr;
     attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3255,7 +4980,7 @@ bool wxRichTextBuffer::BeginItalic()
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC);
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3267,7 +4992,7 @@ bool wxRichTextBuffer::BeginUnderline()
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE);
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3279,7 +5004,7 @@ bool wxRichTextBuffer::BeginFontSize(int pointSize)
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE);
 
     wxTextAttrEx attr;
     attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3289,7 +5014,7 @@ bool wxRichTextBuffer::BeginFont(const wxFont& font)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_FONT);
     attr.SetFont(font);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_FONT);
     attr.SetFont(font);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3299,7 +5024,7 @@ bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
     attr.SetTextColour(colour);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
     attr.SetTextColour(colour);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3309,7 +5034,7 @@ bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
     attr.SetAlignment(alignment);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
     attr.SetAlignment(alignment);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3319,7 +5044,7 @@ bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
     attr.SetLeftIndent(leftIndent, leftSubIndent);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3329,7 +5054,7 @@ bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
     attr.SetRightIndent(rightIndent);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
     attr.SetRightIndent(rightIndent);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3346,7 +5071,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after)
     attr.SetFlags(flags);
     attr.SetParagraphSpacingBefore(before);
     attr.SetParagraphSpacingAfter(after);
     attr.SetFlags(flags);
     attr.SetParagraphSpacingBefore(before);
     attr.SetParagraphSpacingAfter(after);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3356,7 +5081,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
     attr.SetLineSpacing(lineSpacing);
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
     attr.SetLineSpacing(lineSpacing);

-    
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3364,23 +5089,35 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
 bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
 {
     wxTextAttrEx attr;
 bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
 {
     wxTextAttrEx attr;

-    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);

     attr.SetBulletStyle(bulletStyle);
     attr.SetBulletNumber(bulletNumber);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
     attr.SetBulletStyle(bulletStyle);
     attr.SetBulletNumber(bulletNumber);
     attr.SetLeftIndent(leftIndent, leftSubIndent);

-    
+

     return BeginStyle(attr);
 }
 
 /// Begin symbol bullet
     return BeginStyle(attr);
 }
 
 /// Begin symbol bullet

-bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle)
+bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)

 {
     wxTextAttrEx attr;
 {
     wxTextAttrEx attr;

-    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);

     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);

-    attr.SetBulletSymbol(symbol);
-    
+    attr.SetBulletText(symbol);
+
+    return BeginStyle(attr);
+}
+
+/// Begin standard bullet
+bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
+{
+    wxTextAttrEx attr;
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetBulletStyle(bulletStyle);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+    attr.SetBulletName(bulletName);
+

     return BeginStyle(attr);
 }
 
     return BeginStyle(attr);
 }
 


@@ -3416,6 +5153,42 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle)
     return false;
 }
 
     return false;
 }
 

+/// Begin named list style
+bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
+        if (def)
+        {
+            wxTextAttrEx attr(def->GetCombinedStyleForLevel(level));
+
+            attr.SetBulletNumber(number);
+
+            return BeginStyle(attr);
+        }
+    }
+    return false;
+}
+
+/// Begin URL
+bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
+{
+    wxTextAttrEx attr;
+
+    if (!characterStyle.IsEmpty() && GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
+        if (def)
+        {
+            def->GetStyle().CopyTo(attr);
+        }
+    }
+    attr.SetURL(url);
+
+    return BeginStyle(attr);
+}
+

 /// Adds a handler to the end
 void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler)
 {
 /// Adds a handler to the end
 void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler)
 {


@@ -3447,12 +5220,14 @@ wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxStrin
 {
     if (imageType != wxRICHTEXT_TYPE_ANY)
         return FindHandler(imageType);
 {
     if (imageType != wxRICHTEXT_TYPE_ANY)
         return FindHandler(imageType);

-    else
+    else if (!filename.IsEmpty())

     {
         wxString path, file, ext;
         wxSplitPath(filename, & path, & file, & ext);
         return FindHandler(ext, imageType);
     }
     {
         wxString path, file, ext;
         wxSplitPath(filename, & path, & file, & ext);
         return FindHandler(ext, imageType);
     }

+    else
+        return NULL;

 }
 
 
 }
 
 


@@ -3518,8 +5293,11 @@ void wxRichTextBuffer::CleanUpHandlers()
     sm_handlers.Clear();
 }
 
     sm_handlers.Clear();
 }
 

-wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save)
+wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* types)

 {
 {

+    if (types)
+        types->Clear();
+

     wxString wildcard;
 
     wxList::compatibility_iterator node = GetHandlers().GetFirst();
     wxString wildcard;
 
     wxList::compatibility_iterator node = GetHandlers().GetFirst();


@@ -3546,6 +5324,8 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save)
                 wildcard += handler->GetExtension();
                 wildcard += wxT(")|*.");
                 wildcard += handler->GetExtension();
                 wildcard += handler->GetExtension();
                 wildcard += wxT(")|*.");
                 wildcard += handler->GetExtension();

+                if (types)
+                    types->Add(handler->GetType());

             }
             count ++;
         }
             }
             count ++;
         }


@@ -3563,7 +5343,13 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)

-        return handler->LoadFile(this, filename);
+    {
+        SetDefaultStyle(wxTextAttrEx());
+        handler->SetFlags(GetHandlerFlags());
+        bool success = handler->LoadFile(this, filename);
+        Invalidate(wxRICHTEXT_ALL);
+        return success;
+    }

     else
         return false;
 }
     else
         return false;
 }


@@ -3573,7 +5359,10 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)

+    {
+        handler->SetFlags(GetHandlerFlags());

         return handler->SaveFile(this, filename);
         return handler->SaveFile(this, filename);

+    }

     else
         return false;
 }
     else
         return false;
 }


@@ -3583,7 +5372,13 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)

-        return handler->LoadFile(this, stream);
+    {
+        SetDefaultStyle(wxTextAttrEx());
+        handler->SetFlags(GetHandlerFlags());
+        bool success = handler->LoadFile(this, stream);
+        Invalidate(wxRICHTEXT_ALL);
+        return success;
+    }

     else
         return false;
 }
     else
         return false;
 }


@@ -3593,7 +5388,10 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)

+    {
+        handler->SetFlags(GetHandlerFlags());

         return handler->SaveFile(this, stream);
         return handler->SaveFile(this, stream);

+    }

     else
         return false;
 }
     else
         return false;
 }


@@ -3602,12 +5400,45 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
 bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
 {
     bool success = false;
 bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
 {
     bool success = false;

-    wxString text = GetTextForRange(range);
-    if (wxTheClipboard->Open())
-    {        
-        success = wxTheClipboard->SetData(new wxTextDataObject(text));
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+
+    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
+    {
+        wxTheClipboard->Clear();
+
+        // Add composite object
+
+        wxDataObjectComposite* compositeObject = new wxDataObjectComposite();
+
+        {
+            wxString text = GetTextForRange(range);
+
+#ifdef __WXMSW__
+            text = wxTextFile::Translate(text, wxTextFileType_Dos);
+#endif
+
+            compositeObject->Add(new wxTextDataObject(text), false /* not preferred */);
+        }
+
+        // Add rich text buffer data object. This needs the XML handler to be present.
+
+        if (FindHandler(wxRICHTEXT_TYPE_XML))
+        {
+            wxRichTextBuffer* richTextBuf = new wxRichTextBuffer;
+            CopyFragment(range, *richTextBuf);
+
+            compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */);
+        }
+
+        if (wxTheClipboard->SetData(compositeObject))
+            success = true;
+

         wxTheClipboard->Close();
     }
         wxTheClipboard->Close();
     }

+
+#else
+    wxUnusedVar(range);
+#endif

     return success;
 }
 
     return success;
 }
 


@@ -3615,18 +5446,31 @@ bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
 bool wxRichTextBuffer::PasteFromClipboard(long position)
 {
     bool success = false;
 bool wxRichTextBuffer::PasteFromClipboard(long position)
 {
     bool success = false;

+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ

     if (CanPasteFromClipboard())
     {
         if (wxTheClipboard->Open())
         {
     if (CanPasteFromClipboard())
     {
         if (wxTheClipboard->Open())
         {

-            if (wxTheClipboard->IsSupported(wxDF_TEXT))
+            if (wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())))
+            {
+                wxRichTextBufferDataObject data;
+                wxTheClipboard->GetData(data);
+                wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
+                if (richTextBuffer)
+                {
+                    InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+                    delete richTextBuffer;
+                }
+            }
+            else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT))

             {
                 wxTextDataObject data;
                 wxTheClipboard->GetData(data);
                 wxString text(data.GetText());
             {
                 wxTextDataObject data;
                 wxTheClipboard->GetData(data);
                 wxString text(data.GetText());

+                text.Replace(_T("\r\n"), _T("\n"));

 
                 InsertTextWithUndo(position+1, text, GetRichTextCtrl());
 
                 InsertTextWithUndo(position+1, text, GetRichTextCtrl());

-                
+

                 success = true;
             }
             else if (wxTheClipboard->IsSupported(wxDF_BITMAP))
                 success = true;
             }
             else if (wxTheClipboard->IsSupported(wxDF_BITMAP))


@@ -3637,17 +5481,17 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                 wxImage image(bitmap.ConvertToImage());
 
                 wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, GetRichTextCtrl(), false);
                 wxImage image(bitmap.ConvertToImage());
 
                 wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, GetRichTextCtrl(), false);

-                
+

                 action->GetNewParagraphs().AddImage(image);
 
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);
                 action->GetNewParagraphs().AddImage(image);
 
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);

-                
+

                 action->SetPosition(position);
                 action->SetPosition(position);

-                
+

                 // Set the range we'll need to delete in Undo
                 action->SetRange(wxRichTextRange(position, position));
                 // Set the range we'll need to delete in Undo
                 action->SetRange(wxRichTextRange(position, position));

-                
+

                 SubmitAction(action);
 
                 success = true;
                 SubmitAction(action);
 
                 success = true;


@@ -3655,38 +5499,273 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
             wxTheClipboard->Close();
         }
     }
             wxTheClipboard->Close();
         }
     }

+#else
+    wxUnusedVar(position);
+#endif

     return success;
 }
 
 /// Can we paste from the clipboard?
 bool wxRichTextBuffer::CanPasteFromClipboard() const
 {
     return success;
 }
 
 /// Can we paste from the clipboard?
 bool wxRichTextBuffer::CanPasteFromClipboard() const
 {

-    bool canPaste = FALSE;
-    if (wxTheClipboard->Open())
+    bool canPaste = false;
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())

     {
     {

-        if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_BITMAP))
+        if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT) ||
+            wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) ||
+            wxTheClipboard->IsSupported(wxDF_BITMAP))

         {
         {

-            canPaste = TRUE;
+            canPaste = true;

         }
         wxTheClipboard->Close();
     }
         }
         wxTheClipboard->Close();
     }

+#endif

     return canPaste;
 }
 
     return canPaste;
 }
 

-/// Dumps contents of buffer for debugging purposes
-void wxRichTextBuffer::Dump()
+/// Dumps contents of buffer for debugging purposes
+void wxRichTextBuffer::Dump()
+{
+    wxString text;
+    {
+        wxStringOutputStream stream(& text);
+        wxTextOutputStream textStream(stream);
+        Dump(textStream);
+    }
+
+    wxLogDebug(text);
+}
+
+/// Add an event handler
+bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler)
+{
+    m_eventHandlers.Append(handler);
+    return true;
+}
+
+/// Remove an event handler
+bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler)
+{
+    wxList::compatibility_iterator node = m_eventHandlers.Find(handler);
+    if (node)
+    {
+        m_eventHandlers.Erase(node);
+        if (deleteHandler)
+            delete handler;
+        
+        return true;
+    }
+    else
+        return false;
+}
+
+/// Clear event handlers
+void wxRichTextBuffer::ClearEventHandlers()
+{
+    m_eventHandlers.Clear();
+}
+
+/// Send event to event handlers. If sendToAll is true, will send to all event handlers,
+/// otherwise will stop at the first successful one.
+bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll)
+{
+    bool success = false;
+    for (wxList::compatibility_iterator node = m_eventHandlers.GetFirst(); node; node = node->GetNext())
+    {
+        wxEvtHandler* handler = (wxEvtHandler*) node->GetData();
+        if (handler->ProcessEvent(event))
+        {
+            success = true;
+            if (!sendToAll)
+                return true;
+        }
+    }
+    return success;
+}
+
+/// Set style sheet and notify of the change
+bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet)
+{
+    wxRichTextStyleSheet* oldSheet = GetStyleSheet();
+    
+    wxWindowID id = wxID_ANY;
+    if (GetRichTextCtrl())
+        id = GetRichTextCtrl()->GetId();
+    
+    wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id);
+    event.SetEventObject(GetRichTextCtrl());
+    event.SetOldStyleSheet(oldSheet);
+    event.SetNewStyleSheet(sheet);
+    event.Allow();
+    
+    if (SendEvent(event) && !event.IsAllowed())
+    {
+        if (sheet != oldSheet)
+            delete sheet;
+
+        return false;
+    }
+
+    if (oldSheet && oldSheet != sheet)
+        delete oldSheet;
+
+    SetStyleSheet(sheet);
+
+    event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED);
+    event.SetOldStyleSheet(NULL);
+    event.Allow();
+
+    return SendEvent(event);
+}
+
+/// Set renderer, deleting old one
+void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer)
+{
+    if (sm_renderer)
+        delete sm_renderer;
+    sm_renderer = renderer;
+}
+
+bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect)
+{
+    if (bulletAttr.GetTextColour().Ok())
+    {
+        dc.SetPen(wxPen(bulletAttr.GetTextColour()));
+        dc.SetBrush(wxBrush(bulletAttr.GetTextColour()));
+    }
+    else
+    {
+        dc.SetPen(*wxBLACK_PEN);
+        dc.SetBrush(*wxBLACK_BRUSH);
+    }
+
+    wxFont font;
+    if (bulletAttr.GetFont().Ok())
+        font = bulletAttr.GetFont();
+    else
+        font = (*wxNORMAL_FONT);
+
+    dc.SetFont(font);
+
+    int charHeight = dc.GetCharHeight();
+                
+    int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion());
+    int bulletHeight = bulletWidth;
+
+    int x = rect.x;
+    
+    // Calculate the top position of the character (as opposed to the whole line height)
+    int y = rect.y + (rect.height - charHeight);
+    
+    // Calculate where the bullet should be positioned
+    y = y + (charHeight+1)/2 - (bulletHeight+1)/2;
+                
+    // The margin between a bullet and text.
+    int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
+                
+    if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
+        x = rect.x + rect.width - bulletWidth - margin;
+    else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
+        x = x + (rect.width)/2 - bulletWidth/2;
+                
+    if (bulletAttr.GetBulletName() == wxT("standard/square"))
+    {
+        dc.DrawRectangle(x, y, bulletWidth, bulletHeight);
+    }
+    else if (bulletAttr.GetBulletName() == wxT("standard/diamond"))
+    {
+        wxPoint pts[5];
+        pts[0].x = x;                   pts[0].y = y + bulletHeight/2;
+        pts[1].x = x + bulletWidth/2;   pts[1].y = y;
+        pts[2].x = x + bulletWidth;     pts[2].y = y + bulletHeight/2;
+        pts[3].x = x + bulletWidth/2;   pts[3].y = y + bulletHeight;
+                    
+        dc.DrawPolygon(4, pts);
+    }
+    else if (bulletAttr.GetBulletName() == wxT("standard/triangle"))
+    {
+        wxPoint pts[3];
+        pts[0].x = x;                   pts[0].y = y;
+        pts[1].x = x + bulletWidth;     pts[1].y = y + bulletHeight/2;
+        pts[2].x = x;                   pts[2].y = y + bulletHeight;
+                    
+        dc.DrawPolygon(3, pts);
+    }
+    else // "standard/circle", and catch-all
+    {
+        dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
+    }                
+ 
+    return true;
+}
+
+bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect, const wxString& text)
+{
+    if (!text.empty())
+    {
+        wxFont font;
+        if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.GetFont().Ok())
+        {
+            font = (*wxTheFontList->FindOrCreateFont(attr.GetFont().GetPointSize(), attr.GetFont().GetFamily(),
+                        attr.GetFont().GetStyle(), attr.GetFont().GetWeight(), attr.GetFont().GetUnderlined(),
+                        attr.GetBulletFont()));
+        }
+        else if (attr.GetFont().Ok())
+            font = attr.GetFont();
+        else
+            font = (*wxNORMAL_FONT);
+
+        dc.SetFont(font);
+
+        if (attr.GetTextColour().Ok())
+            dc.SetTextForeground(attr.GetTextColour());
+
+        dc.SetBackgroundMode(wxTRANSPARENT);
+
+        int charHeight = dc.GetCharHeight();
+        wxCoord tw, th;
+        dc.GetTextExtent(text, & tw, & th);
+
+        int x = rect.x;
+
+        // Calculate the top position of the character (as opposed to the whole line height)
+        int y = rect.y + (rect.height - charHeight);    
+
+        // The margin between a bullet and text.
+        int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
+                
+        if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
+            x = (rect.x + rect.width) - tw - margin;
+        else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
+            x = x + (rect.width)/2 - tw/2;
+
+        dc.DrawText(text, x, y);
+        
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect))
+{
+    // Currently unimplemented. The intention is to store bitmaps by name in a media store associated
+    // with the buffer. The store will allow retrieval from memory, disk or other means.
+    return false;
+}
+
+/// Enumerate the standard bullet names currently supported
+bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)

 {
 {

-    wxString text;
-    {
-        wxStringOutputStream stream(& text);
-        wxTextOutputStream textStream(stream);
-        Dump(textStream);
-    }
+    bulletNames.Add(wxT("standard/circle"));
+    bulletNames.Add(wxT("standard/square"));
+    bulletNames.Add(wxT("standard/diamond"));
+    bulletNames.Add(wxT("standard/triangle"));

 
 

-    wxLogDebug(text);
+    return true;

 }
 
 }
 

-

 /*
  * Module to initialise and clean up handlers
  */
 /*
  * Module to initialise and clean up handlers
  */


@@ -3696,25 +5775,49 @@ class wxRichTextModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxRichTextModule)
 public:
     wxRichTextModule() {}
 DECLARE_DYNAMIC_CLASS(wxRichTextModule)
 public:
     wxRichTextModule() {}

-    bool OnInit() { wxRichTextBuffer::InitStandardHandlers(); return true; };
-    void OnExit() { wxRichTextBuffer::CleanUpHandlers(); };
+    bool OnInit()
+    {
+        wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer);
+        wxRichTextBuffer::InitStandardHandlers();
+        wxRichTextParagraph::InitDefaultTabs();
+        return true;
+    };
+    void OnExit()
+    {
+        wxRichTextBuffer::CleanUpHandlers();
+        wxRichTextDecimalToRoman(-1);
+        wxRichTextParagraph::ClearDefaultTabs();
+        wxRichTextCtrl::ClearAvailableFontNames();
+        wxRichTextBuffer::SetRenderer(NULL);
+    };

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
 
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
 
 

+// If the richtext lib is dynamically loaded after the app has already started
+// (such as from wxPython) then the built-in module system will not init this
+// module.  Provide this function to do it manually.
+void wxRichTextModuleInit()
+{
+    wxModule* module = new wxRichTextModule;
+    module->Init();
+    wxModule::RegisterModule(module);
+}
+
+

 /*!
  * Commands for undo/redo
  *
  */
 
 wxRichTextCommand::wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
 /*!
  * Commands for undo/redo
  *
  */
 
 wxRichTextCommand::wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,

-                                     wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(TRUE, name)
+                                     wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name)

 {
     /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, ctrl, ignoreFirstTime);
 }
 
 {
     /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, ctrl, ignoreFirstTime);
 }
 

-wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(TRUE, name)
+wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(true, name)

 {
 }
 
 {
 }
 


@@ -3731,7 +5834,7 @@ void wxRichTextCommand::AddAction(wxRichTextAction* action)
 
 bool wxRichTextCommand::Do()
 {
 
 bool wxRichTextCommand::Do()
 {

-    for (wxNode* node = m_actions.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext())

     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Do();
     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Do();


@@ -3742,7 +5845,7 @@ bool wxRichTextCommand::Do()
 
 bool wxRichTextCommand::Undo()
 {
 
 bool wxRichTextCommand::Undo()
 {

-    for (wxNode* node = m_actions.GetLast(); node; node = node->GetPrevious())
+    for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious())

     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Undo();
     {
         wxRichTextAction* action = (wxRichTextAction*) node->GetData();
         action->Undo();


@@ -3788,14 +5891,77 @@ bool wxRichTextAction::Do()
     {
     case wxRICHTEXT_INSERT:
         {
     {
     case wxRICHTEXT_INSERT:
         {

+            // Store a list of line start character and y positions so we can figure out which area
+            // we need to refresh
+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            // NOTE: we're assuming that the buffer is laid out correctly at this point.
+            // If we had several actions, which only invalidate and leave layout until the
+            // paint handler is called, then this might not be true. So we may need to switch
+            // optimisation on only when we're simply adding text and not simultaneously
+            // deleting a selection, for example. Or, we make sure the buffer is laid out correctly
+            // first, but of course this means we'll be doing it twice.
+            if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly
+            {
+                wxSize clientSize = m_ctrl->GetClientSize();
+                wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint();
+                int lastY = firstVisiblePt.y + clientSize.y;
+                
+                wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition());
+                wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
+                while (node)
+                {
+                    wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
+                    wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+                    while (node2)
+                    {
+                        wxRichTextLine* line = node2->GetData();
+                        wxPoint pt = line->GetAbsolutePosition();
+                        wxRichTextRange range = line->GetAbsoluteRange();
+                        
+                        if (pt.y > lastY)
+                        {
+                            node2 = wxRichTextLineList::compatibility_iterator();
+                            node = wxRichTextObjectList::compatibility_iterator();
+                        }
+                        else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y)
+                        {                    
+                            optimizationLineCharPositions.Add(range.GetStart());
+                            optimizationLineYPositions.Add(pt.y);
+                        }
+
+                        if (node2)
+                            node2 = node2->GetNext();
+                    }
+                
+                    if (node)
+                        node = node->GetNext();
+                }
+            }            
+#endif
+

             m_buffer->InsertFragment(GetPosition(), m_newParagraphs);
             m_buffer->UpdateRanges();
             m_buffer->InsertFragment(GetPosition(), m_newParagraphs);
             m_buffer->UpdateRanges();

+            m_buffer->Invalidate(GetRange());
+
+            long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();

 
 

-            long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength() - 1;
+            // Character position to caret position
+            newCaretPosition --;
+
+            // Don't take into account the last newline

             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;
 
             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;
 

-            UpdateAppearance(newCaretPosition, true /* send update event */);
+            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));
+            
+
+            if (optimizationLineCharPositions.GetCount() > 0)
+                UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
+            else
+                UpdateAppearance(newCaretPosition, true /* send update event */);

 
             break;
         }
 
             break;
         }


@@ -3803,6 +5969,7 @@ bool wxRichTextAction::Do()
         {
             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();
         {
             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();

+            m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));

 
             UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
 
 
             UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
 


@@ -3811,6 +5978,7 @@ bool wxRichTextAction::Do()
     case wxRICHTEXT_CHANGE_STYLE:
         {
             ApplyParagraphs(GetNewParagraphs());
     case wxRICHTEXT_CHANGE_STYLE:
         {
             ApplyParagraphs(GetNewParagraphs());

+            m_buffer->Invalidate(GetRange());

 
             UpdateAppearance(GetPosition());
 
 
             UpdateAppearance(GetPosition());
 


@@ -3833,11 +6001,12 @@ bool wxRichTextAction::Undo()
         {
             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();
         {
             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();

+            m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));

 
             long newCaretPosition = GetPosition() - 1;
             // if (m_newParagraphs.GetPartialParagraph())
             //    newCaretPosition --;
 
             long newCaretPosition = GetPosition() - 1;
             // if (m_newParagraphs.GetPartialParagraph())
             //    newCaretPosition --;

-
+            

             UpdateAppearance(newCaretPosition, true /* send update event */);
 
             break;
             UpdateAppearance(newCaretPosition, true /* send update event */);
 
             break;


@@ -3846,6 +6015,7 @@ bool wxRichTextAction::Undo()
         {
             m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
             m_buffer->UpdateRanges();
         {
             m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
             m_buffer->UpdateRanges();

+            m_buffer->Invalidate(GetRange());

 
             UpdateAppearance(GetPosition(), true /* send update event */);
 
 
             UpdateAppearance(GetPosition(), true /* send update event */);
 


@@ -3854,6 +6024,7 @@ bool wxRichTextAction::Undo()
     case wxRICHTEXT_CHANGE_STYLE:
         {
             ApplyParagraphs(GetOldParagraphs());
     case wxRICHTEXT_CHANGE_STYLE:
         {
             ApplyParagraphs(GetOldParagraphs());

+            m_buffer->Invalidate(GetRange());

 
             UpdateAppearance(GetPosition());
 
 
             UpdateAppearance(GetPosition());
 


@@ -3867,25 +6038,117 @@ bool wxRichTextAction::Undo()
 }
 
 /// Update the control appearance
 }
 
 /// Update the control appearance

-void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent)
+void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions)

 {
     if (m_ctrl)
     {
         m_ctrl->SetCaretPosition(caretPosition);
         if (!m_ctrl->IsFrozen())
         {
 {
     if (m_ctrl)
     {
         m_ctrl->SetCaretPosition(caretPosition);
         if (!m_ctrl->IsFrozen())
         {

-            m_ctrl->Layout();
+            m_ctrl->LayoutContent();

             m_ctrl->PositionCaret();
             m_ctrl->PositionCaret();

-            m_ctrl->Refresh();
+            
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            // Find refresh rectangle if we are in a position to optimise refresh
+            if (m_cmdId == wxRICHTEXT_INSERT && optimizationLineCharPositions && optimizationLineCharPositions->GetCount() > 0)
+            {
+                size_t i;
+                
+                wxSize clientSize = m_ctrl->GetClientSize();
+                wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint();
+                
+                // Start/end positions
+                int firstY = 0;
+                int lastY = firstVisiblePt.y + clientSize.y;
+                
+                bool foundStart = false;
+                bool foundEnd = false;
+                
+                // position offset - how many characters were inserted
+                int positionOffset = GetRange().GetLength();
+
+                // find the first line which is being drawn at the same position as it was
+                // before. Since we're talking about a simple insertion, we can assume
+                // that the rest of the window does not need to be redrawn.
+                
+                wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition());
+                wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
+                while (node)
+                {
+                    wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
+                    wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+                    while (node2)
+                    {
+                        wxRichTextLine* line = node2->GetData();
+                        wxPoint pt = line->GetAbsolutePosition();
+                        wxRichTextRange range = line->GetAbsoluteRange();
+                        
+                        // we want to find the first line that is in the same position
+                        // as before. This will mean we're at the end of the changed text.
+                        
+                        if (pt.y > lastY) // going past the end of the window, no more info
+                        {
+                            node2 = wxRichTextLineList::compatibility_iterator();
+                            node = wxRichTextObjectList::compatibility_iterator();
+                        }
+                        else
+                        {
+                            if (!foundStart)
+                            {
+                                firstY = pt.y - firstVisiblePt.y;
+                                foundStart = true;
+                            }
+
+                            // search for this line being at the same position as before                            
+                            for (i = 0; i < optimizationLineCharPositions->GetCount(); i++)
+                            {
+                                if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) &&
+                                    ((*optimizationLineYPositions)[i] == pt.y))
+                                {
+                                    // Stop, we're now the same as we were
+                                    foundEnd = true;
+                                    lastY = pt.y - firstVisiblePt.y;
+
+                                    node2 = wxRichTextLineList::compatibility_iterator();
+                                    node = wxRichTextObjectList::compatibility_iterator();
+
+                                    break;
+                                }                    
+                            }
+                        }
+
+                        if (node2)
+                            node2 = node2->GetNext();
+                    }
+                
+                    if (node)
+                        node = node->GetNext();
+                }
+                
+                if (!foundStart)
+                    firstY = firstVisiblePt.y;
+                if (!foundEnd)
+                    lastY = firstVisiblePt.y + clientSize.y;
+
+                wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY);
+                m_ctrl->RefreshRect(rect);
+                
+                // TODO: we need to make sure that lines are only drawn if in the update region. The rect
+                // passed to Draw is currently used in different ways (to pass the position the content should
+                // be drawn at as well as the relevant region).
+            }
+            else            
+#endif
+                m_ctrl->Refresh(false);

 
             if (sendUpdateEvent)
 
             if (sendUpdateEvent)

-                m_ctrl->SendUpdateEvent();
+                m_ctrl->SendTextUpdatedEvent();

         }
         }

-    }    
+    }

 }
 
 /// Replace the buffer paragraphs with the new ones.
 }
 
 /// Replace the buffer paragraphs with the new ones.

-void wxRichTextAction::ApplyParagraphs(const wxRichTextFragment& fragment)
+void wxRichTextAction::ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment)

 {
     wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst();
     while (node)
 {
     wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst();
     while (node)


@@ -3941,17 +6204,21 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
 

-wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent):
+wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttrEx* charStyle):

     wxRichTextObject(parent)
 {
     m_image = image;
     wxRichTextObject(parent)
 {
     m_image = image;

+    if (charStyle)
+        SetAttributes(*charStyle);

 }
 
 }
 

-wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent):
+wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttrEx* charStyle):

     wxRichTextObject(parent)
 {
     m_imageBlock = imageBlock;
     m_imageBlock.Load(m_image);
     wxRichTextObject(parent)
 {
     m_imageBlock = imageBlock;
     m_imageBlock.Load(m_image);

+    if (charStyle)
+        SetAttributes(*charStyle);

 }
 
 /// Load wxImage from the block
 }
 
 /// Load wxImage from the block


@@ -4018,7 +6285,7 @@ bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSE
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.

-bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags)) const
+bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position)) const

 {
     if (!range.IsWithin(GetRange()))
         return false;
 {
     if (!range.IsWithin(GetRange()))
         return false;


@@ -4035,6 +6302,8 @@ bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, i
 /// Copy
 void wxRichTextImage::Copy(const wxRichTextImage& obj)
 {
 /// Copy
 void wxRichTextImage::Copy(const wxRichTextImage& obj)
 {

+    wxRichTextObject::Copy(obj);
+

     m_image = obj.m_image;
     m_imageBlock = obj.m_imageBlock;
 }
     m_image = obj.m_image;
     m_imageBlock = obj.m_imageBlock;
 }


@@ -4047,23 +6316,7 @@ void wxRichTextImage::Copy(const wxRichTextImage& obj)
 /// Compare two attribute objects
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
 {
 /// Compare two attribute objects
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
 {

-    return (
-        attr1.GetTextColour() == attr2.GetTextColour() &&
-        attr1.GetBackgroundColour() == attr2.GetBackgroundColour() &&
-        attr1.GetFont() == attr2.GetFont() &&
-        attr1.GetAlignment() == attr2.GetAlignment() &&
-        attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
-        attr1.GetRightIndent() == attr2.GetRightIndent() &&
-        attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&
-        attr1.GetTabs().GetCount() == attr2.GetTabs().GetCount() && // heuristic
-        attr1.GetLineSpacing() == attr2.GetLineSpacing() &&
-        attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() &&
-        attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() &&
-        attr1.GetBulletStyle() == attr2.GetBulletStyle() &&
-        attr1.GetBulletNumber() == attr2.GetBulletNumber() &&
-        attr1.GetBulletSymbol() == attr2.GetBulletSymbol() &&
-        attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
-        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName());
+    return (attr1 == attr2);

 }
 
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
 }
 
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)


@@ -4080,15 +6333,19 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
         attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
         attr1.GetRightIndent() == attr2.GetRightIndent() &&
         attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&
         attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
         attr1.GetRightIndent() == attr2.GetRightIndent() &&
         attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&

-        attr1.GetTabs().GetCount() == attr2.GetTabs().GetCount() && // heuristic
+        wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()) &&

         attr1.GetLineSpacing() == attr2.GetLineSpacing() &&
         attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() &&
         attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() &&
         attr1.GetBulletStyle() == attr2.GetBulletStyle() &&
         attr1.GetBulletNumber() == attr2.GetBulletNumber() &&
         attr1.GetLineSpacing() == attr2.GetLineSpacing() &&
         attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() &&
         attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() &&
         attr1.GetBulletStyle() == attr2.GetBulletStyle() &&
         attr1.GetBulletNumber() == attr2.GetBulletNumber() &&

-        attr1.GetBulletSymbol() == attr2.GetBulletSymbol() &&
+        attr1.GetBulletText() == attr2.GetBulletText() &&
+        attr1.GetBulletName() == attr2.GetBulletName() &&
+        attr1.GetBulletFont() == attr2.GetBulletFont() &&

         attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
         attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&

-        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName());
+        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() &&
+        attr1.GetListStyleName() == attr2.GetListStyleName() &&
+        attr1.HasPageBreak() == attr2.HasPageBreak());

 }
 
 /// Compare two attribute objects, but take into account the flags
 }
 
 /// Compare two attribute objects, but take into account the flags


@@ -4132,26 +6389,30 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
         (attr1.GetRightIndent() != attr2.GetRightIndent()))
         return false;
 
         (attr1.GetRightIndent() != attr2.GetRightIndent()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) &&
+    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&

         (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
         return false;
 
         (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
+    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&

         (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
         return false;
 
         (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_LINE_SPACING) &&
+    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&

         (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
         return false;
 
         (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
+    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&

         (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
         return false;
 
         (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
+    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&

         (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
         return false;
 
         (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
         return false;
 

+    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
+        (attr1.GetListStyleName() != attr2.GetListStyleName()))
+        return false;
+

     if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
         (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
          return false;
     if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
         (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
          return false;


@@ -4160,14 +6421,22 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 

-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()))
+    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+        (attr1.GetBulletText() != attr2.GetBulletText()) &&
+        (attr1.GetBulletFont() != attr2.GetBulletFont()))
+         return false;
+
+    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
+        (attr1.GetBulletName() != attr2.GetBulletName()))

          return false;
 
          return false;
 

-/* TODO

     if ((flags & wxTEXT_ATTR_TABS) &&
     if ((flags & wxTEXT_ATTR_TABS) &&

+        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))

         return false;
         return false;

-*/
+
+    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
+        (attr1.HasPageBreak() != attr2.HasPageBreak()))
+         return false;

 
     return true;
 }
 
     return true;
 }


@@ -4214,26 +6483,30 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
         (attr1.GetRightIndent() != attr2.GetRightIndent()))
         return false;
 
         (attr1.GetRightIndent() != attr2.GetRightIndent()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) &&
+    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&

         (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
         return false;
 
         (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
+    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&

         (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
         return false;
 
         (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_LINE_SPACING) &&
+    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&

         (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
         return false;
 
         (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
+    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&

         (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
         return false;
 
         (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
         return false;
 

-    if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
+    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&

         (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
         return false;
 
         (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
         return false;
 

+    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
+        (attr1.GetListStyleName() != attr2.GetListStyleName()))
+        return false;
+

     if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
         (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
          return false;
     if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
         (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
          return false;


@@ -4242,15 +6515,38 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 

-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()))
+    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+        (attr1.GetBulletText() != attr2.GetBulletText()) &&
+        (attr1.GetBulletFont() != attr2.GetBulletFont()))
+         return false;
+
+    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
+        (attr1.GetBulletName() != attr2.GetBulletName()))

          return false;
 
          return false;
 

-/* TODO

     if ((flags & wxTEXT_ATTR_TABS) &&
     if ((flags & wxTEXT_ATTR_TABS) &&

+        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))

         return false;
         return false;

-*/

 
 

+    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
+        (attr1.HasPageBreak() != attr2.HasPageBreak()))
+         return false;
+
+    return true;
+}
+
+/// Compare tabs
+bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
+{
+    if (tabs1.GetCount() != tabs2.GetCount())
+        return false;
+
+    size_t i;
+    for (i = 0; i < tabs1.GetCount(); i++)
+    {
+        if (tabs1[i] != tabs2[i])
+            return false;
+    }

     return true;
 }
 
     return true;
 }
 


@@ -4266,22 +6562,43 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
         wxFont font = destStyle.GetFont();
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
         wxFont font = destStyle.GetFont();
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)

+        {
+            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);

             font.SetFaceName(style.GetFont().GetFaceName());
             font.SetFaceName(style.GetFont().GetFaceName());

+        }

 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)

+        {
+            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);

             font.SetPointSize(style.GetFont().GetPointSize());
             font.SetPointSize(style.GetFont().GetPointSize());

+        }

 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)

+        {
+            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);

             font.SetStyle(style.GetFont().GetStyle());
             font.SetStyle(style.GetFont().GetStyle());

+        }

 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)

+        {
+            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);

             font.SetWeight(style.GetFont().GetWeight());
             font.SetWeight(style.GetFont().GetWeight());

+        }

 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)

+        {
+            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);

             font.SetUnderlined(style.GetFont().GetUnderlined());
             font.SetUnderlined(style.GetFont().GetUnderlined());

+        }

 
         if (font != destStyle.GetFont())
 
         if (font != destStyle.GetFont())

+        {
+            int oldFlags = destStyle.GetFlags();
+

             destStyle.SetFont(font);
             destStyle.SetFont(font);

+
+            destStyle.SetFlags(oldFlags);
+        }

     }
 
     if ( style.GetTextColour().Ok() && style.HasTextColour())
     }
 
     if ( style.GetTextColour().Ok() && style.HasTextColour())


@@ -4317,15 +6634,30 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
     if (style.HasParagraphStyleName())
         destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
 
     if (style.HasParagraphStyleName())
         destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
 

+    if (style.HasListStyleName())
+        destStyle.SetListStyleName(style.GetListStyleName());
+

     if (style.HasBulletStyle())
     if (style.HasBulletStyle())

-    {

         destStyle.SetBulletStyle(style.GetBulletStyle());
         destStyle.SetBulletStyle(style.GetBulletStyle());

-        destStyle.SetBulletSymbol(style.GetBulletSymbol());
+
+    if (style.HasBulletText())
+    {
+        destStyle.SetBulletText(style.GetBulletText());
+        destStyle.SetBulletFont(style.GetBulletFont());

     }
 
     }
 

+    if (style.HasBulletName())
+        destStyle.SetBulletName(style.GetBulletName());
+

     if (style.HasBulletNumber())
         destStyle.SetBulletNumber(style.GetBulletNumber());
 
     if (style.HasBulletNumber())
         destStyle.SetBulletNumber(style.GetBulletNumber());
 

+    if (style.HasURL())
+        destStyle.SetURL(style.GetURL());
+
+    if (style.HasPageBreak())
+        destStyle.SetPageBreak();
+

     return true;
 }
 
     return true;
 }
 


@@ -4338,12 +6670,19 @@ bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
     return true;
 }
 
     return true;
 }
 

-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style)
+bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+{
+    wxTextAttrEx attr(destStyle);
+    wxRichTextApplyStyle(attr, style, compareWith);
+    destStyle = attr;
+    return true;
+}
+
+bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)

 {
 {

-    

     // Whole font. Avoiding setting individual attributes if possible, since
     // it recreates the font each time.
     // Whole font. Avoiding setting individual attributes if possible, since
     // it recreates the font each time.

-    if ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT))
+    if (((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) && !compareWith)

     {
         destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT,
             style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName()));
     {
         destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT,
             style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName()));


@@ -4353,70 +6692,269 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style)
         wxFont font = destStyle.GetFont();
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
         wxFont font = destStyle.GetFont();
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)

-            font.SetFaceName(style.GetFontFaceName());
-        
+        {
+            if (compareWith && compareWith->HasFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())
+            {
+                // The same as currently displayed, so don't set
+            }
+            else
+            {
+                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
+                font.SetFaceName(style.GetFontFaceName());
+            }
+        }
+

         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)

-            font.SetPointSize(style.GetFontSize());
-        
+        {
+            if (compareWith && compareWith->HasSize() && compareWith->GetFontSize() == style.GetFontSize())
+            {
+                // The same as currently displayed, so don't set
+            }
+            else
+            {
+                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
+                font.SetPointSize(style.GetFontSize());
+            }
+        }
+

         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)

-            font.SetStyle(style.GetFontStyle());
-        
+        {
+            if (compareWith && compareWith->HasItalic() && compareWith->GetFontStyle() == style.GetFontStyle())
+            {
+                // The same as currently displayed, so don't set
+            }
+            else
+            {
+                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
+                font.SetStyle(style.GetFontStyle());
+            }
+        }
+

         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)

-            font.SetWeight(style.GetFontWeight());
-        
+        {
+            if (compareWith && compareWith->HasWeight() && compareWith->GetFontWeight() == style.GetFontWeight())
+            {
+                // The same as currently displayed, so don't set
+            }
+            else
+            {
+                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
+                font.SetWeight(style.GetFontWeight());
+            }
+        }
+

         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)

-            font.SetUnderlined(style.GetFontUnderlined());
+        {
+            if (compareWith && compareWith->HasUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())
+            {
+                // The same as currently displayed, so don't set
+            }
+            else
+            {
+                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
+                font.SetUnderlined(style.GetFontUnderlined());
+            }
+        }

 
         if (font != destStyle.GetFont())
 
         if (font != destStyle.GetFont())

+        {
+            int oldFlags = destStyle.GetFlags();
+

             destStyle.SetFont(font);
             destStyle.SetFont(font);

+
+            destStyle.SetFlags(oldFlags);
+        }

     }
 
     }
 

-    if ( style.GetTextColour().Ok() && style.HasTextColour())
-        destStyle.SetTextColour(style.GetTextColour());
+    if (style.GetTextColour().Ok() && style.HasTextColour())
+    {
+        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
+            destStyle.SetTextColour(style.GetTextColour());
+    }

 
 

-    if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-        destStyle.SetBackgroundColour(style.GetBackgroundColour());
+    if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
+    {
+        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
+            destStyle.SetBackgroundColour(style.GetBackgroundColour());
+    }

 
     if (style.HasAlignment())
 
     if (style.HasAlignment())

-        destStyle.SetAlignment(style.GetAlignment());
+    {
+        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
+            destStyle.SetAlignment(style.GetAlignment());
+    }

 
     if (style.HasTabs())
 
     if (style.HasTabs())

-        destStyle.SetTabs(style.GetTabs());
+    {
+        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
+            destStyle.SetTabs(style.GetTabs());
+    }

 
     if (style.HasLeftIndent())
 
     if (style.HasLeftIndent())

-        destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    {
+        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
+                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
+            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    }

 
     if (style.HasRightIndent())
 
     if (style.HasRightIndent())

-        destStyle.SetRightIndent(style.GetRightIndent());
+    {
+        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
+            destStyle.SetRightIndent(style.GetRightIndent());
+    }

 
     if (style.HasParagraphSpacingAfter())
 
     if (style.HasParagraphSpacingAfter())

-        destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    {
+        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
+            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    }

 
     if (style.HasParagraphSpacingBefore())
 
     if (style.HasParagraphSpacingBefore())

-        destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    {
+        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
+            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    }
+
+    if (style.HasLineSpacing())
+    {
+        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
+            destStyle.SetLineSpacing(style.GetLineSpacing());
+    }
+
+    if (style.HasCharacterStyleName())
+    {
+        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
+            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+    }
+
+    if (style.HasParagraphStyleName())
+    {
+        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
+            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    }
+
+    if (style.HasListStyleName())
+    {
+        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
+            destStyle.SetListStyleName(style.GetListStyleName());
+    }
+
+    if (style.HasBulletStyle())
+    {
+        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
+            destStyle.SetBulletStyle(style.GetBulletStyle());
+    }
+
+    if (style.HasBulletText())
+    {
+        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
+        {
+            destStyle.SetBulletText(style.GetBulletText());
+            destStyle.SetBulletFont(style.GetBulletFont());
+        }
+    }
+
+    if (style.HasBulletNumber())
+    {
+        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
+            destStyle.SetBulletNumber(style.GetBulletNumber());
+    }
+
+    if (style.HasBulletName())
+    {
+        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
+            destStyle.SetBulletName(style.GetBulletName());
+    }
+
+    if (style.HasURL())
+    {
+        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
+            destStyle.SetURL(style.GetURL());
+    }
+
+    if (style.HasPageBreak())
+    {
+        if (!(compareWith && compareWith->HasPageBreak()))
+            destStyle.SetPageBreak();
+    }
+
+    return true;
+}
+
+/// Split into paragraph and character styles
+bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle)
+{
+    wxTextAttrEx defaultCharStyle1(style);
+    wxTextAttrEx defaultParaStyle1(style);
+    defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER);
+    defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH);
+
+    wxRichTextApplyStyle(charStyle, defaultCharStyle1);
+    wxRichTextApplyStyle(parStyle, defaultParaStyle1);
+    
+    return true;
+}

 
 

-    if (style.HasLineSpacing())
-        destStyle.SetLineSpacing(style.GetLineSpacing());
+void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font)
+{
+    long flags = attr.GetFlags();
+    attr.SetFont(font);
+    attr.SetFlags(flags);
+}

 
 

-    if (style.HasCharacterStyleName())
-        destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+/// Convert a decimal to Roman numerals
+wxString wxRichTextDecimalToRoman(long n)
+{
+    static wxArrayInt decimalNumbers;
+    static wxArrayString romanNumbers;

 
 

-    if (style.HasParagraphStyleName())
-        destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    // Clean up arrays
+    if (n == -1)
+    {
+        decimalNumbers.Clear();
+        romanNumbers.Clear();
+        return wxEmptyString;
+    }

 
 

-    if (style.HasBulletStyle())
+    if (decimalNumbers.GetCount() == 0)

     {
     {

-        destStyle.SetBulletStyle(style.GetBulletStyle());
-        destStyle.SetBulletSymbol(style.GetBulletSymbol());
+        #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r);
+
+        wxRichTextAddDecRom(1000, wxT("M"));
+        wxRichTextAddDecRom(900, wxT("CM"));
+        wxRichTextAddDecRom(500, wxT("D"));
+        wxRichTextAddDecRom(400, wxT("CD"));
+        wxRichTextAddDecRom(100, wxT("C"));
+        wxRichTextAddDecRom(90, wxT("XC"));
+        wxRichTextAddDecRom(50, wxT("L"));
+        wxRichTextAddDecRom(40, wxT("XL"));
+        wxRichTextAddDecRom(10, wxT("X"));
+        wxRichTextAddDecRom(9, wxT("IX"));
+        wxRichTextAddDecRom(5, wxT("V"));
+        wxRichTextAddDecRom(4, wxT("IV"));
+        wxRichTextAddDecRom(1, wxT("I"));

     }
 
     }
 

-    if (style.HasBulletNumber())
-        destStyle.SetBulletNumber(style.GetBulletNumber());
+    int i = 0;
+    wxString roman;

 
 

-    return true;
+    while (n > 0 && i < 13)
+    {
+        if (n >= decimalNumbers[i])
+        {
+            n -= decimalNumbers[i];
+            roman += romanNumbers[i];
+        }
+        else
+        {
+            i ++;
+        }
+    }
+    if (roman.IsEmpty())
+        roman = wxT("0");
+    return roman;

 }
 
 }
 

-

 /*!
  * wxRichTextAttr stores attributes without a wxFont object, so is a much more
  * efficient way to query styles.
 /*!
  * wxRichTextAttr stores attributes without a wxFont object, so is a much more
  * efficient way to query styles.


@@ -4442,6 +6980,11 @@ wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr)
     (*this) = attr;
 }
 
     (*this) = attr;
 }
 

+wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr)
+{
+    Copy(attr);
+}
+

 // operations
 void wxRichTextAttr::Init()
 {
 // operations
 void wxRichTextAttr::Init()
 {


@@ -4461,11 +7004,10 @@ void wxRichTextAttr::Init()
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;

-    m_bulletSymbol = wxT('*');

 }
 
 }
 

-// operators
-void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
+// Copy
+void wxRichTextAttr::Copy(const wxRichTextAttr& attr)

 {
     m_colText = attr.m_colText;
     m_colBack = attr.m_colBack;
 {
     m_colText = attr.m_colText;
     m_colBack = attr.m_colBack;


@@ -4487,9 +7029,20 @@ void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
     m_lineSpacing = attr.m_lineSpacing;
     m_characterStyleName = attr.m_characterStyleName;
     m_paragraphStyleName = attr.m_paragraphStyleName;
     m_lineSpacing = attr.m_lineSpacing;
     m_characterStyleName = attr.m_characterStyleName;
     m_paragraphStyleName = attr.m_paragraphStyleName;

+    m_listStyleName = attr.m_listStyleName;

     m_bulletStyle = attr.m_bulletStyle;
     m_bulletNumber = attr.m_bulletNumber;
     m_bulletStyle = attr.m_bulletStyle;
     m_bulletNumber = attr.m_bulletNumber;

-    m_bulletSymbol = attr.m_bulletSymbol;
+    m_bulletText = attr.m_bulletText;
+    m_bulletFont = attr.m_bulletFont;
+    m_bulletName = attr.m_bulletName;
+
+    m_urlTarget = attr.m_urlTarget;
+}
+
+// operators
+void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
+{    
+    Copy(attr);

 }
 
 // operators
 }
 
 // operators


@@ -4509,6 +7062,14 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
     m_lineSpacing = attr.GetLineSpacing();
     m_characterStyleName = attr.GetCharacterStyleName();
     m_paragraphStyleName = attr.GetParagraphStyleName();
     m_lineSpacing = attr.GetLineSpacing();
     m_characterStyleName = attr.GetCharacterStyleName();
     m_paragraphStyleName = attr.GetParagraphStyleName();

+    m_listStyleName = attr.GetListStyleName();
+    m_bulletStyle = attr.GetBulletStyle();
+    m_bulletNumber = attr.GetBulletNumber();
+    m_bulletText = attr.GetBulletText();
+    m_bulletName = attr.GetBulletName();
+    m_bulletFont = attr.GetBulletFont();
+
+    m_urlTarget = attr.GetURL();

 
     if (attr.GetFont().Ok())
         GetFontAttributes(attr.GetFont());
 
     if (attr.GetFont().Ok())
         GetFontAttributes(attr.GetFont());


@@ -4522,6 +7083,42 @@ wxRichTextAttr::operator wxTextAttrEx () const
     return attr;
 }
 
     return attr;
 }
 

+// Equality test
+bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
+{
+    return  GetFlags() == attr.GetFlags() &&
+
+            GetTextColour() == attr.GetTextColour() &&
+            GetBackgroundColour() == attr.GetBackgroundColour() &&
+
+            GetAlignment() == attr.GetAlignment() &&
+            GetLeftIndent() == attr.GetLeftIndent() &&
+            GetLeftSubIndent() == attr.GetLeftSubIndent() &&
+            GetRightIndent() == attr.GetRightIndent() &&
+            wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
+
+            GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
+            GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
+            GetLineSpacing() == attr.GetLineSpacing() &&
+            GetCharacterStyleName() == attr.GetCharacterStyleName() &&
+            GetParagraphStyleName() == attr.GetParagraphStyleName() &&
+            GetListStyleName() == attr.GetListStyleName() &&
+
+            GetBulletStyle() == attr.GetBulletStyle() &&
+            GetBulletText() == attr.GetBulletText() &&
+            GetBulletNumber() == attr.GetBulletNumber() &&
+            GetBulletFont() == attr.GetBulletFont() &&
+            GetBulletName() == attr.GetBulletName() &&
+
+            m_fontSize == attr.m_fontSize &&
+            m_fontStyle == attr.m_fontStyle &&
+            m_fontWeight == attr.m_fontWeight &&
+            m_fontUnderlined == attr.m_fontUnderlined &&
+            m_fontFaceName == attr.m_fontFaceName &&
+            
+            m_urlTarget == attr.m_urlTarget;
+}
+

 // Copy to a wxTextAttr
 void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const
 {
 // Copy to a wxTextAttr
 void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const
 {


@@ -4532,23 +7129,31 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const
     attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent());
     attr.SetRightIndent(GetRightIndent());
     attr.SetFont(CreateFont());
     attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent());
     attr.SetRightIndent(GetRightIndent());
     attr.SetFont(CreateFont());

-    attr.SetFlags(GetFlags()); // Important: set after SetFont, since SetFont sets flags

 
     attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter);
     attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore);
     attr.SetLineSpacing(m_lineSpacing);
     attr.SetBulletStyle(m_bulletStyle);
     attr.SetBulletNumber(m_bulletNumber);
 
     attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter);
     attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore);
     attr.SetLineSpacing(m_lineSpacing);
     attr.SetBulletStyle(m_bulletStyle);
     attr.SetBulletNumber(m_bulletNumber);

-    attr.SetBulletSymbol(m_bulletSymbol);
+    attr.SetBulletText(m_bulletText);
+    attr.SetBulletName(m_bulletName);
+    attr.SetBulletFont(m_bulletFont);

     attr.SetCharacterStyleName(m_characterStyleName);
     attr.SetParagraphStyleName(m_paragraphStyleName);
     attr.SetCharacterStyleName(m_characterStyleName);
     attr.SetParagraphStyleName(m_paragraphStyleName);

+    attr.SetListStyleName(m_listStyleName);
+
+    attr.SetURL(m_urlTarget);

 
 

+    attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags

 }
 
 // Create font from font attributes.
 wxFont wxRichTextAttr::CreateFont() const
 {
     wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName);
 }
 
 // Create font from font attributes.
 wxFont wxRichTextAttr::CreateFont() const
 {
     wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName);

+#ifdef __WXMAC__
+    font.SetNoAntiAliasing(true);
+#endif

     return font;
 }
 
     return font;
 }
 


@@ -4567,20 +7172,116 @@ bool wxRichTextAttr::GetFontAttributes(const wxFont& font)
     return true;
 }
 
     return true;
 }
 

+wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr,
+                               const wxRichTextAttr& attrDef,
+                               const wxTextCtrlBase *text)
+{
+    wxColour colFg = attr.GetTextColour();
+    if ( !colFg.Ok() )
+    {
+        colFg = attrDef.GetTextColour();
+
+        if ( text && !colFg.Ok() )
+            colFg = text->GetForegroundColour();
+    }
+
+    wxColour colBg = attr.GetBackgroundColour();
+    if ( !colBg.Ok() )
+    {
+        colBg = attrDef.GetBackgroundColour();
+
+        if ( text && !colBg.Ok() )
+            colBg = text->GetBackgroundColour();
+    }
+
+    wxRichTextAttr newAttr(colFg, colBg);
+
+    if (attr.HasWeight())
+        newAttr.SetFontWeight(attr.GetFontWeight());
+
+    if (attr.HasSize())
+        newAttr.SetFontSize(attr.GetFontSize());
+
+    if (attr.HasItalic())
+        newAttr.SetFontStyle(attr.GetFontStyle());
+
+    if (attr.HasUnderlined())
+        newAttr.SetFontUnderlined(attr.GetFontUnderlined());
+
+    if (attr.HasFaceName())
+        newAttr.SetFontFaceName(attr.GetFontFaceName());
+
+    if (attr.HasAlignment())
+        newAttr.SetAlignment(attr.GetAlignment());
+    else if (attrDef.HasAlignment())
+        newAttr.SetAlignment(attrDef.GetAlignment());
+
+    if (attr.HasTabs())
+        newAttr.SetTabs(attr.GetTabs());
+    else if (attrDef.HasTabs())
+        newAttr.SetTabs(attrDef.GetTabs());
+
+    if (attr.HasLeftIndent())
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
+    else if (attrDef.HasLeftIndent())
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+
+    if (attr.HasRightIndent())
+        newAttr.SetRightIndent(attr.GetRightIndent());
+    else if (attrDef.HasRightIndent())
+        newAttr.SetRightIndent(attrDef.GetRightIndent());
+
+    // NEW ATTRIBUTES
+
+    if (attr.HasParagraphSpacingAfter())
+        newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
+
+    if (attr.HasParagraphSpacingBefore())
+        newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
+
+    if (attr.HasLineSpacing())
+        newAttr.SetLineSpacing(attr.GetLineSpacing());
+
+    if (attr.HasCharacterStyleName())
+        newAttr.SetCharacterStyleName(attr.GetCharacterStyleName());
+
+    if (attr.HasParagraphStyleName())
+        newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
+
+    if (attr.HasListStyleName())
+        newAttr.SetListStyleName(attr.GetListStyleName());
+
+    if (attr.HasBulletStyle())
+        newAttr.SetBulletStyle(attr.GetBulletStyle());
+
+    if (attr.HasBulletNumber())
+        newAttr.SetBulletNumber(attr.GetBulletNumber());
+
+    if (attr.HasBulletName())
+        newAttr.SetBulletName(attr.GetBulletName());
+
+    if (attr.HasBulletText())
+    {
+        newAttr.SetBulletText(attr.GetBulletText());
+        newAttr.SetBulletFont(attr.GetBulletFont());
+    }
+
+    if (attr.HasURL())
+        newAttr.SetURL(attr.GetURL());
+
+    if (attr.HasPageBreak())
+        newAttr.SetPageBreak();
+
+    return newAttr;
+}
+

 /*!
  * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
  */
 
 /*!
  * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
  */
 

-wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr)
+wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr()

 {
 {

-    m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
-    m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
-    m_lineSpacing = attr.m_lineSpacing;
-    m_paragraphStyleName = attr.m_paragraphStyleName;
-    m_characterStyleName = attr.m_characterStyleName;
-    m_bulletStyle = attr.m_bulletStyle;
-    m_bulletNumber = attr.m_bulletNumber;
-    m_bulletSymbol = attr.m_bulletSymbol;
+    Copy(attr);

 }
 
 // Initialise this object.
 }
 
 // Initialise this object.


@@ -4591,12 +7292,10 @@ void wxTextAttrEx::Init()
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;

-    m_bulletSymbol = 0;
-    m_bulletSymbol = wxT('*');

 }
 
 }
 

-// Assignment from a wxTextAttrEx object
-void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
+// Copy
+void wxTextAttrEx::Copy(const wxTextAttrEx& attr)

 {
     wxTextAttr::operator= (attr);
 
 {
     wxTextAttr::operator= (attr);
 


@@ -4605,9 +7304,19 @@ void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
     m_lineSpacing = attr.m_lineSpacing;
     m_characterStyleName = attr.m_characterStyleName;
     m_paragraphStyleName = attr.m_paragraphStyleName;
     m_lineSpacing = attr.m_lineSpacing;
     m_characterStyleName = attr.m_characterStyleName;
     m_paragraphStyleName = attr.m_paragraphStyleName;

+    m_listStyleName = attr.m_listStyleName;

     m_bulletStyle = attr.m_bulletStyle;
     m_bulletNumber = attr.m_bulletNumber;
     m_bulletStyle = attr.m_bulletStyle;
     m_bulletNumber = attr.m_bulletNumber;

-    m_bulletSymbol = attr.m_bulletSymbol;
+    m_bulletText = attr.m_bulletText;
+    m_bulletFont = attr.m_bulletFont;
+    m_bulletName = attr.m_bulletName;
+    m_urlTarget = attr.m_urlTarget;
+}
+
+// Assignment from a wxTextAttrEx object
+void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
+{
+    Copy(attr);

 }
 
 // Assignment from a wxTextAttr object.
 }
 
 // Assignment from a wxTextAttr object.


@@ -4616,6 +7325,184 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr)
     wxTextAttr::operator= (attr);
 }
 
     wxTextAttr::operator= (attr);
 }
 

+// Equality test
+bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
+{
+    return (
+        GetTextColour() == attr.GetTextColour() &&
+        GetBackgroundColour() == attr.GetBackgroundColour() &&
+        GetFont() == attr.GetFont() &&
+        GetAlignment() == attr.GetAlignment() &&
+        GetLeftIndent() == attr.GetLeftIndent() &&
+        GetRightIndent() == attr.GetRightIndent() &&
+        GetLeftSubIndent() == attr.GetLeftSubIndent() &&
+        wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
+        GetLineSpacing() == attr.GetLineSpacing() &&
+        GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
+        GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
+        GetBulletStyle() == attr.GetBulletStyle() &&
+        GetBulletNumber() == attr.GetBulletNumber() &&
+        GetBulletText() == attr.GetBulletText() &&
+        GetBulletName() == attr.GetBulletName() &&
+        GetBulletFont() == attr.GetBulletFont() &&
+        GetCharacterStyleName() == attr.GetCharacterStyleName() &&
+        GetParagraphStyleName() == attr.GetParagraphStyleName() &&
+        GetListStyleName() == attr.GetListStyleName() &&
+        GetURL() == attr.GetURL());
+}
+
+wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
+                               const wxTextAttrEx& attrDef,
+                               const wxTextCtrlBase *text)
+{
+    wxTextAttrEx newAttr;
+
+    // If attr specifies the complete font, just use that font, overriding all
+    // default font attributes.
+    if ((attr.GetFlags() & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT)
+        newAttr.SetFont(attr.GetFont());
+    else
+    {
+        // First find the basic, default font
+        long flags = 0;
+
+        wxFont font;
+        if (attrDef.HasFont())
+        {
+            flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT);
+            font = attrDef.GetFont();
+        }
+        else
+        {
+            if (text)
+                font = text->GetFont();
+
+            // We leave flags at 0 because no font attributes have been specified yet
+        }
+        if (!font.Ok())
+            font = *wxNORMAL_FONT;
+
+        // Otherwise, if there are font attributes in attr, apply them
+        if (attr.GetFlags() & wxTEXT_ATTR_FONT)
+        {
+            if (attr.HasSize())
+            {
+                flags |= wxTEXT_ATTR_FONT_SIZE;
+                font.SetPointSize(attr.GetFont().GetPointSize());
+            }
+            if (attr.HasItalic())
+            {
+                flags |= wxTEXT_ATTR_FONT_ITALIC;;
+                font.SetStyle(attr.GetFont().GetStyle());
+            }
+            if (attr.HasWeight())
+            {
+                flags |= wxTEXT_ATTR_FONT_WEIGHT;
+                font.SetWeight(attr.GetFont().GetWeight());
+            }
+            if (attr.HasFaceName())
+            {
+                flags |= wxTEXT_ATTR_FONT_FACE;
+                font.SetFaceName(attr.GetFont().GetFaceName());
+            }
+            if (attr.HasUnderlined())
+            {
+                flags |= wxTEXT_ATTR_FONT_UNDERLINE;
+                font.SetUnderlined(attr.GetFont().GetUnderlined());
+            }
+            newAttr.SetFont(font);
+            newAttr.SetFlags(newAttr.GetFlags()|flags);
+        }
+    }
+
+    // TODO: should really check we are specifying these in the flags,
+    // before setting them, as per above; or we will set them willy-nilly.
+    // However, we should also check whether this is the intention
+    // as per wxTextAttr::Combine, i.e. always to have valid colours
+    // in the style.
+    wxColour colFg = attr.GetTextColour();
+    if ( !colFg.Ok() )
+    {
+        colFg = attrDef.GetTextColour();
+
+        if ( text && !colFg.Ok() )
+            colFg = text->GetForegroundColour();
+    }
+
+    wxColour colBg = attr.GetBackgroundColour();
+    if ( !colBg.Ok() )
+    {
+        colBg = attrDef.GetBackgroundColour();
+
+        if ( text && !colBg.Ok() )
+            colBg = text->GetBackgroundColour();
+    }
+
+    newAttr.SetTextColour(colFg);
+    newAttr.SetBackgroundColour(colBg);
+
+    if (attr.HasAlignment())
+        newAttr.SetAlignment(attr.GetAlignment());
+    else if (attrDef.HasAlignment())
+        newAttr.SetAlignment(attrDef.GetAlignment());
+
+    if (attr.HasTabs())
+        newAttr.SetTabs(attr.GetTabs());
+    else if (attrDef.HasTabs())
+        newAttr.SetTabs(attrDef.GetTabs());
+
+    if (attr.HasLeftIndent())
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
+    else if (attrDef.HasLeftIndent())
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+
+    if (attr.HasRightIndent())
+        newAttr.SetRightIndent(attr.GetRightIndent());
+    else if (attrDef.HasRightIndent())
+        newAttr.SetRightIndent(attrDef.GetRightIndent());
+
+    // NEW ATTRIBUTES
+
+    if (attr.HasParagraphSpacingAfter())
+        newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
+
+    if (attr.HasParagraphSpacingBefore())
+        newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
+
+    if (attr.HasLineSpacing())
+        newAttr.SetLineSpacing(attr.GetLineSpacing());
+
+    if (attr.HasCharacterStyleName())
+        newAttr.SetCharacterStyleName(attr.GetCharacterStyleName());
+
+    if (attr.HasParagraphStyleName())
+        newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
+
+    if (attr.HasListStyleName())
+        newAttr.SetListStyleName(attr.GetListStyleName());
+
+    if (attr.HasBulletStyle())
+        newAttr.SetBulletStyle(attr.GetBulletStyle());
+
+    if (attr.HasBulletNumber())
+        newAttr.SetBulletNumber(attr.GetBulletNumber());
+
+    if (attr.HasBulletName())
+        newAttr.SetBulletName(attr.GetBulletName());
+
+    if (attr.HasBulletText())
+    {
+        newAttr.SetBulletText(attr.GetBulletText());
+        newAttr.SetBulletFont(attr.GetBulletFont());
+    }
+
+    if (attr.HasURL())
+        newAttr.SetURL(attr.GetURL());
+
+    return newAttr;
+}
+
+

 /*!
  * wxRichTextFileHandler
  * Base class for file handlers
 /*!
  * wxRichTextFileHandler
  * Base class for file handlers


@@ -4623,13 +7510,14 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr)
 
 IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
 
 
 IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
 

+#if wxUSE_STREAMS

 bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
 {
     wxFFileInputStream stream(filename);
     if (stream.Ok())
         return LoadFile(buffer, stream);
 bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
 {
     wxFFileInputStream stream(filename);
     if (stream.Ok())
         return LoadFile(buffer, stream);

-    else
-        return false;
+
+    return false;

 }
 
 bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
 }
 
 bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)


@@ -4637,9 +7525,10 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f
     wxFFileOutputStream stream(filename);
     if (stream.Ok())
         return SaveFile(buffer, stream);
     wxFFileOutputStream stream(filename);
     if (stream.Ok())
         return SaveFile(buffer, stream);

-    else
-        return false;
+
+    return false;

 }
 }

+#endif // wxUSE_STREAMS

 
 /// Can we handle this filename (if using files)? By default, checks the extension.
 bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
 
 /// Can we handle this filename (if using files)? By default, checks the extension.
 bool wxRichTextFileHandler::CanHandle(const wxString& filename) const


@@ -4658,20 +7547,28 @@ bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
 IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS
 IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
 
 #if wxUSE_STREAMS

-bool wxRichTextPlainTextHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)

 {
     if (!stream.IsOk())
         return false;
 
     wxString str;
 {
     if (!stream.IsOk())
         return false;
 
     wxString str;

-    int ch = 0;
+    int lastCh = 0;

 
     while (!stream.Eof())
     {
 
     while (!stream.Eof())
     {

-        ch = stream.GetC();
+        int ch = stream.GetC();
+
+        if (!stream.Eof())
+        {
+            if (ch == 10 && lastCh != 13)
+                str += wxT('\n');

 
 

-        if (ch > 0)
-            str += ch;
+            if (ch > 0 && ch != 10)
+                str += wxChar(ch);
+
+            lastCh = ch;
+        }

     }
 
     buffer->Clear();
     }
 
     buffer->Clear();


@@ -4682,7 +7579,7 @@ bool wxRichTextPlainTextHandler::LoadFile(wxRichTextBuffer *buffer, wxInputStrea
 
 }
 
 
 }
 

-bool wxRichTextPlainTextHandler::SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
+bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)

 {
     if (!stream.IsOk())
         return false;
 {
     if (!stream.IsOk())
         return false;


@@ -4690,11 +7587,10 @@ bool wxRichTextPlainTextHandler::SaveFile(wxRichTextBuffer *buffer, wxOutputStre
     wxString text = buffer->GetText();
     wxCharBuffer buf = text.ToAscii();
 
     wxString text = buffer->GetText();
     wxCharBuffer buf = text.ToAscii();
 

-    stream.Write((const char*) buf, text.Length());
+    stream.Write((const char*) buf, text.length());

     return true;
 }
     return true;
 }

-
-#endif
+#endif // wxUSE_STREAMS

 
 /*
  * Stores information about an image, in binary in-memory form
 
 /*
  * Stores information about an image, in binary in-memory form


@@ -4729,8 +7625,7 @@ void wxRichTextImageBlock::Init()
 
 void wxRichTextImageBlock::Clear()
 {
 
 void wxRichTextImageBlock::Clear()
 {

-    if (m_data)
-        delete m_data;
+    delete[] m_data;

     m_data = NULL;
     m_dataSize = 0;
     m_imageType = -1;
     m_data = NULL;
     m_dataSize = 0;
     m_imageType = -1;


@@ -4748,10 +7643,10 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp
     m_imageType = imageType;
 
     wxString filenameToRead(filename);
     m_imageType = imageType;
 
     wxString filenameToRead(filename);

-    bool removeFile = FALSE;
+    bool removeFile = false;

 
     if (imageType == -1)
 
     if (imageType == -1)

-        return FALSE; // Could not determine image type
+        return false; // Could not determine image type

 
     if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
     {
 
     if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
     {


@@ -4764,13 +7659,13 @@ bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageTyp
 
         image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
         filenameToRead = tempFile;
 
         image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
         filenameToRead = tempFile;

-        removeFile = TRUE;
+        removeFile = true;

 
         m_imageType = wxBITMAP_TYPE_JPEG;
     }
     wxFile file;
     if (!file.Open(filenameToRead))
 
         m_imageType = wxBITMAP_TYPE_JPEG;
     }
     wxFile file;
     if (!file.Open(filenameToRead))

-        return FALSE;
+        return false;

 
     m_dataSize = (size_t) file.Length();
     file.Close();
 
     m_dataSize = (size_t) file.Length();
     file.Close();


@@ -4793,24 +7688,24 @@ bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int qua
     image.SetOption(wxT("quality"), quality);
 
     if (imageType == -1)
     image.SetOption(wxT("quality"), quality);
 
     if (imageType == -1)

-        return FALSE; // Could not determine image type
+        return false; // Could not determine image type

 
     wxString tempFile;
     bool success = wxGetTempFileName(_("image"), tempFile) ;
 
     wxString tempFile;
     bool success = wxGetTempFileName(_("image"), tempFile) ;

-    
+

     wxASSERT(success);
     wxUnusedVar(success);
     wxASSERT(success);
     wxUnusedVar(success);

-    
+

     if (!image.SaveFile(tempFile, m_imageType))
     {
         if (wxFileExists(tempFile))
             wxRemoveFile(tempFile);
     if (!image.SaveFile(tempFile, m_imageType))
     {
         if (wxFileExists(tempFile))
             wxRemoveFile(tempFile);

-        return FALSE;
+        return false;

     }
 
     wxFile file;
     if (!file.Open(tempFile))
     }
 
     wxFile file;
     if (!file.Open(tempFile))

-        return FALSE;
+        return false;

 
     m_dataSize = (size_t) file.Length();
     file.Close();
 
     m_dataSize = (size_t) file.Length();
     file.Close();


@@ -4859,10 +7754,10 @@ void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block)
 bool wxRichTextImageBlock::Load(wxImage& image)
 {
     if (!m_data)
 bool wxRichTextImageBlock::Load(wxImage& image)
 {
     if (!m_data)

-        return FALSE;
+        return false;

 
     // Read in the image.
 
     // Read in the image.

-#if 1
+#if wxUSE_STREAMS

     wxMemoryInputStream mstream(m_data, m_dataSize);
     bool success = image.LoadFile(mstream, GetImageType());
 #else
     wxMemoryInputStream mstream(m_data, m_dataSize);
     bool success = image.LoadFile(mstream, GetImageType());
 #else


@@ -4872,7 +7767,7 @@ bool wxRichTextImageBlock::Load(wxImage& image)
 
     if (!WriteBlock(tempFile, m_data, m_dataSize))
     {
 
     if (!WriteBlock(tempFile, m_data, m_dataSize))
     {

-        return FALSE;
+        return false;

     }
     success = image.LoadFile(tempFile, GetImageType());
     wxRemoveFile(tempFile);
     }
     success = image.LoadFile(tempFile, GetImageType());
     wxRemoveFile(tempFile);


@@ -4890,8 +7785,8 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
     {
         hex = wxDecToHex(m_data[i]);
         wxCharBuffer buf = hex.ToAscii();
     {
         hex = wxDecToHex(m_data[i]);
         wxCharBuffer buf = hex.ToAscii();

-        
-        stream.Write((const char*) buf, hex.Length());
+
+        stream.Write((const char*) buf, hex.length());

     }
 
     return true;
     }
 
     return true;


@@ -4913,7 +7808,7 @@ bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageT
         str[0] = stream.GetC();
         str[1] = stream.GetC();
 
         str[0] = stream.GetC();
         str[1] = stream.GetC();
 

-        m_data[i] = wxHexToDec(str);
+        m_data[i] = (unsigned char)wxHexToDec(str);

     }
 
     m_dataSize = dataSize;
     }
 
     m_dataSize = dataSize;


@@ -4922,7 +7817,6 @@ bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageT
     return true;
 }
 
     return true;
 }
 

-

 // Allocate and read from stream as a block of memory
 unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)
 {
 // Allocate and read from stream as a block of memory
 unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)
 {


@@ -4957,11 +7851,138 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b
 {
     wxFileOutputStream outStream(filename);
     if (!outStream.Ok())
 {
     wxFileOutputStream outStream(filename);
     if (!outStream.Ok())

-        return FALSE;
+        return false;

 
     return WriteBlock(outStream, block, size);
 }
 
 
     return WriteBlock(outStream, block, size);
 }
 

+// Gets the extension for the block's type
+wxString wxRichTextImageBlock::GetExtension() const
+{
+    wxImageHandler* handler = wxImage::FindHandler(GetImageType());
+    if (handler)
+        return handler->GetExtension();
+    else
+        return wxEmptyString;
+}
+
+#if wxUSE_DATAOBJ
+
+/*!
+ * The data object for a wxRichTextBuffer
+ */
+
+const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape");
+
+wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer)
+{
+    m_richTextBuffer = richTextBuffer;
+
+    // this string should uniquely identify our format, but is otherwise
+    // arbitrary
+    m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId());
+
+    SetFormat(m_formatRichTextBuffer);
+}
+
+wxRichTextBufferDataObject::~wxRichTextBufferDataObject()
+{
+    delete m_richTextBuffer;
+}
+
+// after a call to this function, the richTextBuffer is owned by the caller and it
+// is responsible for deleting it!
+wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer()
+{
+    wxRichTextBuffer* richTextBuffer = m_richTextBuffer;
+    m_richTextBuffer = NULL;
+
+    return richTextBuffer;
+}
+
+wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
+{
+    return m_formatRichTextBuffer;
+}
+
+size_t wxRichTextBufferDataObject::GetDataSize() const
+{
+    if (!m_richTextBuffer)
+        return 0;
+
+    wxString bufXML;
+
+    {
+        wxStringOutputStream stream(& bufXML);
+        if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML))
+        {
+            wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler."));
+            return 0;
+        }
+    }
+
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
+    return strlen(buffer) + 1;
+#else
+    return bufXML.Length()+1;

 #endif
 #endif

-    // wxUSE_RICHTEXT
+}
+
+bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const
+{
+    if (!pBuf || !m_richTextBuffer)
+        return false;
+
+    wxString bufXML;
+
+    {
+        wxStringOutputStream stream(& bufXML);
+        if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML))
+        {
+            wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler."));
+            return 0;
+        }
+    }
+
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
+    size_t len = strlen(buffer);
+    memcpy((char*) pBuf, (const char*) buffer, len);
+    ((char*) pBuf)[len] = 0;
+#else
+    size_t len = bufXML.Length();
+    memcpy((char*) pBuf, (const char*) bufXML.c_str(), len);
+    ((char*) pBuf)[len] = 0;
+#endif
+
+    return true;
+}

 
 

+bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+    delete m_richTextBuffer;
+    m_richTextBuffer = NULL;
+
+    wxString bufXML((const char*) buf, wxConvUTF8);
+
+    m_richTextBuffer = new wxRichTextBuffer;
+
+    wxStringInputStream stream(bufXML);
+    if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML))
+    {
+        wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler."));
+
+        delete m_richTextBuffer;
+        m_richTextBuffer = NULL;
+
+        return false;
+    }
+    return true;
+}
+
+#endif
+    // wxUSE_DATAOBJ
+
+#endif
+    // wxUSE_RICHTEXT