]> git.saurik.com Git - wxWidgets.git/blobdiff - src/richtext/richtextbuffer.cpp
Fixed interface typo breaking wxRibbonBar docs (from r72495).
[wxWidgets.git] / src / richtext / richtextbuffer.cpp
index d0eaa2a810c042bb3fdc5452bdc94fb3065b408b..dbeab138df64bbedbf599e1907690113bfd4c17b 100644 (file)
     #include "wx/module.h"
 #endif
 
+#include "wx/settings.h"
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/mstream.h"
 #include "wx/sstream.h"
 #include "wx/textfile.h"
+#include "wx/hashmap.h"
+#include "wx/dynarray.h"
 
 #include "wx/richtext/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"
+#include "wx/richtext/richtextimagedlg.h"
+#include "wx/richtext/richtextsizepage.h"
+#include "wx/richtext/richtextxml.h"
 
 #include "wx/listimpl.cpp"
+#include "wx/arrimpl.cpp"
 
 WX_DEFINE_LIST(wxRichTextObjectList)
 WX_DEFINE_LIST(wxRichTextLineList)
@@ -46,8301 +53,13310 @@ WX_DEFINE_LIST(wxRichTextLineList)
 // Switch off if the platform doesn't like it for some reason
 #define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1
 
+// Use GetPartialTextExtents for platforms that support it natively
+#define wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS 1
+
 const wxChar wxRichTextLineBreakChar = (wxChar) 29;
 
-/*!
- * wxRichTextObject
- * This is the base for drawable objects.
- */
+// Helper classes for floating layout
+struct wxRichTextFloatRectMap
+{
+    wxRichTextFloatRectMap(int sY, int eY, int w, wxRichTextObject* obj)
+    {
+        startY = sY;
+        endY = eY;
+        width = w;
+        anchor = obj;
+    }
 
-IMPLEMENT_CLASS(wxRichTextObject, wxObject)
+    int startY, endY;
+    int width;
+    wxRichTextObject* anchor;
+};
 
-wxRichTextObject::wxRichTextObject(wxRichTextObject* parent)
-{
-    m_dirty = false;
-    m_refCount = 1;
-    m_parent = parent;
-    m_leftMargin = 0;
-    m_rightMargin = 0;
-    m_topMargin = 0;
-    m_bottomMargin = 0;
-    m_descent = 0;
-}
+WX_DEFINE_SORTED_ARRAY(wxRichTextFloatRectMap*, wxRichTextFloatRectMapArray);
 
-wxRichTextObject::~wxRichTextObject()
+int wxRichTextFloatRectMapCmp(wxRichTextFloatRectMap* r1, wxRichTextFloatRectMap* r2)
 {
+    return r1->startY - r2->startY;
 }
 
-void wxRichTextObject::Dereference()
+class wxRichTextFloatCollector
 {
-    m_refCount --;
-    if (m_refCount <= 0)
-        delete this;
-}
+public:
+    wxRichTextFloatCollector(const wxRect& availableRect);
+    ~wxRichTextFloatCollector();
 
-/// Copy
-void wxRichTextObject::Copy(const wxRichTextObject& obj)
-{
-    m_size = obj.m_size;
-    m_pos = obj.m_pos;
-    m_dirty = obj.m_dirty;
-    m_range = obj.m_range;
-    m_attributes = obj.m_attributes;
-    m_descent = obj.m_descent;
-}
+    // Collect the floating objects info in the given paragraph
+    void CollectFloat(wxRichTextParagraph* para);
+    void CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating);
 
-void wxRichTextObject::SetMargins(int margin)
+    // Return the last paragraph we collected
+    wxRichTextParagraph* LastParagraph();
+
+    // Given the start y position and the height of the line,
+    // find out how wide the line can be
+    wxRect GetAvailableRect(int startY, int endY);
+
+    // Given a floating box, find its fit position
+    int GetFitPosition(int direction, int start, int height) const;
+    int GetFitPosition(const wxRichTextFloatRectMapArray& array, int start, int height) const;
+
+    // Find the last y position
+    int GetLastRectBottom();
+
+    // Draw the floats inside a rect
+    void Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
+
+    // HitTest the floats
+    int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags);
+
+    // Get floating object count
+    int GetFloatingObjectCount() const { return m_left.GetCount() + m_right.GetCount(); }
+
+    // Get floating objects
+    bool GetFloatingObjects(wxRichTextObjectList& objects) const;
+
+    // Delete a float
+    bool DeleteFloat(wxRichTextObject* obj);
+
+    // Do we have this float already?
+    bool HasFloat(wxRichTextObject* obj);
+
+    bool HasFloats() const { return m_left.GetCount() >0 || m_right.GetCount() > 0; }
+
+    static int SearchAdjacentRect(const wxRichTextFloatRectMapArray& array, int point);
+
+    static int GetWidthFromFloatRect(const wxRichTextFloatRectMapArray& array, int index, int startY, int endY);
+
+    static void FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array);
+
+    static void DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
+
+    static int HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags);
+
+private:
+    wxRichTextFloatRectMapArray m_left;
+    wxRichTextFloatRectMapArray m_right;
+    //int m_width;
+    wxRect               m_availableRect;
+    wxRichTextParagraph* m_para;
+};
+
+// Delete a float
+bool wxRichTextFloatCollector::DeleteFloat(wxRichTextObject* obj)
 {
-    m_leftMargin = m_rightMargin = m_topMargin = m_bottomMargin = margin;
+    size_t i;
+    for (i = 0; i < m_left.GetCount(); i++)
+    {
+        if (m_left[i]->anchor == obj)
+        {
+            m_left.RemoveAt(i);
+            return true;
+        }
+    }
+    for (i = 0; i < m_right.GetCount(); i++)
+    {
+        if (m_right[i]->anchor == obj)
+        {
+            m_right.RemoveAt(i);
+            return true;
+        }
+    }
+    return false;
 }
 
-void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin, int bottomMargin)
+// Do we have this float already?
+bool wxRichTextFloatCollector::HasFloat(wxRichTextObject* obj)
 {
-    m_leftMargin = leftMargin;
-    m_rightMargin = rightMargin;
-    m_topMargin = topMargin;
-    m_bottomMargin = bottomMargin;
+    size_t i;
+    for (i = 0; i < m_left.GetCount(); i++)
+    {
+        if (m_left[i]->anchor == obj)
+        {
+            return true;
+        }
+    }
+    for (i = 0; i < m_right.GetCount(); i++)
+    {
+        if (m_right[i]->anchor == obj)
+        {
+            return true;
+        }
+    }
+    return false;
 }
 
-// Convert units in tenths of a millimetre to device units
-int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units)
+// Get floating objects
+bool wxRichTextFloatCollector::GetFloatingObjects(wxRichTextObjectList& objects) const
 {
-    int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units);
-
-    // Unscale
-    wxRichTextBuffer* buffer = GetBuffer();
-    if (buffer)
-        p = (int) ((double)p / buffer->GetScale());
-    return p;
+    size_t i;
+    for (i = 0; i < m_left.GetCount(); i++)
+        objects.Append(m_left[i]->anchor);
+    for (i = 0; i < m_right.GetCount(); i++)
+        objects.Append(m_right[i]->anchor);
+    return true;
 }
 
-// Convert units in tenths of a millimetre to device units
-int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units)
+
+/*
+ * Binary search helper function
+ * The argument point is the Y coordinate, and this fuction
+ * always return the floating rect that contain this coordinate
+ * or under this coordinate.
+ */
+int wxRichTextFloatCollector::SearchAdjacentRect(const wxRichTextFloatRectMapArray& array, int point)
 {
-    // There are ppi pixels in 254.1 "1/10 mm"
+    int end = array.GetCount() - 1;
+    int start = 0;
+    int ret = 0;
 
-    double pixels = ((double) units * (double)ppi) / 254.1;
+    wxASSERT(end >= 0);
 
-    return (int) pixels;
-}
+    while (true)
+    {
+        if (start > end)
+        {
+            break;
+        }
 
-/// Dump to output stream for debugging
-void wxRichTextObject::Dump(wxTextOutputStream& stream)
-{
-    stream << GetClassInfo()->GetClassName() << wxT("\n");
-    stream << wxString::Format(wxT("Size: %d,%d. Position: %d,%d, Range: %ld,%ld"), m_size.x, m_size.y, m_pos.x, m_pos.y, m_range.GetStart(), m_range.GetEnd()) << 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");
+        int mid = (start + end) / 2;
+        if (array[mid]->startY <= point && array[mid]->endY >= point)
+            return mid;
+        else if (array[mid]->startY > point)
+        {
+            end = mid - 1;
+            ret = mid;
+        }
+        else if (array[mid]->endY < point)
+        {
+            start = mid + 1;
+            ret = start;
+        }
+    }
+
+    return ret;
 }
 
-/// Gets the containing buffer
-wxRichTextBuffer* wxRichTextObject::GetBuffer() const
+int wxRichTextFloatCollector::GetWidthFromFloatRect(const wxRichTextFloatRectMapArray& array, int index, int startY, int endY)
 {
-    const wxRichTextObject* obj = this;
-    while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer)))
-        obj = obj->GetParent();
-    return wxDynamicCast(obj, wxRichTextBuffer);
-}
+    int ret = 0;
+    int len = array.GetCount();
 
-/*!
- * wxRichTextCompositeObject
- * This is the base for drawable objects.
- */
+    wxASSERT(index >= 0 && index < len);
 
-IMPLEMENT_CLASS(wxRichTextCompositeObject, wxRichTextObject)
+    if (array[index]->startY < startY && array[index]->endY > startY)
+        ret = ret < array[index]->width ? array[index]->width : ret;
+    while (index < len && array[index]->startY <= endY)
+    {
+        ret = ret < array[index]->width ? array[index]->width : ret;
+        index++;
+    }
 
-wxRichTextCompositeObject::wxRichTextCompositeObject(wxRichTextObject* parent):
-    wxRichTextObject(parent)
-{
+    return ret;
 }
 
-wxRichTextCompositeObject::~wxRichTextCompositeObject()
+wxRichTextFloatCollector::wxRichTextFloatCollector(const wxRect& rect) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp)
 {
-    DeleteChildren();
+    m_availableRect = rect;
+    m_para = NULL;
 }
 
-/// Get the nth child
-wxRichTextObject* wxRichTextCompositeObject::GetChild(size_t n) const
+void wxRichTextFloatCollector::FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array)
 {
-    wxASSERT ( n < m_children.GetCount() );
-
-    return m_children.Item(n)->GetData();
+    int len = array.GetCount();
+    for (int i = 0; i < len; i++)
+        delete array[i];
 }
 
-/// Append a child, returning the position
-size_t wxRichTextCompositeObject::AppendChild(wxRichTextObject* child)
+wxRichTextFloatCollector::~wxRichTextFloatCollector()
 {
-    m_children.Append(child);
-    child->SetParent(this);
-    return m_children.GetCount() - 1;
+    FreeFloatRectMapArray(m_left);
+    FreeFloatRectMapArray(m_right);
 }
 
-/// Insert the child in front of the given object, or at the beginning
-bool wxRichTextCompositeObject::InsertChild(wxRichTextObject* child, wxRichTextObject* inFrontOf)
+int wxRichTextFloatCollector::GetFitPosition(const wxRichTextFloatRectMapArray& array, int start, int height) const
 {
-    if (inFrontOf)
+    if (array.GetCount() == 0)
+        return start;
+
+    int i = SearchAdjacentRect(array, start);
+    int last = start;
+    while (i < (int) array.GetCount())
     {
-        wxRichTextObjectList::compatibility_iterator node = m_children.Find(inFrontOf);
-        m_children.Insert(node, child);
+        if (array[i]->startY - last >= height)
+            return last + 1;
+        last = array[i]->endY;
+        i++;
     }
-    else
-        m_children.Insert(child);
-    child->SetParent(this);
 
-    return true;
+    return last + 1;
 }
 
-/// Delete the child
-bool wxRichTextCompositeObject::RemoveChild(wxRichTextObject* child, bool deleteChild)
+int wxRichTextFloatCollector::GetFitPosition(int direction, int start, int height) const
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.Find(child);
-    if (node)
+    if (direction == wxTEXT_BOX_ATTR_FLOAT_LEFT)
+        return GetFitPosition(m_left, start, height);
+    else if (direction == wxTEXT_BOX_ATTR_FLOAT_RIGHT)
+        return GetFitPosition(m_right, start, height);
+    else
     {
-        wxRichTextObject* obj = node->GetData();
-        m_children.Erase(node);
-        if (deleteChild)
-            delete obj;
+        wxASSERT("Never should be here");
+        return start;
+    }
+}
 
-        return true;
+// Adds a floating image to the float collector.
+// The actual positioning is done by wxRichTextParagraph::LayoutFloat.
+void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating)
+{
+    int direction = floating->GetFloatDirection();
+
+    wxPoint pos = floating->GetPosition();
+    wxSize size = floating->GetCachedSize();
+    wxRichTextFloatRectMap *map = new wxRichTextFloatRectMap(pos.y, pos.y + size.y, size.x, floating);
+    switch (direction)
+    {
+        case wxTEXT_BOX_ATTR_FLOAT_NONE:
+            delete map;
+            break;
+        case wxTEXT_BOX_ATTR_FLOAT_LEFT:
+            // Just a not-enough simple assertion
+            wxASSERT (m_left.Index(map) == wxNOT_FOUND);
+            m_left.Add(map);
+            break;
+        case wxTEXT_BOX_ATTR_FLOAT_RIGHT:
+            wxASSERT (m_right.Index(map) == wxNOT_FOUND);
+            m_right.Add(map);
+            break;
+        default:
+            delete map;
+            wxASSERT("Unrecognised float attribute.");
     }
-    return false;
+
+    m_para = para;
 }
 
-/// Delete all children
-bool wxRichTextCompositeObject::DeleteChildren()
+void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();
     while (node)
     {
-        wxRichTextObjectList::compatibility_iterator oldNode = node;
+        wxRichTextObject* floating = node->GetData();
 
-        wxRichTextObject* child = node->GetData();
-        child->Dereference(); // Only delete if reference count is zero
+        if (floating->IsFloating())
+        {
+            CollectFloat(para, floating);
+        }
 
         node = node->GetNext();
-        m_children.Erase(oldNode);
     }
 
-    return true;
+    m_para = para;
 }
 
-/// Get the child count
-size_t wxRichTextCompositeObject::GetChildCount() const
+wxRichTextParagraph* wxRichTextFloatCollector::LastParagraph()
 {
-    return m_children.GetCount();
+    return m_para;
 }
 
-/// Copy
-void wxRichTextCompositeObject::Copy(const wxRichTextCompositeObject& obj)
+wxRect wxRichTextFloatCollector::GetAvailableRect(int startY, int endY)
 {
-    wxRichTextObject::Copy(obj);
-
-    DeleteChildren();
-
-    wxRichTextObjectList::compatibility_iterator node = obj.m_children.GetFirst();
-    while (node)
+    int widthLeft = 0, widthRight = 0;
+    if (m_left.GetCount() != 0)
     {
-        wxRichTextObject* child = node->GetData();
-        wxRichTextObject* newChild = child->Clone();
-        newChild->SetParent(this);
-        m_children.Append(newChild);
+        int i = SearchAdjacentRect(m_left, startY);
+        if (i < (int) m_left.GetCount())
+            widthLeft = GetWidthFromFloatRect(m_left, i, startY, endY);
+    }
+    if (m_right.GetCount() != 0)
+    {
+        int j = SearchAdjacentRect(m_right, startY);
+        if (j < (int) m_right.GetCount())
+            widthRight = GetWidthFromFloatRect(m_right, j, startY, endY);
+    }
 
-        node = node->GetNext();
+    // TODO: actually we want to use the actual image positions to find the
+    // available remaining space, since the image might not be right up against
+    // the left or right edge of the container.
+    return wxRect(widthLeft + m_availableRect.x, 0, m_availableRect.width - widthLeft - widthRight, 0);
+}
+
+int wxRichTextFloatCollector::GetLastRectBottom()
+{
+    int ret = 0;
+    int len = m_left.GetCount();
+    if (len) {
+        ret = ret > m_left[len-1]->endY ? ret : m_left[len-1]->endY;
+    }
+    len = m_right.GetCount();
+    if (len) {
+        ret = ret > m_right[len-1]->endY ? ret : m_right[len-1]->endY;
     }
+
+    return ret;
 }
 
-/// Hit-testing: returns a flag indicating hit test details, plus
-/// information about position
-int wxRichTextCompositeObject::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+void wxRichTextFloatCollector::DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    int start = rect.y;
+    int end = rect.y + rect.height;
+    int i, j;
+    i = SearchAdjacentRect(array, start);
+    if (i < 0 || i >= (int) array.GetCount())
+        return;
+    j = SearchAdjacentRect(array, end);
+    if (j < 0 || j >= (int) array.GetCount())
+        j = array.GetCount() - 1;
+    while (i <= j)
     {
-        wxRichTextObject* child = node->GetData();
+        wxRichTextObject* obj = array[i]->anchor;
+        wxRichTextRange r = obj->GetRange();
+        obj->Draw(dc, context, r, selection, wxRect(obj->GetPosition(), obj->GetCachedSize()), descent, style);
+        i++;
+    }
+}
 
-        int ret = child->HitTest(dc, pt, textPosition);
-        if (ret != wxRICHTEXT_HITTEST_NONE)
-            return ret;
+void wxRichTextFloatCollector::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+    if (m_left.GetCount() > 0)
+        DrawFloat(m_left, dc, context, range, selection, rect, descent, style);
+    if (m_right.GetCount() > 0)
+        DrawFloat(m_right, dc, context, range, selection, rect, descent, style);
+}
 
-        node = node->GetNext();
+int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int WXUNUSED(flags))
+{
+    int i;
+    if (array.GetCount() == 0)
+        return wxRICHTEXT_HITTEST_NONE;
+    i = SearchAdjacentRect(array, pt.y);
+    if (i < 0 || i >= (int) array.GetCount())
+        return wxRICHTEXT_HITTEST_NONE;
+    if (!array[i]->anchor->IsShown())
+        return wxRICHTEXT_HITTEST_NONE;
+
+    wxPoint point = array[i]->anchor->GetPosition();
+    wxSize size = array[i]->anchor->GetCachedSize();
+    if (point.x <= pt.x && point.x + size.x >= pt.x
+        && point.y <= pt.y && point.y + size.y >= pt.y)
+    {
+        textPosition = array[i]->anchor->GetRange().GetStart();
+        * obj = array[i]->anchor;
+        if (pt.x > (pt.x + pt.x + size.x) / 2)
+            return wxRICHTEXT_HITTEST_BEFORE;
+        else
+            return wxRICHTEXT_HITTEST_AFTER;
     }
 
     return wxRICHTEXT_HITTEST_NONE;
 }
 
-/// Finds the absolute position and row height for the given character position
-bool wxRichTextCompositeObject::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart)
+int wxRichTextFloatCollector::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, int flags)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    int ret = HitTestFloat(m_left, dc, context, pt, textPosition, obj, flags);
+    if (ret == wxRICHTEXT_HITTEST_NONE)
     {
-        wxRichTextObject* child = node->GetData();
-
-        if (child->FindPosition(dc, index, pt, height, forceLineStart))
-            return true;
-
-        node = node->GetNext();
+        ret = HitTestFloat(m_right, dc, context, pt, textPosition, obj, flags);
     }
-
-    return false;
+    return ret;
 }
 
-/// Calculate range
-void wxRichTextCompositeObject::CalculateRange(long start, long& end)
+// Helpers for efficiency
+inline void wxCheckSetFont(wxDC& dc, const wxFont& font)
 {
-    long current = start;
-    long lastEnd = current;
+    dc.SetFont(font);
+}
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+inline void wxCheckSetPen(wxDC& dc, const wxPen& pen)
+{
+    const wxPen& pen1 = dc.GetPen();
+    if (pen1.IsOk() && pen.IsOk())
     {
-        wxRichTextObject* child = node->GetData();
-        long childEnd = 0;
-
-        child->CalculateRange(current, childEnd);
-        lastEnd = childEnd;
-
-        current = childEnd + 1;
-
-        node = node->GetNext();
+        if (pen1.GetWidth() == pen.GetWidth() &&
+            pen1.GetStyle() == pen.GetStyle() &&
+            pen1.GetColour() == pen.GetColour())
+            return;
     }
-
-    end = lastEnd;
-
-    // An object with no children has zero length
-    if (m_children.GetCount() == 0)
-        end --;
-
-    m_range.SetRange(start, end);
+    dc.SetPen(pen);
 }
 
-/// Delete range from layout.
-bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
+inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-
-    while (node)
+    const wxBrush& brush1 = dc.GetBrush();
+    if (brush1.IsOk() && brush.IsOk())
     {
-        wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
-        wxRichTextObjectList::compatibility_iterator next = node->GetNext();
+        if (brush1.GetStyle() == brush.GetStyle() &&
+            brush1.GetColour() == brush.GetColour())
+            return;
+    }
+    dc.SetBrush(brush);
+}
 
-        // Delete the range in each paragraph
-
-        // When a chunk has been deleted, internally the content does not
-        // now match the ranges.
-        // However, so long as deletion is not done on the same object twice this is OK.
-        // 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);
-
-            // Delete an empty object, or paragraph within this range.
-            if (obj->IsEmpty() ||
-                (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd()))
-            {
-                // An empty paragraph has length 1, so won't be deleted unless the
-                // whole range is deleted.
-                RemoveChild(obj, true);
-            }
-        }
+/*!
+ * wxRichTextObject
+ * This is the base for drawable objects.
+ */
 
-        node = next;
-    }
+IMPLEMENT_CLASS(wxRichTextObject, wxObject)
 
-    return true;
+wxRichTextObject::wxRichTextObject(wxRichTextObject* parent)
+{
+    m_refCount = 1;
+    m_parent = parent;
+    m_descent = 0;
+    m_show = true;
 }
 
-/// Get any text in this object for the given range
-wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range) const
+wxRichTextObject::~wxRichTextObject()
 {
-    wxString text;
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        wxRichTextRange childRange = range;
-        if (!child->GetRange().IsOutside(range))
-        {
-            childRange.LimitTo(child->GetRange());
-
-            wxString childText = child->GetTextForRange(childRange);
+}
 
-            text += childText;
-        }
-        node = node->GetNext();
-    }
+void wxRichTextObject::Dereference()
+{
+    m_refCount --;
+    if (m_refCount <= 0)
+        delete this;
+}
 
-    return text;
+/// Copy
+void wxRichTextObject::Copy(const wxRichTextObject& obj)
+{
+    m_size = obj.m_size;
+    m_maxSize = obj.m_maxSize;
+    m_minSize = obj.m_minSize;
+    m_pos = obj.m_pos;
+    m_range = obj.m_range;
+    m_ownRange = obj.m_ownRange;
+    m_attributes = obj.m_attributes;
+    m_properties = obj.m_properties;
+    m_descent = obj.m_descent;
+    m_show = obj.m_show;
 }
 
-/// Recursively merge all pieces that can be merged.
-bool wxRichTextCompositeObject::Defragment()
+// Get/set the top-level container of this object.
+wxRichTextParagraphLayoutBox* wxRichTextObject::GetContainer() const
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    const wxRichTextObject* p = this;
+    while (p)
     {
-        wxRichTextObject* child = node->GetData();
-        wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
-        if (composite)
-            composite->Defragment();
-
-        if (node->GetNext())
+        if (p->IsTopLevel())
         {
-            wxRichTextObject* nextChild = node->GetNext()->GetData();
-            if (child->CanMerge(nextChild) && child->Merge(nextChild))
-            {
-                nextChild->Dereference();
-                m_children.Erase(node->GetNext());
-
-                // Don't set node -- we'll see if we can merge again with the next
-                // child.
-            }
-            else
-                node = node->GetNext();
+            return wxDynamicCast(p, wxRichTextParagraphLayoutBox);
         }
-        else
-            node = node->GetNext();
+        p = p->GetParent();
     }
-
-    return true;
+    return NULL;
 }
 
-/// Dump to output stream for debugging
-void wxRichTextCompositeObject::Dump(wxTextOutputStream& stream)
+void wxRichTextObject::SetMargins(int margin)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        child->Dump(stream);
-        node = node->GetNext();
-    }
+    SetMargins(margin, margin, margin, margin);
 }
 
-
-/*!
- * wxRichTextBox
- * This defines a 2D space to lay out objects
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject)
-
-wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
-    wxRichTextCompositeObject(parent)
+void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin, int bottomMargin)
 {
+    GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().SetValue(leftMargin, wxTEXT_ATTR_UNITS_PIXELS);
+    GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(rightMargin, wxTEXT_ATTR_UNITS_PIXELS);
+    GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(topMargin, wxTEXT_ATTR_UNITS_PIXELS);
+    GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(bottomMargin, wxTEXT_ATTR_UNITS_PIXELS);
 }
 
-/// Draw the item
-bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style)
+int wxRichTextObject::GetLeftMargin() const
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
+    return GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().GetValue();
+}
 
-        wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize());
-        child->Draw(dc, range, selectionRange, childRect, descent, style);
+int wxRichTextObject::GetRightMargin() const
+{
+    return GetAttributes().GetTextBoxAttr().GetMargins().GetRight().GetValue();
+}
 
-        node = node->GetNext();
-    }
-    return true;
+int wxRichTextObject::GetTopMargin() const
+{
+    return GetAttributes().GetTextBoxAttr().GetMargins().GetTop().GetValue();
 }
 
-/// Lay the item out
-bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
+int wxRichTextObject::GetBottomMargin() const
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        child->Layout(dc, rect, style);
+    return GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().GetValue();
+}
 
-        node = node->GetNext();
-    }
-    m_dirty = false;
-    return true;
+// Calculate the available content space in the given rectangle, given the
+// margins, border and padding specified in the object's attributes.
+wxRect wxRichTextObject::GetAvailableContentArea(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& outerRect) const
+{
+    wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+    marginRect = outerRect;
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, (wxRichTextObject*) this);
+    GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+    return contentRect;
 }
 
-/// 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, wxPoint position) const
+// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextObject::Invalidate(const wxRichTextRange& invalidRange)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    if (node)
+    if (invalidRange != wxRICHTEXT_NONE)
     {
-        wxRichTextObject* child = node->GetData();
-        return child->GetRangeSize(range, size, descent, dc, flags, position);
+        // If this is a floating object, size may not be recalculated
+        // after floats have been collected in an early stage of Layout.
+        // So avoid resetting the cache for floating objects during layout.
+        if (!IsFloating())
+            SetCachedSize(wxDefaultSize);
+        SetMaxSize(wxDefaultSize);
+        SetMinSize(wxDefaultSize);
     }
-    else
-        return false;
 }
 
-/// Copy
-void wxRichTextBox::Copy(const wxRichTextBox& obj)
+// Convert units in tenths of a millimetre to device units
+int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) const
 {
-    wxRichTextCompositeObject::Copy(obj);
+    // Unscale
+    double scale = 1.0;
+    if (GetBuffer())
+        scale = GetBuffer()->GetScale() / GetBuffer()->GetDimensionScale();
+    int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units, scale);
+
+    return p;
 }
 
+// Convert units in tenths of a millimetre to device units
+int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units, double scale)
+{
+    // There are ppi pixels in 254.1 "1/10 mm"
 
-/*!
- * wxRichTextParagraphLayoutBox
- * This box knows how to lay out paragraphs.
- */
+    double pixels = ((double) units * (double)ppi) / 254.1;
+    if (scale != 1.0)
+        pixels /= scale;
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextBox)
+    // If the result is very small, make it at least one pixel in size.
+    if (pixels == 0 && units > 0)
+        pixels = 1;
 
-wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
-    wxRichTextBox(parent)
-{
-    Init();
+    return (int) pixels;
 }
 
-/// Initialize the object.
-void wxRichTextParagraphLayoutBox::Init()
+// Convert units in pixels to tenths of a millimetre
+int wxRichTextObject::ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const
 {
-    m_ctrl = NULL;
+    int p = pixels;
+    double scale = 1.0;
+    if (GetBuffer())
+        scale = GetBuffer()->GetScale();
 
-    // 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_partialParagraph = false;
+    return ConvertPixelsToTenthsMM(dc.GetPPI().x, p, scale);
 }
 
-/// Draw the item
-bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)
+int wxRichTextObject::ConvertPixelsToTenthsMM(int ppi, int pixels, double scale)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
+    // There are ppi pixels in 254.1 "1/10 mm"
 
-        if (child && !child->GetRange().IsOutside(range))
-        {
-            wxRect childRect(child->GetPosition(), child->GetCachedSize());
+    double p = double(pixels);
 
-            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
-                child->Draw(dc, range, selectionRange, childRect, descent, style);
-        }
+    if (scale != 1.0)
+        p *= scale;
 
-        node = node->GetNext();
-    }
-    return true;
+    int units = int( p * 254.1 / (double) ppi );
+    return units;
 }
 
-/// Lay the item out
-bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style)
+// Draw the borders and background for the given rectangle and attributes.
+// Width and height are taken to be the outer margin size, not the content.
+bool wxRichTextObject::DrawBoxAttributes(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, const wxRect& boxRect, int flags)
 {
-    wxRect availableSpace;
-    bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
+    // Assume boxRect is the area around the content
+    wxRect marginRect = boxRect;
+    wxRect contentRect, borderRect, paddingRect, outlineRect;
 
-    // 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)
+    GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+    // Margin is transparent. Draw background from margin.
+    if (attr.HasBackgroundColour() || (flags & wxRICHTEXT_DRAW_SELECTED))
     {
-        availableSpace = wxRect(0 + m_leftMargin,
-                          0 + m_topMargin,
-                          rect.width - m_leftMargin - m_rightMargin,
-                          rect.height);
+        wxColour colour;
+        if (flags & wxRICHTEXT_DRAW_SELECTED)
+        {
+            // TODO: get selection colour from control?
+            colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+        }
+        else
+            colour = attr.GetBackgroundColour();
 
-        // 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();
+        wxPen pen(colour);
+        wxBrush brush(colour);
 
-        Invalidate(wxRichTextRange(startPos, GetRange().GetEnd()));
+        dc.SetPen(pen);
+        dc.SetBrush(brush);
+        dc.DrawRectangle(borderRect);
     }
-    else
-        availableSpace = wxRect(rect.x + m_leftMargin,
-                          rect.y + m_topMargin,
-                          rect.width - m_leftMargin - m_rightMargin,
-                          rect.height - m_topMargin - m_bottomMargin);
 
-    int maxWidth = 0;
+    if (flags & wxRICHTEXT_DRAW_GUIDELINES)
+    {
+        wxRichTextAttr editBorderAttr = attr;
+        // TODO: make guideline colour configurable
+        editBorderAttr.GetTextBoxAttr().GetBorder().SetColour(*wxLIGHT_GREY);
+        editBorderAttr.GetTextBoxAttr().GetBorder().SetWidth(1, wxTEXT_ATTR_UNITS_PIXELS);
+        editBorderAttr.GetTextBoxAttr().GetBorder().SetStyle(wxTEXT_BOX_ATTR_BORDER_SOLID);
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+        DrawBorder(dc, buffer, editBorderAttr.GetTextBoxAttr().GetBorder(), borderRect, flags);
+    }
 
-    bool layoutAll = true;
+    if (attr.GetTextBoxAttr().GetBorder().IsValid())
+        DrawBorder(dc, buffer, attr.GetTextBoxAttr().GetBorder(), borderRect);
 
-    // Get invalid range, rounding to paragraph start/end.
-    wxRichTextRange invalidRange = GetInvalidRange(true);
+    if (attr.GetTextBoxAttr().GetOutline().IsValid())
+        DrawBorder(dc, buffer, attr.GetTextBoxAttr().GetOutline(), outlineRect);
 
-    if (invalidRange == wxRICHTEXT_NONE && !formatRect)
-        return true;
+    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())
+// Draw a border
+bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTextAttrBorders& attr, const wxRect& rect, int WXUNUSED(flags))
+{
+    int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0;
+    wxTextAttrDimensionConverter converter(dc, buffer ? buffer->GetScale() : 1.0);
+
+    if (attr.GetLeft().IsValid() && attr.GetLeft().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
     {
-        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;
+        borderLeft = converter.GetPixels(attr.GetLeft().GetWidth());
+        wxColour col(attr.GetLeft().GetColour());
 
-                // Now we're going to start iterating from the first affected paragraph.
-                node = firstNode;
+        // If pen width is > 1, resorts to a solid rectangle.
+        if (borderLeft == 1)
+        {
+            int penStyle = wxSOLID;
+            if (attr.GetLeft().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED)
+                penStyle = wxDOT;
+            else if (attr.GetLeft().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
+                penStyle = wxLONG_DASH;
+            wxPen pen(col, 1, penStyle);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
 
-                layoutAll = false;
-            }
+        }
+        else if (borderLeft > 1)
+        {
+            wxPen pen(col);
+            wxBrush brush(col);
+            dc.SetPen(pen);
+            dc.SetBrush(brush);
+            dc.DrawRectangle(rect.x, rect.y, borderLeft, rect.height);
         }
     }
 
-    // A way to force speedy rest-of-buffer layout (the 'else' below)
-    bool forceQuickLayout = false;
-
-    while (node)
+    if (attr.GetRight().IsValid() && attr.GetRight().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
     {
-        // Assume this box only contains paragraphs
+        borderRight = converter.GetPixels(attr.GetRight().GetWidth());
 
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxCHECK_MSG( child, false, _T("Unknown object in layout") );
+        wxColour col(attr.GetRight().GetColour());
 
-        // 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)) )
+        // If pen width is > 1, resorts to a solid rectangle.
+        if (borderRight == 1)
         {
-            child->Layout(dc, availableSpace, style);
-
-            // Layout must set the cached size
-            availableSpace.y += child->GetCachedSize().y;
-            maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+            int penStyle = wxSOLID;
+            if (attr.GetRight().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED)
+                penStyle = wxDOT;
+            else if (attr.GetRight().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
+                penStyle = wxLONG_DASH;
+            wxPen pen(col, 1, penStyle);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height + 1);
 
-            // 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
+        else if (borderRight > 1)
         {
-            // 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.
+            wxPen pen(col);
+            wxBrush brush(col);
+            dc.SetPen(pen);
+            dc.SetBrush(brush);
+            dc.DrawRectangle(rect.x + rect.width - borderRight, rect.y, borderRight, rect.height);
+        }
+    }
 
-            int inc = availableSpace.y - child->GetPosition().y;
+    if (attr.GetTop().IsValid() && attr.GetTop().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
+    {
+        borderTop = converter.GetPixels(attr.GetTop().GetWidth());
 
-            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));
+        wxColour col(attr.GetTop().GetColour());
 
-                    availableSpace.y += child->GetCachedSize().y;
-                    maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
-                }
+        // If pen width is > 1, resorts to a solid rectangle.
+        if (borderTop == 1)
+        {
+            int penStyle = wxSOLID;
+            if (attr.GetTop().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED)
+                penStyle = wxDOT;
+            else if (attr.GetTop().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
+                penStyle = wxLONG_DASH;
+            wxPen pen(col, 1, penStyle);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y);
 
-                node = node->GetNext();
-            }
-            break;
         }
+        else if (borderTop > 1)
+        {
+            wxPen pen(col);
+            wxBrush brush(col);
+            dc.SetPen(pen);
+            dc.SetBrush(brush);
+            dc.DrawRectangle(rect.x, rect.y, rect.width, borderTop);
+        }
+    }
 
-        node = node->GetNext();
+    if (attr.GetBottom().IsValid() && attr.GetBottom().GetStyle() != wxTEXT_BOX_ATTR_BORDER_NONE)
+    {
+        borderBottom = converter.GetPixels(attr.GetBottom().GetWidth());
+        wxColour col(attr.GetTop().GetColour());
+
+        // If pen width is > 1, resorts to a solid rectangle.
+        if (borderBottom == 1)
+        {
+            int penStyle = wxSOLID;
+            if (attr.GetBottom().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DOTTED)
+                penStyle = wxDOT;
+            else if (attr.GetBottom().GetStyle() == wxTEXT_BOX_ATTR_BORDER_DASHED)
+                penStyle = wxLONG_DASH;
+            wxPen pen(col, 1, penStyle);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height);
+
+        }
+        else if (borderBottom > 1)
+        {
+            wxPen pen(col);
+            wxBrush brush(col);
+            dc.SetPen(pen);
+            dc.SetBrush(brush);
+            dc.DrawRectangle(rect.x, rect.y + rect.height - borderBottom, rect.width, borderBottom);
+        }
     }
 
-    SetCachedSize(wxSize(maxWidth, availableSpace.y));
+    return true;
+}
 
-    m_dirty = false;
-    m_invalidRange = wxRICHTEXT_NONE;
+// Get the various rectangles of the box model in pixels. You can either specify contentRect (inner)
+// or marginRect (outer), and the other must be the default rectangle (no width or height).
+// Note that the outline doesn't affect the position of the rectangle, it's drawn in whatever space
+// is available.
+//
+// | Margin | Border | Padding | CONTENT | Padding | Border | Margin |
+
+bool wxRichTextObject::GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect)
+{
+    int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0;
+    int outlineLeft = 0, outlineRight = 0, outlineTop = 0, outlineBottom = 0;
+    int paddingLeft = 0, paddingRight = 0, paddingTop = 0, paddingBottom = 0;
+    int marginLeft = 0, marginRight = 0, marginTop = 0, marginBottom = 0;
+
+    wxTextAttrDimensionConverter converter(dc, buffer ? buffer->GetScale() : 1.0);
+
+    if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsValid())
+        marginLeft = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetLeft());
+    if (attr.GetTextBoxAttr().GetMargins().GetRight().IsValid())
+        marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight());
+    if (attr.GetTextBoxAttr().GetMargins().GetTop().IsValid())
+        marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop());
+    if (attr.GetTextBoxAttr().GetMargins().GetBottom().IsValid())
+        marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom());
+
+    if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsValid())
+        borderLeft = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth().IsValid())
+        borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsValid())
+        borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth().IsValid())
+        borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth());
+
+    if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid())
+        paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft());
+    if (attr.GetTextBoxAttr().GetPadding().GetRight().IsValid())
+        paddingRight = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetRight());
+    if (attr.GetTextBoxAttr().GetPadding().GetTop().IsValid())
+        paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop());
+    if (attr.GetTextBoxAttr().GetPadding().GetBottom().IsValid())
+        paddingBottom = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetBottom());
+
+    if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsValid())
+        outlineLeft = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth().IsValid())
+        outlineRight = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth().IsValid())
+        outlineTop = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetBottom().GetWidth().IsValid())
+        outlineBottom = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetBottom().GetWidth());
+
+    int leftTotal = marginLeft + borderLeft + paddingLeft;
+    int rightTotal = marginRight + borderRight + paddingRight;
+    int topTotal = marginTop + borderTop + paddingTop;
+    int bottomTotal = marginBottom + borderBottom + paddingBottom;
+
+    if (marginRect != wxRect())
+    {
+        contentRect.x = marginRect.x + leftTotal;
+        contentRect.y = marginRect.y + topTotal;
+        contentRect.width = marginRect.width - (leftTotal + rightTotal);
+        contentRect.height = marginRect.height - (topTotal + bottomTotal);
+    }
+    else
+    {
+        marginRect.x = contentRect.x - leftTotal;
+        marginRect.y = contentRect.y - topTotal;
+        marginRect.width = contentRect.width + (leftTotal + rightTotal);
+        marginRect.height = contentRect.height + (topTotal + bottomTotal);
+    }
+
+    borderRect.x = marginRect.x + marginLeft;
+    borderRect.y = marginRect.y + marginTop;
+    borderRect.width = marginRect.width - (marginLeft + marginRight);
+    borderRect.height = marginRect.height - (marginTop + marginBottom);
+
+    paddingRect.x = marginRect.x + marginLeft + borderLeft;
+    paddingRect.y = marginRect.y + marginTop + borderTop;
+    paddingRect.width = marginRect.width - (marginLeft + marginRight + borderLeft + borderRight);
+    paddingRect.height = marginRect.height - (marginTop + marginBottom + borderTop + borderBottom);
+
+    // The outline is outside the margin and doesn't influence the overall box position or content size.
+    outlineRect.x = marginRect.x - outlineLeft;
+    outlineRect.y = marginRect.y - outlineTop;
+    outlineRect.width = marginRect.width + (outlineLeft + outlineRight);
+    outlineRect.height = marginRect.height + (outlineTop + outlineBottom);
 
     return true;
 }
 
-/// Copy
-void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
+// Get the total margin for the object in pixels, taking into account margin, padding and border size
+bool wxRichTextObject::GetTotalMargin(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, int& leftMargin, int& rightMargin,
+        int& topMargin, int& bottomMargin)
 {
-    wxRichTextBox::Copy(obj);
+    // Assume boxRect is the area around the content
+    wxRect contentRect, marginRect, borderRect, paddingRect, outlineRect;
+    marginRect = wxRect(0, 0, 1000, 1000);
 
-    m_partialParagraph = obj.m_partialParagraph;
+    GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+    leftMargin = contentRect.GetLeft() - marginRect.GetLeft();
+    rightMargin = marginRect.GetRight() - contentRect.GetRight();
+    topMargin = contentRect.GetTop() - marginRect.GetTop();
+    bottomMargin = marginRect.GetBottom() - contentRect.GetBottom();
+
+    return true;
 }
 
-/// Get/set the size for the given range.
-bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const
+// Returns the rectangle which the child has available to it given restrictions specified in the
+// child attribute, e.g. 50% width of the parent, 400 pixels, x position 20% of the parent, etc.
+// availableContainerSpace might be a parent that the cell has to compute its width relative to.
+// E.g. a cell that's 50% of its parent.
+wxRect wxRichTextObject::AdjustAvailableSpace(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& WXUNUSED(parentAttr), const wxRichTextAttr& childAttr, const wxRect& availableParentSpace, const wxRect& availableContainerSpace)
 {
-    wxSize sz;
+    wxRect rect = availableParentSpace;
+    double scale = 1.0;
+    if (buffer)
+        scale = buffer->GetScale();
 
-    wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator();
-    wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator();
+    wxTextAttrDimensionConverter converter(dc, scale, availableContainerSpace.GetSize());
 
-    // First find the first paragraph whose starting position is within the range.
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        // child is a paragraph
-        wxRichTextObject* child = node->GetData();
-        const wxRichTextRange& r = child->GetRange();
+    if (childAttr.GetTextBoxAttr().GetWidth().IsValid())
+        rect.width = converter.GetPixels(childAttr.GetTextBoxAttr().GetWidth());
 
-        if (r.GetStart() <= range.GetStart() && r.GetEnd() >= range.GetStart())
-        {
-            startPara = node;
-            break;
-        }
+    if (childAttr.GetTextBoxAttr().GetHeight().IsValid())
+        rect.height = converter.GetPixels(childAttr.GetTextBoxAttr().GetHeight());
 
-        node = node->GetNext();
+    // Can specify either left or right for the position (we're assuming we can't
+    // set the left and right edges to effectively set the size. Would we want to do that?)
+    if (childAttr.GetTextBoxAttr().GetPosition().GetLeft().IsValid())
+    {
+        rect.x = rect.x + converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetLeft());
     }
-
-    // Next find the last paragraph containing part of the range
-    node = m_children.GetFirst();
-    while (node)
+    else if (childAttr.GetTextBoxAttr().GetPosition().GetRight().IsValid())
     {
-        // child is a paragraph
-        wxRichTextObject* child = node->GetData();
-        const wxRichTextRange& r = child->GetRange();
-
-        if (r.GetStart() <= range.GetEnd() && r.GetEnd() >= range.GetEnd())
-        {
-            endPara = node;
-            break;
-        }
-
-        node = node->GetNext();
+        int x = converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetRight());
+        if (childAttr.GetTextBoxAttr().GetPosition().GetRight().GetPosition() == wxTEXT_BOX_ATTR_POSITION_RELATIVE)
+            rect.x = availableContainerSpace.x + availableContainerSpace.width - rect.width;
+        else
+            rect.x += x;
     }
 
-    if (!startPara || !endPara)
-        return false;
-
-    // Now we can add up the sizes
-    for (node = startPara; node ; node = node->GetNext())
+    if (childAttr.GetTextBoxAttr().GetPosition().GetTop().IsValid())
     {
-        // child is a paragraph
-        wxRichTextObject* child = node->GetData();
-        const wxRichTextRange& childRange = child->GetRange();
-        wxRichTextRange rangeToFind = range;
-        rangeToFind.LimitTo(childRange);
-
-        wxSize childSize;
-
-        int childDescent = 0;
-        child->GetRangeSize(rangeToFind, childSize, childDescent, dc, flags, position);
-
-        descent = wxMax(childDescent, descent);
+        rect.y = rect.y + converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetTop());
+    }
+    else if (childAttr.GetTextBoxAttr().GetPosition().GetBottom().IsValid())
+    {
+        int y = converter.GetPixels(childAttr.GetTextBoxAttr().GetPosition().GetBottom());
+        if (childAttr.GetTextBoxAttr().GetPosition().GetBottom().GetPosition() == wxTEXT_BOX_ATTR_POSITION_RELATIVE)
+            rect.y = availableContainerSpace.y + availableContainerSpace.height - rect.height;
+        else
+            rect.y += y;
+    }
 
-        sz.x = wxMax(sz.x, childSize.x);
-        sz.y += childSize.y;
+    if (rect.GetWidth() > availableParentSpace.GetWidth())
+        rect.SetWidth(availableParentSpace.GetWidth());
 
-        if (node == endPara)
-            break;
-    }
+    return rect;
+}
 
-    size = sz;
+// Dump to output stream for debugging
+void wxRichTextObject::Dump(wxTextOutputStream& stream)
+{
+    stream << GetClassInfo()->GetClassName() << wxT("\n");
+    stream << wxString::Format(wxT("Size: %d,%d. Position: %d,%d, Range: %ld,%ld"), m_size.x, m_size.y, m_pos.x, m_pos.y, m_range.GetStart(), m_range.GetEnd()) << 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");
+}
 
-    return true;
+// Gets the containing buffer
+wxRichTextBuffer* wxRichTextObject::GetBuffer() const
+{
+    const wxRichTextObject* obj = this;
+    while (obj && !wxDynamicCast(obj, wxRichTextBuffer))
+        obj = obj->GetParent();
+    return wxDynamicCast(obj, wxRichTextBuffer);
 }
 
-/// Get the paragraph at the given position
-wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtPosition(long pos, bool caretPosition) const
+// Get the absolute object position, by traversing up the child/parent hierarchy
+wxPoint wxRichTextObject::GetAbsolutePosition() const
 {
-    if (caretPosition)
-        pos ++;
+    wxPoint pt = GetPosition();
 
-    // First find the first paragraph whose starting position is within the range.
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    wxRichTextObject* p = GetParent();
+    while (p)
     {
-        // child is a paragraph
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
+        pt = pt + p->GetPosition();
+        p = p->GetParent();
+    }
 
-        // Return first child in buffer if position is -1
-        // if (pos == -1)
-        //    return child;
+    return pt;
+}
 
-        if (child->GetRange().Contains(pos))
-            return child;
+// Hit-testing: returns a flag indicating hit test details, plus
+// information about position
+int wxRichTextObject::HitTest(wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int WXUNUSED(flags))
+{
+    if (!IsShown())
+        return wxRICHTEXT_HITTEST_NONE;
 
-        node = node->GetNext();
+    wxRect rect = GetRect();
+    if (pt.x >= rect.x && pt.x < rect.x + rect.width &&
+        pt.y >= rect.y && pt.y < rect.y + rect.height)
+    {
+        *obj = this;
+        *contextObj = GetParentContainer();
+        textPosition = GetRange().GetStart();
+        return wxRICHTEXT_HITTEST_ON;
     }
-    return NULL;
+    else
+        return wxRICHTEXT_HITTEST_NONE;
 }
 
-/// Get the line at the given position
-wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool caretPosition) const
+// Lays out the object first with a given amount of space, and then if no width was specified in attr,
+// lays out the object again using the maximum ('best') size
+bool wxRichTextObject::LayoutToBestSize(wxDC& dc, wxRichTextDrawingContext& context, wxRichTextBuffer* buffer,
+    const wxRichTextAttr& parentAttr, const wxRichTextAttr& attr,
+    const wxRect& availableParentSpace, const wxRect& availableContainerSpace,
+    int style)
 {
-    if (caretPosition)
-        pos ++;
+    wxRect availableChildRect = AdjustAvailableSpace(dc, buffer, parentAttr, attr, availableParentSpace, availableContainerSpace);
+    wxRect originalAvailableRect = availableChildRect;
+    Layout(dc, context, availableChildRect, availableContainerSpace, style);
 
-    // First find the first paragraph whose starting position is within the range.
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    wxSize maxSize = GetMaxSize();
+
+    // Don't ignore if maxSize.x is zero, since we need to redo the paragraph's lines
+    // on this basis
+    if (!attr.GetTextBoxAttr().GetWidth().IsValid() && maxSize.x < availableChildRect.width)
     {
-        // child is a paragraph
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
+        // Redo the layout with a fixed, minimum size this time.
+        Invalidate(wxRICHTEXT_ALL);
+        wxRichTextAttr newAttr(attr);
+        newAttr.GetTextBoxAttr().GetWidth().SetValue(maxSize.x, wxTEXT_ATTR_UNITS_PIXELS);
+        newAttr.GetTextBoxAttr().GetWidth().SetPosition(wxTEXT_BOX_ATTR_POSITION_ABSOLUTE);
 
-        wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-        while (node2)
-        {
-            wxRichTextLine* line = node2->GetData();
+        availableChildRect = AdjustAvailableSpace(dc, buffer, parentAttr, newAttr, availableParentSpace, availableContainerSpace);
 
-            wxRichTextRange range = line->GetAbsoluteRange();
+        // If a paragraph, align the whole paragraph.
+        // Problem with this: if we're limited by a floating object, a line may be centered
+        // w.r.t. the smaller resulting box rather than the actual available width.
+        if (attr.HasAlignment() && !GetContainer()->GetFloatCollector()->HasFloats()) // FIXME: aligning whole paragraph not compatible with floating objects
+        {
+            // centering, right-justification
+            if (attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
+            {
+                availableChildRect.x = (originalAvailableRect.GetWidth() - availableChildRect.GetWidth())/2 + availableChildRect.x;
+            }
+            else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+            {
+                availableChildRect.x = availableChildRect.x + originalAvailableRect.GetWidth() - availableChildRect.GetWidth();
+            }
+        }
 
-            if (range.Contains(pos) ||
+        Layout(dc, context, availableChildRect, availableContainerSpace, style);
+    }
 
-                // If the position is end-of-paragraph, then return the last line of
-                // of the paragraph.
-                (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))
-                return line;
+    /*
+     __________________
+    |   ____________   |
+    |  |            |  |
 
-            node2 = node2->GetNext();
-        }
 
-        node = node->GetNext();
-    }
+    */
 
-    int lineCount = GetLineCount();
-    if (lineCount > 0)
-        return GetLineForVisibleLineNumber(lineCount-1);
-    else
-        return NULL;
+    return true;
 }
 
-/// Get the line at the given y pixel position, or the last line.
-wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtYPosition(int y) const
+// Move the object recursively, by adding the offset from old to new
+void wxRichTextObject::Move(const wxPoint& pt)
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
-
-        wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-        while (node2)
-        {
-            wxRichTextLine* line = node2->GetData();
-
-            wxRect rect(line->GetRect());
+    SetPosition(pt);
+}
 
-            if (y <= rect.GetBottom())
-                return line;
 
-            node2 = node2->GetNext();
-        }
+/*!
+ * wxRichTextCompositeObject
+ * This is the base for drawable objects.
+ */
 
-        node = node->GetNext();
-    }
+IMPLEMENT_CLASS(wxRichTextCompositeObject, wxRichTextObject)
 
-    // Return last line
-    int lineCount = GetLineCount();
-    if (lineCount > 0)
-        return GetLineForVisibleLineNumber(lineCount-1);
-    else
-        return NULL;
+wxRichTextCompositeObject::wxRichTextCompositeObject(wxRichTextObject* parent):
+    wxRichTextObject(parent)
+{
 }
 
-/// Get the number of visible lines
-int wxRichTextParagraphLayoutBox::GetLineCount() const
+wxRichTextCompositeObject::~wxRichTextCompositeObject()
 {
-    int count = 0;
+    DeleteChildren();
+}
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
+/// Get the nth child
+wxRichTextObject* wxRichTextCompositeObject::GetChild(size_t n) const
+{
+    wxASSERT ( n < m_children.GetCount() );
 
-        count += child->GetLines().GetCount();
-        node = node->GetNext();
-    }
-    return count;
+    return m_children.Item(n)->GetData();
 }
 
-
-/// Get the paragraph for a given line
-wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const
+/// Append a child, returning the position
+size_t wxRichTextCompositeObject::AppendChild(wxRichTextObject* child)
 {
-    return GetParagraphAtPosition(line->GetAbsoluteRange().GetStart());
+    m_children.Append(child);
+    child->SetParent(this);
+    return m_children.GetCount() - 1;
 }
 
-/// Get the line size at the given position
-wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretPosition) const
+/// Insert the child in front of the given object, or at the beginning
+bool wxRichTextCompositeObject::InsertChild(wxRichTextObject* child, wxRichTextObject* inFrontOf)
 {
-    wxRichTextLine* line = GetLineAtPosition(pos, caretPosition);
-    if (line)
+    if (inFrontOf)
     {
-        return line->GetSize();
+        wxRichTextObjectList::compatibility_iterator node = m_children.Find(inFrontOf);
+        m_children.Insert(node, child);
     }
     else
-        return wxSize(0, 0);
-}
+        m_children.Insert(child);
+    child->SetParent(this);
 
+    return true;
+}
 
-/// Convenience function to add a paragraph of text
-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)
+/// Delete the child
+bool wxRichTextCompositeObject::RemoveChild(wxRichTextObject* child, bool deleteChild)
 {
-    // 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);
-    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
-    wxTextAttrEx* cStyle = & defaultCharStyle;
-
-    wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
-
-    AppendChild(para);
-
-    UpdateRanges();
-    SetDirty(true);
+    wxRichTextObjectList::compatibility_iterator node = m_children.Find(child);
+    if (node)
+    {
+        wxRichTextObject* obj = node->GetData();
+        m_children.Erase(node);
+        if (deleteChild)
+            delete obj;
 
-    return para->GetRange();
+        return true;
+    }
+    return false;
 }
 
-/// Adds multiple paragraphs, based on newlines.
-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)
+/// Delete all children
+bool wxRichTextCompositeObject::DeleteChildren()
 {
-    // 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);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObjectList::compatibility_iterator oldNode = node;
 
-    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
-    wxTextAttrEx* cStyle = & defaultCharStyle;
+        wxRichTextObject* child = node->GetData();
+        child->Dereference(); // Only delete if reference count is zero
 
-    wxRichTextParagraph* firstPara = NULL;
-    wxRichTextParagraph* lastPara = NULL;
+        node = node->GetNext();
+        m_children.Erase(oldNode);
+    }
 
-    wxRichTextRange range(-1, -1);
+    return true;
+}
 
-    size_t i = 0;
-    size_t len = text.length();
-    wxString line;
-    wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+/// Get the child count
+size_t wxRichTextCompositeObject::GetChildCount() const
+{
+    return m_children.GetCount();
+}
 
-    AppendChild(para);
+/// Copy
+void wxRichTextCompositeObject::Copy(const wxRichTextCompositeObject& obj)
+{
+    wxRichTextObject::Copy(obj);
 
-    firstPara = para;
-    lastPara = para;
+    DeleteChildren();
 
-    while (i < len)
+    wxRichTextObjectList::compatibility_iterator node = obj.m_children.GetFirst();
+    while (node)
     {
-        wxChar ch = text[i];
-        if (ch == wxT('\n') || ch == wxT('\r'))
-        {
-            wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
-            plainText->SetText(line);
+        wxRichTextObject* child = node->GetData();
+        wxRichTextObject* newChild = child->Clone();
+        newChild->SetParent(this);
+        m_children.Append(newChild);
+
+        node = node->GetNext();
+    }
+}
 
-            para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+/// Hit-testing: returns a flag indicating hit test details, plus
+/// information about position
+int wxRichTextCompositeObject::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
+{
+    if (!IsShown())
+        return wxRICHTEXT_HITTEST_NONE;
 
-            AppendChild(para);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
 
-            lastPara = para;
-            line = wxEmptyString;
+        if (child->IsShown() && child->IsTopLevel() && (flags & wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS))
+        {
+            // Just check if we hit the overall object
+            int ret = child->wxRichTextObject::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+            if (ret != wxRICHTEXT_HITTEST_NONE)
+                return ret;
+        }
+        else if (child->IsShown())
+        {
+            int ret = child->HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+            if (ret != wxRICHTEXT_HITTEST_NONE)
+                return ret;
         }
-        else
-            line += ch;
 
-        i ++;
+        node = node->GetNext();
     }
 
-    if (!line.empty())
+    return wxRICHTEXT_HITTEST_NONE;
+}
+
+/// Finds the absolute position and row height for the given character position
+bool wxRichTextCompositeObject::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
-        plainText->SetText(line);
-    }
+        wxRichTextObject* child = node->GetData();
 
-    UpdateRanges();
+        // Don't recurse if the child is a top-level object,
+        // such as a text box, because the character position will no longer
+        // apply. By definition, a top-level object has its own range of
+        // character positions.
+        if (!child->IsTopLevel() && child->FindPosition(dc, context, index, pt, height, forceLineStart))
+            return true;
 
-    SetDirty(false);
+        node = node->GetNext();
+    }
 
-    return wxRichTextRange(firstPara->GetRange().GetStart(), lastPara->GetRange().GetEnd());
+    return false;
 }
 
-/// Convenience function to add an image
-wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)
+/// Calculate range
+void wxRichTextCompositeObject::CalculateRange(long start, long& end)
 {
-    // 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);
-
-    wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
-    wxTextAttrEx* cStyle = & defaultCharStyle;
+    long current = start;
+    long lastEnd = current;
 
-    wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
-    AppendChild(para);
-    para->AppendChild(new wxRichTextImage(image, this, cStyle));
+    if (IsTopLevel())
+    {
+        current = 0;
+        lastEnd = 0;
+    }
 
-    UpdateRanges();
-    SetDirty(true);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        long childEnd = 0;
 
-    return para->GetRange();
-}
+        child->CalculateRange(current, childEnd);
+        lastEnd = childEnd;
 
+        current = childEnd + 1;
 
-/// 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.
+        node = node->GetNext();
+    }
 
-bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment)
-{
-    SetDirty(true);
+    if (IsTopLevel())
+    {
+        // A top-level object always has a range of size 1,
+        // because its children don't count at this level.
+        end = start;
+        m_range.SetRange(start, start);
 
-    // First, find the first paragraph whose starting position is within the range.
-    wxRichTextParagraph* para = GetParagraphAtPosition(position);
-    if (para)
+        // An object with no children has zero length
+        if (m_children.GetCount() == 0)
+            lastEnd --;
+        m_ownRange.SetRange(0, lastEnd);
+    }
+    else
     {
-        wxRichTextObjectList::compatibility_iterator node = m_children.Find(para);
+        end = lastEnd;
 
-        // Now split at this position, returning the object to insert the new
-        // ones in front of.
-        wxRichTextObject* nextObject = para->SplitAt(position);
+        // An object with no children has zero length
+        if (m_children.GetCount() == 0)
+            end --;
 
-        // Special case: partial paragraph, just one paragraph. Might be a small amount of
-        // text, for example, so let's optimize.
+        m_range.SetRange(start, end);
+    }
+}
 
-        if (fragment.GetPartialParagraph() && fragment.GetChildren().GetCount() == 1)
-        {
-            // Add the first para to this para...
-            wxRichTextObjectList::compatibility_iterator firstParaNode = fragment.GetChildren().GetFirst();
-            if (!firstParaNode)
-                return false;
+/// Delete range from layout.
+bool wxRichTextCompositeObject::DeleteRange(const wxRichTextRange& range)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
-            // Iterate through the fragment paragraph inserting the content into this paragraph.
-            wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
-            wxASSERT (firstPara != NULL);
+    while (node)
+    {
+        wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
+        wxRichTextObjectList::compatibility_iterator next = node->GetNext();
 
-            // Apply the new paragraph attributes to the existing paragraph
-            wxTextAttrEx attr(para->GetAttributes());
-            wxRichTextApplyStyle(attr, firstPara->GetAttributes());
-            para->SetAttributes(attr);
+        // Delete the range in each paragraph
 
-            wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
-            while (objectNode)
-            {
-                wxRichTextObject* newObj = objectNode->GetData()->Clone();
+        // When a chunk has been deleted, internally the content does not
+        // now match the ranges.
+        // However, so long as deletion is not done on the same object twice this is OK.
+        // 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 (!nextObject)
-                {
-                    // Append
-                    para->AppendChild(newObj);
-                }
-                else
-                {
-                    // Insert before nextObject
-                    para->InsertChild(newObj, nextObject);
-                }
+        if (!obj->GetRange().IsOutside(range))
+        {
+            // No need to delete within a top-level object; just removing this object will do fine
+            if (!obj->IsTopLevel())
+                obj->DeleteRange(range);
 
-                objectNode = objectNode->GetNext();
+            // Delete an empty object, or paragraph within this range.
+            if (obj->IsEmpty() ||
+                (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd()))
+            {
+                // An empty paragraph has length 1, so won't be deleted unless the
+                // whole range is deleted.
+                RemoveChild(obj, true);
             }
-
-            return true;
         }
-        else
-        {
-            // Procedure for inserting a fragment consisting of a number of
-            // paragraphs:
-            //
-            // 1. Remove and save the content that's after the insertion point, for adding
-            //    back once we've added the fragment.
-            // 2. Add the content from the first fragment paragraph to the current
-            //    paragraph.
-            // 3. Add remaining fragment paragraphs after the current paragraph.
-            // 4. Add back the saved content from the first paragraph. If partialParagraph
-            //    is true, add it to the last paragraph added and not a new one.
 
-            // 1. Remove and save objects after split point.
-            wxList savedObjects;
-            if (nextObject)
-                para->MoveToList(nextObject, savedObjects);
+        node = next;
+    }
 
-            // 2. Add the content from the 1st fragment paragraph.
-            wxRichTextObjectList::compatibility_iterator firstParaNode = fragment.GetChildren().GetFirst();
-            if (!firstParaNode)
-                return false;
+    return true;
+}
 
-            wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
-            wxASSERT(firstPara != NULL);
+/// Get any text in this object for the given range
+wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range) const
+{
+    wxString text;
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        wxRichTextRange childRange = range;
+        if (!child->GetRange().IsOutside(range))
+        {
+            childRange.LimitTo(child->GetRange());
 
-            wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
-            while (objectNode)
-            {
-                wxRichTextObject* newObj = objectNode->GetData()->Clone();
+            wxString childText = child->GetTextForRange(childRange);
 
-                // Append
-                para->AppendChild(newObj);
+            text += childText;
+        }
+        node = node->GetNext();
+    }
 
-                objectNode = objectNode->GetNext();
-            }
+    return text;
+}
 
-            // 3. Add remaining fragment paragraphs after the current paragraph.
-            wxRichTextObjectList::compatibility_iterator nextParagraphNode = node->GetNext();
-            wxRichTextObject* nextParagraph = NULL;
-            if (nextParagraphNode)
-                nextParagraph = nextParagraphNode->GetData();
+/// Get the child object at the given character position
+wxRichTextObject* wxRichTextCompositeObject::GetChildAtPosition(long pos) const
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        if (child->GetRange().GetStart() == pos)
+            return child;
+        node = node->GetNext();
+    }
+    return NULL;
+}
 
-            wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext();
-            wxRichTextParagraph* finalPara = para;
+/// Recursively merge all pieces that can be merged.
+bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range))
+        {
+            wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
+            if (composite)
+                composite->Defragment();
 
-            // If there was only one paragraph, we need to insert a new one.
-            if (!i)
+            if (node->GetNext())
             {
-                finalPara = new wxRichTextParagraph;
-
-                // TODO: These attributes should come from the subsequent paragraph
-                // when originally deleted, since the subsequent para takes on
-                // the previous para's attributes.
-                finalPara->SetAttributes(firstPara->GetAttributes());
+                wxRichTextObject* nextChild = node->GetNext()->GetData();
+                if (child->CanMerge(nextChild) && child->Merge(nextChild))
+                {
+                    nextChild->Dereference();
+                    m_children.Erase(node->GetNext());
 
-                if (nextParagraph)
-                    InsertChild(finalPara, nextParagraph);
-                else
-                    AppendChild(finalPara);
-            }
-            else while (i)
-            {
-                wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
-                wxASSERT( para != NULL );
-
-                finalPara = (wxRichTextParagraph*) para->Clone();
-
-                if (nextParagraph)
-                    InsertChild(finalPara, nextParagraph);
+                    // Don't set node -- we'll see if we can merge again with the next
+                    // child.
+                }
                 else
-                    AppendChild(finalPara);
-
-                i = i->GetNext();
+                    node = node->GetNext();
             }
+            else
+                node = node->GetNext();
+        }
+        else
+            node = node->GetNext();
+    }
 
-            // 4. Add back the remaining content.
-            if (finalPara)
+    // Delete any remaining empty objects, but leave at least one empty object per composite object.
+    if (GetChildCount() > 1)
+    {
+        node = m_children.GetFirst();
+        while (node)
+        {
+            wxRichTextObjectList::compatibility_iterator next = node->GetNext();
+            wxRichTextObject* child = node->GetData();
+            if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range))
             {
-                finalPara->MoveFromList(savedObjects);
-
-                // Ensure there's at least one object
-                if (finalPara->GetChildCount() == 0)
+                if (child->IsEmpty())
                 {
-                    wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
-
-                    finalPara->AppendChild(text);
+                    child->Dereference();
+                    m_children.Erase(node);
                 }
+                node = next;
             }
-
-            return true;
+            else
+                node = node->GetNext();
         }
     }
-    else
-    {
-        // Append
-        wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst();
-        while (i)
-        {
-            wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
-            wxASSERT( para != NULL );
-
-            AppendChild(para->Clone());
 
-            i = i->GetNext();
-        }
+    return true;
+}
 
-        return true;
+/// Dump to output stream for debugging
+void wxRichTextCompositeObject::Dump(wxTextOutputStream& stream)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        child->Dump(stream);
+        node = node->GetNext();
     }
 }
 
-/// 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, wxRichTextParagraphLayoutBox& fragment)
+/// Get/set the object size for the given range. Returns false if the range
+/// is invalid for this object.
+bool wxRichTextCompositeObject::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
 {
-    wxRichTextObjectList::compatibility_iterator i = GetChildren().GetFirst();
-    while (i)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
-        wxASSERT( para != NULL );
+    if (!range.IsWithin(GetRange()))
+        return false;
 
-        if (!para->GetRange().IsOutside(range))
-        {
-            fragment.AppendChild(para->Clone());
-        }
-        i = i->GetNext();
-    }
+    wxSize sz;
 
-    // Now top and tail the first and last paragraphs in our new fragment (which might be the same).
-    if (!fragment.IsEmpty())
+    wxArrayInt childExtents;
+    wxArrayInt* p;
+    if (partialExtents)
+        p = & childExtents;
+    else
+        p = NULL;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        wxRichTextRange topTailRange(range);
+        wxRichTextObject* child = node->GetData();
+        if (!child->GetRange().IsOutside(range))
+        {
+            // Floating objects have a zero size within the paragraph.
+            if (child->IsFloating())
+            {
+                if (partialExtents)
+                {
+                    int lastSize;
+                    if (partialExtents->GetCount() > 0)
+                        lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                    else
+                        lastSize = 0;
 
-        wxRichTextParagraph* firstPara = wxDynamicCast(fragment.GetChildren().GetFirst()->GetData(), wxRichTextParagraph);
-        wxASSERT( firstPara != NULL );
+                    partialExtents->Add(0 /* zero size */ + lastSize);
+                }
+            }
+            else
+            {
+                wxSize childSize;
 
-        // Chop off the start of the paragraph
-        if (topTailRange.GetStart() > firstPara->GetRange().GetStart())
-        {
-            wxRichTextRange r(firstPara->GetRange().GetStart(), topTailRange.GetStart()-1);
-            firstPara->DeleteRange(r);
+                wxRichTextRange rangeToUse = range;
+                rangeToUse.LimitTo(child->GetRange());
+                if (child->IsTopLevel())
+                    rangeToUse = child->GetOwnRange();
 
-            // Make sure the numbering is correct
-            long end;
-            fragment.CalculateRange(firstPara->GetRange().GetStart(), end);
+                int childDescent = 0;
 
-            // Now, we've deleted some positions, so adjust the range
-            // accordingly.
-            topTailRange.SetEnd(topTailRange.GetEnd() - r.GetLength());
-        }
+                // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size,
+                // but it's only going to be used after caching has taken place.
+                if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
+                {
+                    childDescent = child->GetDescent();
+                    childSize = child->GetCachedSize();
 
-        wxRichTextParagraph* lastPara = wxDynamicCast(fragment.GetChildren().GetLast()->GetData(), wxRichTextParagraph);
-        wxASSERT( lastPara != NULL );
+                    sz.y = wxMax(sz.y, childSize.y);
+                    sz.x += childSize.x;
+                    descent = wxMax(descent, childDescent);
+                }
+                else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y), p))
+                {
+                    sz.y = wxMax(sz.y, childSize.y);
+                    sz.x += childSize.x;
+                    descent = wxMax(descent, childDescent);
 
-        if (topTailRange.GetEnd() < (lastPara->GetRange().GetEnd()-1))
-        {
-            wxRichTextRange r(topTailRange.GetEnd()+1, lastPara->GetRange().GetEnd()-1); /* -1 since actual text ends 1 position before end of para marker */
-            lastPara->DeleteRange(r);
+                    if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange() || child->IsTopLevel()))
+                    {
+                        child->SetCachedSize(childSize);
+                        child->SetDescent(childDescent);
+                    }
 
-            // Make sure the numbering is correct
-            long end;
-            fragment.CalculateRange(firstPara->GetRange().GetStart(), end);
+                    if (partialExtents)
+                    {
+                        int lastSize;
+                        if (partialExtents->GetCount() > 0)
+                            lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                        else
+                            lastSize = 0;
 
-            // We only have part of a paragraph at the end
-            fragment.SetPartialParagraph(true);
-        }
-        else
-        {
-            if (topTailRange.GetEnd() == (lastPara->GetRange().GetEnd() - 1))
-                // We have a partial paragraph (don't save last new paragraph marker)
-                fragment.SetPartialParagraph(true);
-            else
-                // We have a complete paragraph
-                fragment.SetPartialParagraph(false);
+                        size_t i;
+                        for (i = 0; i < childExtents.GetCount(); i++)
+                        {
+                            partialExtents->Add(childExtents[i] + lastSize);
+                        }
+                    }
+                }
+            }
+
+            if (p)
+                p->Clear();
         }
-    }
 
+        node = node->GetNext();
+    }
+    size = sz;
     return true;
 }
 
-/// Given a position, get the number of the visible line (potentially many to a paragraph),
-/// starting from zero at the start of the buffer.
-long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosition, bool startOfLine) const
+// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextCompositeObject::Invalidate(const wxRichTextRange& invalidRange)
 {
-    if (caretPosition)
-        pos ++;
-
-    int lineCount = 0;
+    wxRichTextObject::Invalidate(invalidRange);
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT( child != NULL );
-
-        if (child->GetRange().Contains(pos))
+        wxRichTextObject* child = node->GetData();
+        if (invalidRange != wxRICHTEXT_ALL && invalidRange != wxRICHTEXT_NONE && child->GetRange().IsOutside(invalidRange))
         {
-            wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-            while (node2)
-            {
-                wxRichTextLine* line = node2->GetData();
-                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 (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)
-                        return lineCount - 1;
-                    else
-                        return lineCount;
-                }
-
-                lineCount ++;
-
-                node2 = node2->GetNext();
-            }
-            // If we didn't find it in the lines, it must be
-            // the last position of the paragraph. So return the last line.
-            return lineCount-1;
+            // Skip
+        }
+        else if (child->IsTopLevel())
+        {
+            if (invalidRange == wxRICHTEXT_NONE)
+                child->Invalidate(wxRICHTEXT_NONE);
+            else
+                child->Invalidate(wxRICHTEXT_ALL); // All children must be invalidated if within parent range
         }
         else
-            lineCount += child->GetLines().GetCount();
-
+            child->Invalidate(invalidRange);
         node = node->GetNext();
     }
-
-    // Not found
-    return -1;
 }
 
-/// Given a line number, get the corresponding wxRichTextLine object.
-wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long lineNumber) const
+// Move the object recursively, by adding the offset from old to new
+void wxRichTextCompositeObject::Move(const wxPoint& pt)
 {
-    int lineCount = 0;
+    wxPoint oldPos = GetPosition();
+    SetPosition(pt);
+    wxPoint offset = pt - oldPos;
 
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT(child != NULL);
+        wxRichTextObject* child = node->GetData();
+        wxPoint childPos = child->GetPosition() + offset;
+        child->Move(childPos);
+        node = node->GetNext();
+    }
+}
 
-        if (lineNumber < (int) (child->GetLines().GetCount() + lineCount))
-        {
-            wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-            while (node2)
-            {
-                wxRichTextLine* line = node2->GetData();
 
-                if (lineCount == lineNumber)
-                    return line;
+/*!
+ * wxRichTextParagraphLayoutBox
+ * This box knows how to lay out paragraphs.
+ */
 
-                lineCount ++;
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject)
 
-                node2 = node2->GetNext();
-            }
-        }
-        else
-            lineCount += child->GetLines().GetCount();
+wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
+    wxRichTextCompositeObject(parent)
+{
+    Init();
+}
 
-        node = node->GetNext();
+wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox()
+{
+    if (m_floatCollector)
+    {
+        delete m_floatCollector;
+        m_floatCollector = NULL;
     }
-
-    // Didn't find it
-    return NULL;
 }
 
-/// Delete range from layout.
-bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
+/// Initialize the object.
+void wxRichTextParagraphLayoutBox::Init()
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-
-    while (node)
-    {
-        wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (obj != NULL);
+    m_ctrl = NULL;
 
-        wxRichTextObjectList::compatibility_iterator next = node->GetNext();
+    // For now, assume is the only box and has no initial size.
+    m_range = wxRichTextRange(0, -1);
+    m_ownRange = wxRichTextRange(0, -1);
 
-        // Delete the range in each paragraph
+    m_invalidRange = wxRICHTEXT_ALL;
 
-        if (!obj->GetRange().IsOutside(range))
-        {
-            // Deletes the content of this object within the given range
-            obj->DeleteRange(range);
+    m_partialParagraph = false;
+    m_floatCollector = NULL;
+}
 
-            // If the whole paragraph is within the range to delete,
-            // delete the whole thing.
-            if (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd())
-            {
-                // Delete the whole object
-                RemoveChild(obj, true);
-            }
-            // If the range includes the paragraph end, we need to join this
-            // and the next paragraph.
-            else if (range.Contains(obj->GetRange().GetEnd()))
-            {
-                // We need to move the objects from the next paragraph
-                // to this paragraph
+void wxRichTextParagraphLayoutBox::Clear()
+{
+    DeleteChildren();
 
-                if (next)
-                {
-                    wxRichTextParagraph* nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
-                    next = next->GetNext();
-                    if (nextParagraph)
-                    {
-                        // Delete the stuff we need to delete
-                        nextParagraph->DeleteRange(range);
+    if (m_floatCollector)
+        delete m_floatCollector;
+    m_floatCollector = NULL;
+    m_partialParagraph = false;
+}
 
-                        // Move the objects to the previous para
-                        wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
+/// Copy
+void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
+{
+    Clear();
 
-                        while (node1)
-                        {
-                            wxRichTextObject* obj1 = node1->GetData();
+    wxRichTextCompositeObject::Copy(obj);
 
-                            // If the object is empty, optimise it out
-                            if (obj1->IsEmpty())
-                            {
-                                delete obj1;
-                            }
-                            else
-                            {
-                                obj->AppendChild(obj1);
-                            }
+    m_partialParagraph = obj.m_partialParagraph;
+    m_defaultAttributes = obj.m_defaultAttributes;
+}
 
-                            wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
-                            nextParagraph->GetChildren().Erase(node1);
-
-                            node1 = next1;
-                        }
-
-                        // Delete the paragraph
-                        RemoveChild(nextParagraph, true);
-
-                    }
-                }
-
-            }
-        }
-
-        node = next;
-    }
-
-    return true;
-}
-
-/// Get any text in this object for the given range
-wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& range) const
+// Gather information about floating objects; only gather floats for those paragraphs that
+// will not be formatted again due to optimization, after which floats will be gathered per-paragraph
+// during layout.
+bool wxRichTextParagraphLayoutBox::UpdateFloatingObjects(const wxRect& availableRect, wxRichTextObject* untilObj)
 {
-    int lineCount = 0;
-    wxString text;
+    if (m_floatCollector != NULL)
+        delete m_floatCollector;
+    m_floatCollector = new wxRichTextFloatCollector(availableRect);
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    // Only gather floats up to the point we'll start formatting paragraphs.
+    while (untilObj && node && node->GetData() != untilObj)
     {
-        wxRichTextObject* child = node->GetData();
-        if (!child->GetRange().IsOutside(range))
-        {
-//            if (lineCount > 0)
-//                text += wxT("\n");
-            wxRichTextRange childRange = range;
-            childRange.LimitTo(child->GetRange());
-
-            wxString childText = child->GetTextForRange(childRange);
-
-            text += childText;
-
-            if (childRange.GetEnd() == child->GetRange().GetEnd())
-                text += wxT("\n");
-
-            lineCount ++;
-        }
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (child != NULL);
+        if (child)
+            m_floatCollector->CollectFloat(child);
         node = node->GetNext();
     }
 
-    return text;
+    return true;
 }
 
-/// Get all the text
-wxString wxRichTextParagraphLayoutBox::GetText() const
+// Returns the style sheet associated with the overall buffer.
+wxRichTextStyleSheet* wxRichTextParagraphLayoutBox::GetStyleSheet() const
 {
-    return GetTextForRange(GetRange());
+    return GetBuffer() ? GetBuffer()->GetStyleSheet() : (wxRichTextStyleSheet*) NULL;
 }
 
-/// Get the paragraph by number
-wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtLine(long paragraphNumber) const
+// Get the number of floating objects at this level
+int wxRichTextParagraphLayoutBox::GetFloatingObjectCount() const
 {
-    if ((size_t) paragraphNumber >= GetChildCount())
-        return NULL;
-
-    return (wxRichTextParagraph*) GetChild((size_t) paragraphNumber);
+    if (m_floatCollector)
+        return m_floatCollector->GetFloatingObjectCount();
+    else
+        return 0;
 }
 
-/// Get the length of the paragraph
-int wxRichTextParagraphLayoutBox::GetParagraphLength(long paragraphNumber) const
+// Get a list of floating objects
+bool wxRichTextParagraphLayoutBox::GetFloatingObjects(wxRichTextObjectList& objects) const
 {
-    wxRichTextParagraph* para = GetParagraphAtLine(paragraphNumber);
-    if (para)
-        return para->GetRange().GetLength() - 1; // don't include newline
+    if (m_floatCollector)
+    {
+        return m_floatCollector->GetFloatingObjects(objects);
+    }
     else
-        return 0;
+        return false;
 }
 
-/// Get the text of the paragraph
-wxString wxRichTextParagraphLayoutBox::GetParagraphText(long paragraphNumber) const
+// Calculate ranges
+void wxRichTextParagraphLayoutBox::UpdateRanges()
 {
-    wxRichTextParagraph* para = GetParagraphAtLine(paragraphNumber);
-    if (para)
-        return para->GetTextForRange(para->GetRange());
-    else
-        return wxEmptyString;
+    long start = 0;
+    if (GetParent())
+        start = GetRange().GetStart();
+    long end;
+    CalculateRange(start, end);
 }
 
-/// Convert zero-based line column and paragraph number to a position.
-long wxRichTextParagraphLayoutBox::XYToPosition(long x, long y) const
+// HitTest
+int wxRichTextParagraphLayoutBox::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
 {
-    wxRichTextParagraph* para = GetParagraphAtLine(y);
-    if (para)
+    if (!IsShown())
+        return wxRICHTEXT_HITTEST_NONE;
+
+    int ret = wxRICHTEXT_HITTEST_NONE;
+    if (m_floatCollector && (flags & wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS) == 0)
+        ret = m_floatCollector->HitTest(dc, context, pt, textPosition, obj, flags);
+
+    if (ret == wxRICHTEXT_HITTEST_NONE)
+        return wxRichTextCompositeObject::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+    else
     {
-        return para->GetRange().GetStart() + x;
+        *contextObj = this;
+        return ret;
     }
-    else
-        return -1;
 }
 
-/// Convert zero-based position to line column and paragraph number
-bool wxRichTextParagraphLayoutBox::PositionToXY(long pos, long* x, long* y) const
+/// Draw the floating objects
+void wxRichTextParagraphLayoutBox::DrawFloats(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
 {
-    wxRichTextParagraph* para = GetParagraphAtPosition(pos);
-    if (para)
-    {
-        int count = 0;
-        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-        while (node)
-        {
-            wxRichTextObject* child = node->GetData();
-            if (child == para)
-                break;
-            count ++;
-            node = node->GetNext();
-        }
+    if (m_floatCollector)
+        m_floatCollector->Draw(dc, context, range, selection, rect, descent, style);
+}
 
-        *y = count;
-        *x = pos - para->GetRange().GetStart();
+void wxRichTextParagraphLayoutBox::MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextObject* obj)
+{
+    if (from == to)
+        return;
 
-        return true;
-    }
-    else
-        return false;
+    from->RemoveChild(obj);
+    to->AppendChild(obj);
 }
 
-/// Get the leaf object in a paragraph at this position.
-/// Given a line number, get the corresponding wxRichTextLine object.
-wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long position) const
+/// Draw the item
+bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
 {
-    wxRichTextParagraph* para = GetParagraphAtPosition(position);
-    if (para)
+    if (!IsShown())
+        return true;
+
+    wxRect thisRect(GetPosition(), GetCachedSize());
+
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, this);
+
+    int flags = style;
+    if (selection.IsValid() && GetParentContainer() != this && selection.WithinSelection(GetRange().GetStart(), GetParentContainer()))
+        flags |= wxRICHTEXT_DRAW_SELECTED;
+
+    // Don't draw guidelines if at top level
+    int theseFlags = flags;
+    if (!GetParent())
+        theseFlags &= ~wxRICHTEXT_DRAW_GUIDELINES;
+    DrawBoxAttributes(dc, GetBuffer(), attr, thisRect, theseFlags);
+
+    DrawFloats(dc, context, range, selection, rect, descent, style);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();
+        wxRichTextObject* child = node->GetData();
 
-        while (node)
+        if (child && !child->GetRange().IsOutside(range))
         {
-            wxRichTextObject* child = node->GetData();
-            if (child->GetRange().Contains(position))
-                return child;
+            wxRect childRect(child->GetPosition(), child->GetCachedSize());
+            wxRichTextRange childRange = range;
+            if (child->IsTopLevel())
+            {
+                childRange = child->GetOwnRange();
+            }
 
-            node = node->GetNext();
+            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
+                child->Draw(dc, context, childRange, selection, rect, descent, style);
         }
-        if (position == para->GetRange().GetEnd() && para->GetChildCount() > 0)
-            return para->GetChildren().GetLast()->GetData();
+
+        node = node->GetNext();
     }
-    return NULL;
+    return true;
 }
 
-/// Set character or paragraph text attributes: apply character styles only to immediate text nodes
-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
+/// Lay the item out
+bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
 {
-    bool characterStyle = false;
-    bool paragraphStyle = false;
+    SetPosition(rect.GetPosition());
 
-    if (style.IsCharacterStyle())
-        characterStyle = true;
-    if (style.IsParagraphStyle())
-        paragraphStyle = true;
+    if (!IsShown())
+        return 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);
-    bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+    wxRect availableSpace;
+    bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
 
-    // Apply paragraph style first, if any
-    wxRichTextAttr wholeStyle(style);
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, this);
 
-    if (wholeStyle.HasParagraphStyleName() && GetStyleSheet())
+    // 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)
     {
-        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
-        if (def)
-            wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(GetStyleSheet()));
-    }
+        wxRect rect2(0, 0, rect.width, rect.height);
+        availableSpace = GetAvailableContentArea(dc, context, rect2);
 
-    // Limit the attributes to be set to the content to only character attributes.
-    wxRichTextAttr characterAttributes(wholeStyle);
-    characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
+        // 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();
 
-    if (characterAttributes.HasCharacterStyleName() && GetStyleSheet())
+        Invalidate(wxRichTextRange(startPos, GetOwnRange().GetEnd()));
+    }
+    else
     {
-        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
-        if (def)
-            wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(GetStyleSheet()));
+        availableSpace = GetAvailableContentArea(dc, context, rect);
     }
 
-    // If we are associated with a control, make undoable; otherwise, apply immediately
-    // to the data.
+    // Fix the width if we're at the top level
+    if (!GetParent())
+        attr.GetTextBoxAttr().GetWidth().SetValue(rect.GetWidth(), wxTEXT_ATTR_UNITS_PIXELS);
 
-    bool haveControl = (GetRichTextCtrl() != NULL);
+    int leftMargin, rightMargin, topMargin, bottomMargin;
+    wxRichTextObject::GetTotalMargin(dc, GetBuffer(), attr, leftMargin, rightMargin,
+            topMargin, bottomMargin);
 
-    wxRichTextAction* action = NULL;
+    int maxWidth = 0;
+    int maxHeight = 0;
 
-    if (haveControl && withUndo)
-    {
-        action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
-        action->SetRange(range);
-        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
-    }
+    // The maximum paragraph maximum width, so we can set the overall maximum width for this object
+    int maxMaxWidth = 0;
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
+    // The maximum paragraph minimum width, so we can set the overall minimum width for this object
+    int maxMinWidth = 0;
 
-        if (para && para->GetChildCount() > 0)
-        {
-            // Stop searching if we're beyond the range of interest
-            if (para->GetRange().GetStart() > range.GetEnd())
-                break;
+    // If we have vertical alignment, we must recalculate everything.
+    bool hasVerticalAlignment = (attr.GetTextBoxAttr().HasVerticalAlignment() &&
+        (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP));
 
-            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);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
-                if (haveControl && withUndo)
-                {
-                    newPara = new wxRichTextParagraph(*para);
-                    action->GetNewParagraphs().AppendChild(newPara);
+    bool layoutAll = true;
 
-                    // Also store the old ones for Undo
-                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
-                }
-                else
-                    newPara = para;
+    // Get invalid range, rounding to paragraph start/end.
+    wxRichTextRange invalidRange = GetInvalidRange(true);
 
-                // If we're specifying paragraphs only, then we really mean character formatting
-                // to be included in the paragraph style
-                if ((paragraphStyle || parasOnly) && !charactersOnly)
+    if (invalidRange == wxRICHTEXT_NONE && !formatRect)
+        return true;
+
+    if (invalidRange == wxRICHTEXT_ALL || hasVerticalAlignment)
+        layoutAll = true;
+    else    // If we know what range is affected, start laying out from that point on.
+        if (invalidRange.GetStart() >= GetOwnRange().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)
+            {
+                if (previousNode)
                 {
-                    if (resetExistingStyle)
-                        newPara->GetAttributes() = wholeStyle;
-                    else
-                    {
-                        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(), wholeStyle, & combinedAttr);
-                        }
-                        else
-                            wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle);
-                    }
+                    wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
+                    availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
                 }
 
-                // When 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.
+                // Now we're going to start iterating from the first affected paragraph.
+                node = firstNode;
 
-                // 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())
-                {
-                    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
-                    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());
+                layoutAll = false;
+            }
+        }
+    }
 
-                    // Increment by 1 because we're apply the style one _after_ the split point
-                    long splitPoint = childRange.GetEnd();
-                    if (splitPoint != newPara->GetRange().GetEnd())
-                        splitPoint ++;
+    // Gather information about only those floating objects that will not be formatted,
+    // after which floats will be gathered per-paragraph during layout.
+    UpdateFloatingObjects(availableSpace, node ? node->GetData() : (wxRichTextObject*) NULL);
 
-                    // Find last object
-                    if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1))
-                        lastObject = newPara->GetChildren().GetLast()->GetData();
-                    else
-                        // lastObject is set as a side-effect of splitting. It's
-                        // returned as the object before the new object.
-                        (void) newPara->SplitAt(splitPoint, & lastObject);
+    // A way to force speedy rest-of-buffer layout (the 'else' below)
+    bool forceQuickLayout = false;
 
-                    wxASSERT(firstObject != NULL);
-                    wxASSERT(lastObject != NULL);
+    // First get the size of the paragraphs we won't be laying out
+    wxRichTextObjectList::compatibility_iterator n = m_children.GetFirst();
+    while (n && n != node)
+    {
+        wxRichTextParagraph* child = wxDynamicCast(n->GetData(), wxRichTextParagraph);
+        if (child)
+        {
+            maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+            maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+            maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
+        }
+        n = n->GetNext();
+    }
 
-                    if (!firstObject || !lastObject)
-                        continue;
+    while (node)
+    {
+        // Assume this box only contains paragraphs
 
-                    wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
-                    wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // Unsure if this is needed
+        // wxCHECK_MSG( child, false, wxT("Unknown object in layout") );
 
-                    wxASSERT(firstNode);
-                    wxASSERT(lastNode);
+        if (child && child->IsShown())
+        {
+            // 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)) )
+            {
+                // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+                // lays out the object again using the minimum size
+                child->LayoutToBestSize(dc, context, GetBuffer(),
+                        attr, child->GetAttributes(), availableSpace, rect, style&~wxRICHTEXT_LAYOUT_SPECIFIED_RECT);
+
+                // Layout must set the cached size
+                availableSpace.y += child->GetCachedSize().y;
+                maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+                maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+                maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
+
+                // If we're just formatting the visible part of the buffer,
+                // and we're now past the bottom of the window, and we don't have any
+                // floating objects (since they may cause wrapping to change for the rest of the
+                // the buffer), start quick layout.
+                if (!hasVerticalAlignment && formatRect && child->GetPosition().y > rect.GetBottom() && GetFloatingObjectCount() == 0)
+                    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.
 
-                    wxRichTextObjectList::compatibility_iterator node2 = firstNode;
+                int inc = availableSpace.y - child->GetPosition().y;
 
-                    while (node2)
+                while (node)
+                {
+                    wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+                    if (child)
                     {
-                        wxRichTextObject* child = node2->GetData();
-
-                        if (resetExistingStyle)
-                            child->GetAttributes() = characterAttributes;
-                        else
+                        if (child->GetLines().GetCount() == 0)
                         {
-                            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);
-                        }
+                            // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+                            // lays out the object again using the minimum size
+                            child->LayoutToBestSize(dc, context, GetBuffer(),
+                                        attr, child->GetAttributes(), availableSpace, rect, style&~wxRICHTEXT_LAYOUT_SPECIFIED_RECT);
 
-                        if (node2 == lastNode)
-                            break;
+                            //child->Layout(dc, availableChildRect, style);
+                        }
+                        else
+                            child->Move(wxPoint(child->GetPosition().x, child->GetPosition().y + inc));
 
-                        node2 = node2->GetNext();
+                        availableSpace.y += child->GetCachedSize().y;
+                        maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
+                        maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
+                        maxMaxWidth = wxMax(maxMaxWidth, child->GetMaxSize().x);
                     }
+
+                    node = node->GetNext();
                 }
+                break;
             }
         }
 
         node = node->GetNext();
     }
 
-    // Do action, or delay it until end of batch.
-    if (haveControl && withUndo)
-        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
-
-    return true;
-}
-
-/// Set text attributes
-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags)
-{
-    wxRichTextAttr richStyle = style;
-    return SetStyle(range, richStyle, flags);
-}
-
-/// Get the text attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style)
-{
-    return DoGetStyle(position, style, true);
-}
-
-/// Get the text attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)
-{
-    wxTextAttrEx textAttrEx(style);
-    if (GetStyle(position, textAttrEx))
+    node = m_children.GetLast();
+    if (node && node->GetData()->IsShown())
     {
-        style = textAttrEx;
-        return true;
+        wxRichTextObject* child = node->GetData();
+        maxHeight = child->GetPosition().y - (GetPosition().y + topMargin) + child->GetCachedSize().y;
     }
     else
-        return false;
-}
+        maxHeight = 0; // topMargin + bottomMargin;
 
-/// Get the content (uncombined) attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style)
-{
-    return DoGetStyle(position, style, false);
-}
-
-bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
-{
-    wxTextAttrEx textAttrEx(style);
-    if (GetUncombinedStyle(position, textAttrEx))
+    // Check the bottom edge of any floating object
+    if (GetFloatCollector() && GetFloatCollector()->HasFloats())
     {
-        style = textAttrEx;
-        return true;
+        int bottom = GetFloatCollector()->GetLastRectBottom();
+        if (bottom > maxHeight)
+            maxHeight = bottom;
     }
-    else
-        return false;
-}
-
-/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
-/// context attributes.
-bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles)
-{
-    wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
 
-    if (style.IsParagraphStyle())
+    if (attr.GetTextBoxAttr().GetSize().GetWidth().IsValid())
     {
-        obj = GetParagraphAtPosition(position);
-        if (obj)
-        {
-            if (combineStyles)
-            {
-                // Start with the base style
-                style = GetAttributes();
-
-                // Apply the paragraph style
-                wxRichTextApplyStyle(style, obj->GetAttributes());
-            }
-            else
-                style = obj->GetAttributes();
+        wxRect r = AdjustAvailableSpace(dc, GetBuffer(), wxRichTextAttr() /* not used */, attr, parentRect, parentRect);
+        int w = r.GetWidth();
 
-            return true;
-        }
+        // Convert external to content rect
+        w = w - leftMargin - rightMargin;
+        maxWidth = wxMax(maxWidth, w);
+        maxMaxWidth = wxMax(maxMaxWidth, w);
     }
     else
     {
-        obj = GetLeafObjectAtPosition(position);
-        if (obj)
-        {
-            if (combineStyles)
-            {
-                wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);
-                style = para ? para->GetCombinedAttributes(obj->GetAttributes()) : obj->GetAttributes();
-            }
-            else
-                style = obj->GetAttributes();
-
-            return true;
-        }
+        // TODO: Make sure the layout box's position reflects
+        // the position of the children, but without
+        // breaking layout of a box within a paragraph.
     }
-    return false;
-}
 
-static bool wxHasStyle(long flags, long style)
-{
-    return (flags & style) != 0;
-}
+    // TODO: (also in para layout) should set the
+    // object's size to an absolute one if specified,
+    // but if not specified, calculate it from content.
 
-/// 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, int& multipleTextEffectAttributes)
-{
-    if (style.HasFont())
+    // We need to add back the margins etc.
     {
-        if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
-        {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontSize())
-            {
-                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());
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(maxWidth, maxHeight));
+        GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetCachedSize(marginRect.GetSize());
+    }
 
-                wxSetFontPreservingStyles(currentStyle, font);
-                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-            }
-        }
+    // The maximum size is the greatest of all maximum widths for all paragraphs.
+    {
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(maxMaxWidth, maxHeight)); // Actually max height is a lie, we can't know it
+        GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetMaxSize(marginRect.GetSize());
+    }
 
-        if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))
-        {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontItalic())
-            {
-                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);
-            }
-        }
+    // The minimum size is the greatest of all minimum widths for all paragraphs.
+    {
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(maxMinWidth, maxHeight)); // Actually max height is a lie, we can't know it
+        GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetMinSize(marginRect.GetSize());
+    }
 
-        if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
+    if (attr.GetTextBoxAttr().HasVerticalAlignment() &&
+        (attr.GetTextBoxAttr().GetVerticalAlignment() > wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP))
+    {
+        int yOffset = 0;
+        int leftOverSpace = availableSpace.height - topMargin - bottomMargin - maxHeight;
+        if (leftOverSpace > 0)
         {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontWeight())
+            if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE)
             {
-                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);
-                }
+                yOffset = (leftOverSpace/2);
             }
-            else
+            else if (attr.GetTextBoxAttr().GetVerticalAlignment() == wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM)
             {
-                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);
+                yOffset = leftOverSpace;
             }
         }
 
-        if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))
+        // Move all the children to vertically align the content
+        // This doesn't take into account floating objects, unfortunately.
+        if (yOffset != 0)
         {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontFaceName())
-            {
-                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
+            wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+            while (node)
             {
-                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);
-            }
-        }
+                wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+                if (child)
+                    child->Move(wxPoint(child->GetPosition().x, child->GetPosition().y + yOffset));
 
-        if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))
-        {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontUnderlined())
-            {
-                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);
+                node = node->GetNext();
             }
         }
     }
 
-    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());
-    }
+    m_invalidRange = wxRICHTEXT_NONE;
+
+    return true;
+}
 
-    if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR))
+/// Get/set the size for the given range.
+bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const
+{
+    wxSize sz;
+
+    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();
+    while (node)
     {
-        if (currentStyle.HasBackgroundColour())
+        // child is a paragraph
+        wxRichTextObject* child = node->GetData();
+        const wxRichTextRange& r = child->GetRange();
+
+        if (r.GetStart() <= range.GetStart() && r.GetEnd() >= range.GetStart())
         {
-            if (currentStyle.GetBackgroundColour() != style.GetBackgroundColour())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_BACKGROUND_COLOUR;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
-            }
+            startPara = node;
+            break;
         }
-        else
-            currentStyle.SetBackgroundColour(style.GetBackgroundColour());
+
+        node = node->GetNext();
     }
 
-    if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_ALIGNMENT))
+    // Next find the last paragraph containing part of the range
+    node = m_children.GetFirst();
+    while (node)
     {
-        if (currentStyle.HasAlignment())
+        // child is a paragraph
+        wxRichTextObject* child = node->GetData();
+        const wxRichTextRange& r = child->GetRange();
+
+        if (r.GetStart() <= range.GetEnd() && r.GetEnd() >= range.GetEnd())
         {
-            if (currentStyle.GetAlignment() != style.GetAlignment())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_ALIGNMENT;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_ALIGNMENT);
-            }
+            endPara = node;
+            break;
         }
-        else
-            currentStyle.SetAlignment(style.GetAlignment());
+
+        node = node->GetNext();
     }
 
-    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 (!startPara || !endPara)
+        return false;
 
-    if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER))
+    // Now we can add up the sizes
+    for (node = startPara; node ; node = node->GetNext())
     {
-        if (currentStyle.HasParagraphSpacingAfter())
-        {
-            if (currentStyle.GetParagraphSpacingAfter() != style.GetParagraphSpacingAfter())
-            {
-                // 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());
-    }
+        // child is a paragraph
+        wxRichTextObject* child = node->GetData();
+        const wxRichTextRange& childRange = child->GetRange();
+        wxRichTextRange rangeToFind = range;
+        rangeToFind.LimitTo(childRange);
 
-    if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE))
-    {
-        if (currentStyle.HasParagraphSpacingBefore())
-        {
-            if (currentStyle.GetParagraphSpacingBefore() != style.GetParagraphSpacingBefore())
-            {
-                // 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 (child->IsTopLevel())
+            rangeToFind = child->GetOwnRange();
 
-    if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LINE_SPACING))
-    {
-        if (currentStyle.HasLineSpacing())
-        {
-            if (currentStyle.GetLineSpacing() != style.GetLineSpacing())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LINE_SPACING);
-            }
-        }
-        else
-            currentStyle.SetLineSpacing(style.GetLineSpacing());
-    }
+        wxSize childSize;
 
-    if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
-    {
-        if (currentStyle.HasCharacterStyleName())
-        {
-            if (currentStyle.GetCharacterStyleName() != style.GetCharacterStyleName())
-            {
-                // 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());
-    }
+        int childDescent = 0;
+        child->GetRangeSize(rangeToFind, childSize, childDescent, dc, context, flags, position);
 
-    if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
-    {
-        if (currentStyle.HasParagraphStyleName())
-        {
-            if (currentStyle.GetParagraphStyleName() != style.GetParagraphStyleName())
-            {
-                // 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());
-    }
+        descent = wxMax(childDescent, descent);
 
-    if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME))
-    {
-        if (currentStyle.HasListStyleName())
-        {
-            if (currentStyle.GetListStyleName() != style.GetListStyleName())
-            {
-                // 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());
-    }
+        sz.x = wxMax(sz.x, childSize.x);
+        sz.y += childSize.y;
 
-    if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE))
-    {
-        if (currentStyle.HasBulletStyle())
-        {
-            if (currentStyle.GetBulletStyle() != style.GetBulletStyle())
-            {
-                // 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 (node == endPara)
+            break;
     }
 
-    if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER))
-    {
-        if (currentStyle.HasBulletNumber())
-        {
-            if (currentStyle.GetBulletNumber() != style.GetBulletNumber())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NUMBER);
-            }
-        }
-        else
-            currentStyle.SetBulletNumber(style.GetBulletNumber());
-    }
+    size = sz;
 
-    if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT))
-    {
-        if (currentStyle.HasBulletText())
-        {
-            if (currentStyle.GetBulletText() != style.GetBulletText())
-            {
-                // 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());
-        }
-    }
+    return true;
+}
 
-    if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME))
-    {
-        if (currentStyle.HasBulletName())
-        {
-            if (currentStyle.GetBulletName() != style.GetBulletName())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME);
-            }
-        }
-        else
-        {
-            currentStyle.SetBulletName(style.GetBulletName());
-        }
-    }
+/// Get the paragraph at the given position
+wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtPosition(long pos, bool caretPosition) const
+{
+    if (caretPosition)
+        pos ++;
 
-    if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL))
+    // First find the first paragraph whose starting position is within the range.
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        if (currentStyle.HasURL())
-        {
-            if (currentStyle.GetURL() != style.GetURL())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_URL;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL);
-            }
-        }
-        else
-        {
-            currentStyle.SetURL(style.GetURL());
-        }
-    }
+        // child is a paragraph
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (child != NULL);
 
-    if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_EFFECTS))
-    {
-        if (currentStyle.HasTextEffects())
+        if (child)
         {
-            // We need to find the bits in the new style that are different:
-            // just look at those bits that are specified by the new style.
-                
-            int currentRelevantTextEffects = currentStyle.GetTextEffects() & style.GetTextEffectFlags();
-            int newRelevantTextEffects = style.GetTextEffects() & style.GetTextEffectFlags();
+            // Return first child in buffer if position is -1
+            // if (pos == -1)
+            //    return child;
 
-            if (currentRelevantTextEffects != newRelevantTextEffects)
-            {
-                // Find the text effects that were different, using XOR
-                int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects;
-                    
-                // Clash of style - mark as such
-                multipleTextEffectAttributes |= differentEffects;
-                currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects);
-            }
-        }
-        else
-        {
-            currentStyle.SetTextEffects(style.GetTextEffects());
-            currentStyle.SetTextEffectFlags(style.GetTextEffectFlags());
+            if (child->GetRange().Contains(pos))
+                return child;
         }
-    }
 
-    if (style.HasOutlineLevel() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_OUTLINE_LEVEL))
-    {
-        if (currentStyle.HasOutlineLevel())
-        {
-            if (currentStyle.GetOutlineLevel() != style.GetOutlineLevel())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_OUTLINE_LEVEL;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_OUTLINE_LEVEL);
-            }
-        }
-        else
-            currentStyle.SetOutlineLevel(style.GetOutlineLevel());
+        node = node->GetNext();
     }
-
-    return true;
+    return NULL;
 }
 
-/// 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)
+/// Get the line at the given position
+wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool caretPosition) const
 {
-    style = wxTextAttrEx();
+    if (caretPosition)
+        pos ++;
 
-    // The attributes that aren't valid because of multiple styles within the range
-    long multipleStyleAttributes = 0;
-    int multipleTextEffectAttributes = 0;
-    
-    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
+    // First find the first paragraph whose starting position is within the range.
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData();
-        if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
+        wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
+        if (obj->GetRange().Contains(pos))
         {
-            if (para->GetChildren().GetCount() == 0)
-            {
-                wxTextAttrEx paraStyle = para->GetCombinedAttributes();
+            // child is a paragraph
+            wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph);
+            // wxASSERT (child != NULL);
 
-                CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);
-            }
-            else
+            if (child)
             {
-                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, multipleTextEffectAttributes);
-
-                wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
-
-                while (childNode)
+                wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+                while (node2)
                 {
-                    wxRichTextObject* child = childNode->GetData();
-                    if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
-                    {
-                        wxTextAttrEx childStyle = para->GetCombinedAttributes(child->GetAttributes());
+                    wxRichTextLine* line = node2->GetData();
 
-                        // Now collect character attributes only
-                        childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
+                    wxRichTextRange range = line->GetAbsoluteRange();
 
-                        CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes);
-                    }
+                    if (range.Contains(pos) ||
 
-                    childNode = childNode->GetNext();
+                        // If the position is end-of-paragraph, then return the last line of
+                        // of the paragraph.
+                        ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
+                        return line;
+
+                    node2 = node2->GetNext();
                 }
             }
         }
+
         node = node->GetNext();
     }
-    return true;
-}
 
-/// Set default style
-bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style)
-{
-    m_defaultAttributes = style;
-    return true;
+    int lineCount = GetLineCount();
+    if (lineCount > 0)
+        return GetLineForVisibleLineNumber(lineCount-1);
+    else
+        return NULL;
 }
 
-/// 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
+/// Get the line at the given y pixel position, or the last line.
+wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtYPosition(int y) 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);
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (child != NULL);
 
-        if (para)
+        if (child)
         {
-            // Stop searching if we're beyond the range of interest
-            if (para->GetRange().GetStart() > range.GetEnd())
-                return foundCount == matchingCount;
-
-            if (!para->GetRange().IsOutside(range))
+            wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+            while (node2)
             {
-                wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
+                wxRichTextLine* line = node2->GetData();
 
-                while (node2)
-                {
-                    wxRichTextObject* child = node2->GetData();
-                    if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
-                    {
-                        foundCount ++;
-                        wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes());
+                wxRect rect(line->GetRect());
 
-                        if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
-                            matchingCount ++;
-                    }
+                if (y <= rect.GetBottom())
+                    return line;
 
-                    node2 = node2->GetNext();
-                }
+                node2 = node2->GetNext();
             }
         }
 
         node = node->GetNext();
     }
 
-    return foundCount == matchingCount;
+    // Return last line
+    int lineCount = GetLineCount();
+    if (lineCount > 0)
+        return GetLineForVisibleLineNumber(lineCount-1);
+    else
+        return NULL;
 }
 
-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
+/// Get the number of visible lines
+int wxRichTextParagraphLayoutBox::GetLineCount() const
 {
-    int foundCount = 0;
-    int matchingCount = 0;
+    int count = 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))
-            {
-                wxTextAttrEx textAttr = GetAttributes();
-                // Apply the paragraph style
-                wxRichTextApplyStyle(textAttr, para->GetAttributes());
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (child != NULL);
 
-                foundCount ++;
-                if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
-                    matchingCount ++;
-            }
-        }
+        if (child)
+            count += child->GetLines().GetCount();
 
         node = node->GetNext();
     }
-    return foundCount == matchingCount;
+    return count;
 }
 
-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
-{
-    wxRichTextAttr richStyle = style;
-    return HasParagraphAttributes(range, richStyle);
-}
 
-void wxRichTextParagraphLayoutBox::Clear()
+/// Get the paragraph for a given line
+wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const
 {
-    DeleteChildren();
+    return GetParagraphAtPosition(line->GetAbsoluteRange().GetStart());
 }
 
-void wxRichTextParagraphLayoutBox::Reset()
+/// Get the line size at the given position
+wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretPosition) const
 {
-    Clear();
-
-    AddParagraph(wxEmptyString);
-    
-    Invalidate(wxRICHTEXT_ALL);
+    wxRichTextLine* line = GetLineAtPosition(pos, caretPosition);
+    if (line)
+    {
+        return line->GetSize();
+    }
+    else
+        return wxSize(0, 0);
 }
 
-/// Invalidate the buffer. With no argument, invalidates whole buffer.
-void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange)
+
+/// Convenience function to add a paragraph of text
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxRichTextAttr* paraStyle)
 {
-    SetDirty(true);
+    // 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.
 
-    if (invalidRange == wxRICHTEXT_ALL)
+    wxRichTextAttr defaultCharStyle;
+    wxRichTextAttr defaultParaStyle;
+
+    // If the default style is a named paragraph style, don't apply any character formatting
+    // to the initial text string.
+    if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
     {
-        m_invalidRange = wxRICHTEXT_ALL;
-        return;
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
     }
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
 
-    // Already invalidating everything
-    if (m_invalidRange == wxRICHTEXT_ALL)
-        return;
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;
+
+    wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
+    para->GetAttributes().GetTextBoxAttr().Reset();
+
+    AppendChild(para);
+
+    UpdateRanges();
 
-    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());
+    return para->GetRange();
 }
 
-/// Get invalid range, rounding to entire paragraphs if argument is true.
-wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const
+/// Adds multiple paragraphs, based on newlines.
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxRichTextAttr* paraStyle)
 {
-    if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE)
-        return m_invalidRange;
+    // 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.
 
-    wxRichTextRange range = m_invalidRange;
+    wxRichTextAttr defaultCharStyle;
+    wxRichTextAttr defaultParaStyle;
 
-    if (wholeParagraphs)
+    // If the default style is a named paragraph style, don't apply any character formatting
+    // to the initial text string.
+    if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
     {
-        wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
-        wxRichTextParagraph* para2 = GetParagraphAtPosition(range.GetEnd());
-        if (para1)
-            range.SetStart(para1->GetRange().GetStart());
-        if (para2)
-            range.SetEnd(para2->GetRange().GetEnd());
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
     }
-    return range;
-}
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
 
-/// 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;
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;
 
-    int foundCount = 0;
+    wxRichTextParagraph* firstPara = NULL;
+    wxRichTextParagraph* lastPara = NULL;
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
+    wxRichTextRange range(-1, -1);
 
-        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.
+    size_t i = 0;
+    size_t len = text.length();
+    wxString line;
+    wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+    para->GetAttributes().GetTextBoxAttr().Reset();
 
-            if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
-            {
-                int currentIndent = para->GetAttributes().GetLeftIndent();
+    AppendChild(para);
 
-                wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
-                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
-                if (paraDef && !listDef)
-                {
-                    para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet);
-                    foundCount ++;
-                }
-                else if (listDef && !paraDef)
-                {
-                    // Set overall style defined for the list style definition
-                    para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+    firstPara = para;
+    lastPara = para;
 
-                    // 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->GetStyleMergedWithBase(styleSheet));
-                    foundCount ++;
-                }
-            }
-            else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+    while (i < len)
+    {
+        wxChar ch = text[i];
+        if (ch == wxT('\n') || ch == wxT('\r'))
+        {
+            if (i != (len-1))
             {
-                int currentIndent = para->GetAttributes().GetLeftIndent();
-
-                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+                wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+                plainText->SetText(line);
 
-                // Overall list definition style
-                para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
+                para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+                para->GetAttributes().GetTextBoxAttr().Reset();
 
-                // Style for this level
-                wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+                AppendChild(para);
 
-                foundCount ++;
-            }
-            else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty())
-            {
-                wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
-                if (def)
-                {
-                    para->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);
-                    foundCount ++;
-                }
+                lastPara = para;
+                line = wxEmptyString;
             }
         }
+        else
+            line += ch;
 
-        node = node->GetNext();
+        i ++;
     }
-    return foundCount != 0;
-}
 
-/// Set list style
-bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
-{
-    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
-    
-    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;
+    if (!line.empty())
+    {
+        wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+        plainText->SetText(line);
+    }
 
-    wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+    UpdateRanges();
 
-    // If we are associated with a control, make undoable; otherwise, apply immediately
-    // to the data.
+    return wxRichTextRange(firstPara->GetRange().GetStart(), lastPara->GetRange().GetEnd());
+}
 
-    bool haveControl = (GetRichTextCtrl() != NULL);
+/// Convenience function to add an image
+wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxRichTextAttr* paraStyle)
+{
+    // 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.
 
-    wxRichTextAction* action = NULL;
+    wxRichTextAttr defaultCharStyle;
+    wxRichTextAttr defaultParaStyle;
 
-    if (haveControl && withUndo)
+    // If the default style is a named paragraph style, don't apply any character formatting
+    // to the initial text string.
+    if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
     {
-        action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
-        action->SetRange(range);
-        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
     }
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
 
-    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);
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;
 
-                if (haveControl && withUndo)
-                {
-                    newPara = new wxRichTextParagraph(*para);
-                    action->GetNewParagraphs().AppendChild(newPara);
+    wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
+    para->GetAttributes().GetTextBoxAttr().Reset();
+    AppendChild(para);
+    para->AppendChild(new wxRichTextImage(image, this, cStyle));
 
-                    // Also store the old ones for Undo
-                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
-                }
-                else
-                    newPara = para;
+    UpdateRanges();
 
-                if (def)
-                {
-                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
-                    int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent);
+    return para->GetRange();
+}
 
-                    // 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, styleSheet));
-                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+/// 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.
 
-                    // Now we need to do numbering
-                    if (renumber)
-                    {
-                        newPara->GetAttributes().SetBulletNumber(n);
-                    }
+bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment)
+{
+    // First, find the first paragraph whose starting position is within the range.
+    wxRichTextParagraph* para = GetParagraphAtPosition(position);
+    if (para)
+    {
+        wxRichTextAttr originalAttr = para->GetAttributes();
 
-                    n ++;
-                }
-                else if (!newPara->GetAttributes().GetListStyleName().IsEmpty())
-                {
-                    // if def is NULL, remove list style, applying any associated paragraph style
-                    // to restore the attributes
+        wxRichTextObjectList::compatibility_iterator node = m_children.Find(para);
 
-                    newPara->GetAttributes().SetListStyleName(wxEmptyString);
-                    newPara->GetAttributes().SetLeftIndent(0, 0);
-                    newPara->GetAttributes().SetBulletText(wxEmptyString);
+        // Now split at this position, returning the object to insert the new
+        // ones in front of.
+        wxRichTextObject* nextObject = para->SplitAt(position);
 
-                    // 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);
+        // Special case: partial paragraph, just one paragraph. Might be a small amount of
+        // text, for example, so let's optimize.
 
-                    if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty())
-                    {
-                        wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName());
-                        if (def)
-                        {
-                            newPara->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);
-                        }
-                    }
+        if (fragment.GetPartialParagraph() && fragment.GetChildren().GetCount() == 1)
+        {
+            // Add the first para to this para...
+            wxRichTextObjectList::compatibility_iterator firstParaNode = fragment.GetChildren().GetFirst();
+            if (!firstParaNode)
+                return false;
+
+            // Iterate through the fragment paragraph inserting the content into this paragraph.
+            wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
+            wxASSERT (firstPara != NULL);
+
+            wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
+            while (objectNode)
+            {
+                wxRichTextObject* newObj = objectNode->GetData()->Clone();
+
+                if (!nextObject)
+                {
+                    // Append
+                    para->AppendChild(newObj);
+                }
+                else
+                {
+                    // Insert before nextObject
+                    para->InsertChild(newObj, nextObject);
                 }
+
+                objectNode = objectNode->GetNext();
             }
-        }
 
-        node = node->GetNext();
-    }
+            return true;
+        }
+        else
+        {
+            // Procedure for inserting a fragment consisting of a number of
+            // paragraphs:
+            //
+            // 1. Remove and save the content that's after the insertion point, for adding
+            //    back once we've added the fragment.
+            // 2. Add the content from the first fragment paragraph to the current
+            //    paragraph.
+            // 3. Add remaining fragment paragraphs after the current paragraph.
+            // 4. Add back the saved content from the first paragraph. If partialParagraph
+            //    is true, add it to the last paragraph added and not a new one.
 
-    // Do action, or delay it until end of batch.
-    if (haveControl && withUndo)
-        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+            // 1. Remove and save objects after split point.
+            wxList savedObjects;
+            if (nextObject)
+                para->MoveToList(nextObject, savedObjects);
 
-    return true;
-}
+            // 2. Add the content from the 1st fragment paragraph.
+            wxRichTextObjectList::compatibility_iterator firstParaNode = fragment.GetChildren().GetFirst();
+            if (!firstParaNode)
+                return false;
 
-bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
-{
-    if (GetStyleSheet())
-    {
-        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName);
-        if (def)
-            return SetListStyle(range, def, flags, startFrom, specifiedLevel);
-    }
-    return false;
-}
+            wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
+            wxASSERT(firstPara != NULL);
 
-/// Clear list for given range
-bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags)
-{
-    return SetListStyle(range, NULL, flags);
-}
+            if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE))
+                para->SetAttributes(firstPara->GetAttributes());
 
-/// 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);
-}
+            // Save empty paragraph attributes for appending later
+            // These are character attributes deliberately set for a new paragraph. Without this,
+            // we couldn't pass default attributes when appending a new paragraph.
+            wxRichTextAttr emptyParagraphAttributes;
 
-/// 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)
-{
-    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+            wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
 
-    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
+            if (objectNode && firstPara->GetChildren().GetCount() == 1 && objectNode->GetData()->IsEmpty())
+                emptyParagraphAttributes = objectNode->GetData()->GetAttributes();
 
-    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
+            while (objectNode)
+            {
+                wxRichTextObject* newObj = objectNode->GetData()->Clone();
 
-    // Max number of levels
-    const int maxLevels = 10;
+                // Append
+                para->AppendChild(newObj);
 
-    // The level we're looking at now
-    int currentLevel = -1;
+                objectNode = objectNode->GetNext();
+            }
 
-    // The item number for each level
-    int levels[maxLevels];
-    int i;
+            // 3. Add remaining fragment paragraphs after the current paragraph.
+            wxRichTextObjectList::compatibility_iterator nextParagraphNode = node->GetNext();
+            wxRichTextObject* nextParagraph = NULL;
+            if (nextParagraphNode)
+                nextParagraph = nextParagraphNode->GetData();
 
-    // 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
-    }
+            wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext();
+            wxRichTextParagraph* finalPara = para;
 
-    wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+            bool needExtraPara = (!i || !fragment.GetPartialParagraph());
 
-    // If we are associated with a control, make undoable; otherwise, apply immediately
-    // to the data.
+            // If there was only one paragraph, we need to insert a new one.
+            while (i)
+            {
+                wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
+                wxASSERT( para != NULL );
 
-    bool haveControl = (GetRichTextCtrl() != NULL);
+                finalPara = (wxRichTextParagraph*) para->Clone();
 
-    wxRichTextAction* action = NULL;
+                if (nextParagraph)
+                    InsertChild(finalPara, nextParagraph);
+                else
+                    AppendChild(finalPara);
 
-    if (haveControl && withUndo)
-    {
-        action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
-        action->SetRange(range);
-        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
-    }
+                i = i->GetNext();
+            }
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
+            // If there was only one paragraph, or we have full paragraphs in our fragment,
+            // we need to insert a new one.
+            if (needExtraPara)
+            {
+                finalPara = new wxRichTextParagraph;
 
-        if (para && para->GetChildCount() > 0)
-        {
-            // Stop searching if we're beyond the range of interest
-            if (para->GetRange().GetStart() > range.GetEnd())
-                break;
+                if (nextParagraph)
+                    InsertChild(finalPara, nextParagraph);
+                else
+                    AppendChild(finalPara);
+            }
 
-            if (!para->GetRange().IsOutside(range))
+            // 4. Add back the remaining content.
+            if (finalPara)
             {
-                // We'll be using a copy of the paragraph to make style changes,
-                // not updating the buffer directly.
-                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+                if (nextObject)
+                    finalPara->MoveFromList(savedObjects);
 
-                if (haveControl && withUndo)
+                // Ensure there's at least one object
+                if (finalPara->GetChildCount() == 0)
                 {
-                    newPara = new wxRichTextParagraph(*para);
-                    action->GetNewParagraphs().AppendChild(newPara);
+                    wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
+                    text->SetAttributes(emptyParagraphAttributes);
 
-                    // Also store the old ones for Undo
-                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                    finalPara->AppendChild(text);
                 }
-                else
-                    newPara = para;
+            }
 
-                wxRichTextListStyleDefinition* defToUse = def;
-                if (!defToUse)
-                {
-                    if (styleSheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
-                        defToUse = styleSheet->FindListStyle(newPara->GetAttributes().GetListStyleName());
-                }
+            if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara)
+                finalPara->SetAttributes(firstPara->GetAttributes());
+            else if (finalPara && finalPara != para)
+                finalPara->SetAttributes(originalAttr);
 
-                if (defToUse)
-                {
-                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
-                    int thisLevel = defToUse->FindLevelForIndent(thisIndent);
+            return true;
+        }
+    }
+    else
+    {
+        // Append
+        wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst();
+        while (i)
+        {
+            wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
+            wxASSERT( para != NULL );
 
-                    // If we've specified a level to apply to all, change the level.
-                    if (specifiedLevel != -1)
-                        thisLevel = specifiedLevel;
+            AppendChild(para->Clone());
 
-                    // Do promotion if specified
-                    if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange))
-                    {
-                        thisLevel = thisLevel - promoteBy;
-                        if (thisLevel < 0)
-                            thisLevel = 0;
-                        if (thisLevel > 9)
-                            thisLevel = 9;
-                    }
+            i = i->GetNext();
+        }
 
-                    // Apply the overall list style, and item style for this level
-                    wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
-                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+        return true;
+    }
+}
 
-                    // OK, we've (re)applied the style, now let's get the numbering right.
+/// 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, wxRichTextParagraphLayoutBox& fragment)
+{
+    wxRichTextObjectList::compatibility_iterator i = GetChildren().GetFirst();
+    while (i)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
+        wxASSERT( para != NULL );
 
-                    if (currentLevel == -1)
-                        currentLevel = thisLevel;
+        if (!para->GetRange().IsOutside(range))
+        {
+            fragment.AppendChild(para->Clone());
+        }
+        i = i->GetNext();
+    }
 
-                    // 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;
-                    }
+    // Now top and tail the first and last paragraphs in our new fragment (which might be the same).
+    if (!fragment.IsEmpty())
+    {
+        wxRichTextParagraph* firstPara = wxDynamicCast(fragment.GetChildren().GetFirst()->GetData(), wxRichTextParagraph);
+        wxASSERT( firstPara != NULL );
 
-                    // 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] ++;
-                    }
+        wxRichTextParagraph* lastPara = wxDynamicCast(fragment.GetChildren().GetLast()->GetData(), wxRichTextParagraph);
+        wxASSERT( lastPara != NULL );
 
-                    newPara->GetAttributes().SetBulletNumber(levels[currentLevel]);
+        if (!firstPara || !lastPara)
+            return false;
 
-                    // 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);
-                    }
-                }
-            }
-        }
+        bool isFragment = (range.GetEnd() < lastPara->GetRange().GetEnd());
 
-        node = node->GetNext();
-    }
+        long firstPos = firstPara->GetRange().GetStart();
 
-    // Do action, or delay it until end of batch.
-    if (haveControl && withUndo)
-        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+        // Adjust for renumbering from zero
+        wxRichTextRange topTailRange(range.GetStart() - firstPos, range.GetEnd() - firstPos);
 
-    return true;
-}
+        long end;
+        fragment.CalculateRange(0, end);
 
-bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
-{
-    if (GetStyleSheet())
-    {
-        wxRichTextListStyleDefinition* def = NULL;
-        if (!defName.IsEmpty())
-            def = GetStyleSheet()->FindListStyle(defName);
-        return NumberList(range, def, flags, startFrom, specifiedLevel);
-    }
-    return false;
-}
+        // Chop off the start of the paragraph
+        if (topTailRange.GetStart() > 0)
+        {
+            wxRichTextRange r(0, topTailRange.GetStart()-1);
+            firstPara->DeleteRange(r);
 
-/// 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)
-{
-    // 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.
+            // Make sure the numbering is correct
+            fragment.CalculateRange(0, end);
 
-    // For now, only renumber within the promotion range.
+            // Now, we've deleted some positions, so adjust the range
+            // accordingly.
+            topTailRange.SetStart(range.GetLength());
+            topTailRange.SetEnd(fragment.GetOwnRange().GetEnd());
+        }
+        else
+        {
+            topTailRange.SetStart(range.GetLength());
+            topTailRange.SetEnd(fragment.GetOwnRange().GetEnd());
+        }
 
-    return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel);
-}
+        if (topTailRange.GetStart() < lastPara->GetRange().GetEnd())
+        {
+            lastPara->DeleteRange(topTailRange);
 
-bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
-{
-    if (GetStyleSheet())
-    {
-        wxRichTextListStyleDefinition* def = NULL;
-        if (!defName.IsEmpty())
-            def = GetStyleSheet()->FindListStyle(defName);
-        return PromoteList(promoteBy, range, def, flags, specifiedLevel);
+            // Make sure the numbering is correct
+            long end;
+            fragment.CalculateRange(0, end);
+
+            // We only have part of a paragraph at the end
+            fragment.SetPartialParagraph(true);
+        }
+        else
+        {
+            // We have a partial paragraph (don't save last new paragraph marker)
+            // or complete paragraph
+            fragment.SetPartialParagraph(isFragment);
+        }
     }
-    return false;
+
+    return true;
 }
 
-/// 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
+/// Given a position, get the number of the visible line (potentially many to a paragraph),
+/// starting from zero at the start of the buffer.
+long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosition, bool startOfLine) const
 {
-    if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
-        return false;
-    
-    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
-    if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
+    if (caretPosition)
+        pos ++;
+
+    int lineCount = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        wxRichTextListStyleDefinition* def = styleSheet->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;
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT( child != NULL );
 
-            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)
+        if (child)
+        {
+            if (child->GetRange().Contains(pos))
             {
-                wxString text = previousParagraph->GetAttributes().GetBulletText();
-                if (!text.IsEmpty())
+                wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+                while (node2)
                 {
-                    int pos = text.Find(wxT('.'), true);
-                    if (pos != wxNOT_FOUND)
+                    wxRichTextLine* line = node2->GetData();
+                    wxRichTextRange lineRange = line->GetAbsoluteRange();
+
+                    if (lineRange.Contains(pos) || pos == lineRange.GetStart())
                     {
-                        text = text.Mid(0, text.Length() - pos - 1);
+                        // 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 (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos)
+                            return lineCount - 1;
+                        else
+                            return lineCount;
                     }
-                    else
-                        text = wxEmptyString;
-                    if (!text.IsEmpty())
-                        text += wxT(".");
-                    text += wxString::Format(wxT("%d"), nextNumber);
-                    attr.SetBulletText(text);
+
+                    lineCount ++;
+
+                    node2 = node2->GetNext();
                 }
+                // If we didn't find it in the lines, it must be
+                // the last position of the paragraph. So return the last line.
+                return lineCount-1;
             }
-            
-            return true;
+            else
+                lineCount += child->GetLines().GetCount();
         }
-        else
-            return false;
+
+        node = node->GetNext();
     }
-    else
-        return false;
+
+    // Not found
+    return -1;
 }
 
-/*!
- * wxRichTextParagraph
- * This object represents a single paragraph (or in a straight text editor, a line).
- */
+/// Given a line number, get the corresponding wxRichTextLine object.
+wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineForVisibleLineNumber(long lineNumber) const
+{
+    int lineCount = 0;
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT(child != NULL);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox)
+        if (child)
+        {
+            if (lineNumber < (int) (child->GetLines().GetCount() + lineCount))
+            {
+                wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+                while (node2)
+                {
+                    wxRichTextLine* line = node2->GetData();
 
-wxArrayInt wxRichTextParagraph::sm_defaultTabs;
+                    if (lineCount == lineNumber)
+                        return line;
 
-wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style):
-    wxRichTextBox(parent)
-{
-    if (style)
-        SetAttributes(*style);
-}
+                    lineCount ++;
 
-wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* paraStyle, wxTextAttrEx* charStyle):
-    wxRichTextBox(parent)
-{
-    if (paraStyle)
-        SetAttributes(*paraStyle);
+                    node2 = node2->GetNext();
+                }
+            }
+            else
+                lineCount += child->GetLines().GetCount();
+        }
 
-    AppendChild(new wxRichTextPlainText(text, this, charStyle));
-}
+        node = node->GetNext();
+    }
 
-wxRichTextParagraph::~wxRichTextParagraph()
-{
-    ClearLines();
+    // Didn't find it
+    return NULL;
 }
 
-/// Draw the item
-bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
+/// Delete range from layout.
+bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
 {
-    wxTextAttrEx attr = GetCombinedAttributes();
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
-    // Draw the bullet, if any
-    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+    wxRichTextParagraph* firstPara = NULL;
+    while (node)
     {
-        if (attr.GetLeftSubIndent() != 0)
-        {
-            int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
-            int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
+        wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (obj != NULL);
 
-            wxTextAttrEx bulletAttr(GetCombinedAttributes());
+        wxRichTextObjectList::compatibility_iterator next = node->GetNext();
 
-            // Combine with the font of the first piece of content, if one is specified
-            if (GetChildren().GetCount() > 0)
+        if (obj)
+        {
+            // Delete the range in each paragraph
+
+            if (!obj->GetRange().IsOutside(range))
             {
-                wxRichTextObject* firstObj = (wxRichTextObject*) GetChildren().GetFirst()->GetData();
-                if (firstObj->GetAttributes().HasFont())
+                // Deletes the content of this object within the given range
+                obj->DeleteRange(range);
+
+                wxRichTextRange thisRange = obj->GetRange();
+                wxRichTextAttr thisAttr = obj->GetAttributes();
+
+                // If the whole paragraph is within the range to delete,
+                // delete the whole thing.
+                if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd())
                 {
-                    wxRichTextApplyStyle(bulletAttr, firstObj->GetAttributes());
+                    // Delete the whole object
+                    RemoveChild(obj, true);
+                    obj = NULL;
                 }
-            }
+                else if (!firstPara)
+                    firstPara = obj;
 
-            // Get line height from first line, if any
-            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
+                // If the range includes the paragraph end, we need to join this
+                // and the next paragraph.
+                if (range.GetEnd() <= thisRange.GetEnd())
+                {
+                    // We need to move the objects from the next paragraph
+                    // to this paragraph
 
-            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);
+                    wxRichTextParagraph* nextParagraph = NULL;
+                    if ((range.GetEnd() < thisRange.GetEnd()) && obj)
+                        nextParagraph = obj;
+                    else
+                    {
+                        // We're ending at the end of the paragraph, so merge the _next_ paragraph.
+                        if (next)
+                            nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
+                    }
 
-                dc.SetFont(font);
+                    bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara;
 
-                lineHeight = dc.GetCharHeight();
-                linePos = GetPosition();
-                linePos.y += spaceBeforePara;
-            }
+                    wxRichTextAttr nextParaAttr;
+                    if (applyFinalParagraphStyle)
+                    {
+                        // Special case when deleting the end of a paragraph - use _this_ paragraph's style,
+                        // not the next one.
+                        if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd())
+                            nextParaAttr = thisAttr;
+                        else
+                            nextParaAttr = nextParagraph->GetAttributes();
+                    }
 
-            wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight);
+                    if (firstPara && nextParagraph && firstPara != nextParagraph)
+                    {
+                        // Move the objects to the previous para
+                        wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
 
-            if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)
-            {
-                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();
-                
-                if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
-                    wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);
+                        while (node1)
+                        {
+                            wxRichTextObject* obj1 = node1->GetData();
+
+                            firstPara->AppendChild(obj1);
+
+                            wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
+                            nextParagraph->GetChildren().Erase(node1);
+
+                            node1 = next1;
+                        }
+
+                        // Delete the paragraph
+                        RemoveChild(nextParagraph, true);
+                    }
+
+                    // Avoid empty paragraphs
+                    if (firstPara && firstPara->GetChildren().GetCount() == 0)
+                    {
+                        wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
+                        firstPara->AppendChild(text);
+                    }
+
+                    if (applyFinalParagraphStyle)
+                        firstPara->SetAttributes(nextParaAttr);
+
+                    return true;
+                }
             }
         }
+
+        node = next;
     }
 
-    // Draw the range for each line, one object at a time.
+    return true;
+}
 
-    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
+/// Get any text in this object for the given range
+wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& range) const
+{
+    int lineCount = 0;
+    wxString text;
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextLine* line = node->GetData();
-        wxRichTextRange lineRange = line->GetAbsoluteRange();
-
-        int maxDescent = line->GetDescent();
-
-        // Lines are specified relative to the paragraph
-
-        wxPoint linePosition = line->GetPosition() + GetPosition();
-        wxPoint objectPosition = linePosition;
-
-        // Loop through objects until we get to the one within range
-        wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
-        while (node2)
+        wxRichTextObject* child = node->GetData();
+        if (!child->GetRange().IsOutside(range))
         {
-            wxRichTextObject* child = node2->GetData();
-            
-            if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
-            {
-                // Draw this part of the line at the correct position
-                wxRichTextRange objectRange(child->GetRange());
-                objectRange.LimitTo(lineRange);
+            wxRichTextRange childRange = range;
+            childRange.LimitTo(child->GetRange());
 
-                wxSize objectSize;
-                int descent = 0;
-                child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);
+            wxString childText = child->GetTextForRange(childRange);
 
-                // Use the child object's width, but the whole line's height
-                wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
-                child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style);
+            text += childText;
 
-                objectPosition.x += objectSize.x;
-            }
-            else if (child->GetRange().GetStart() > lineRange.GetEnd())
-                // Can break out of inner loop now since we've passed this line's range
-                break;
+            if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext())
+                text += wxT("\n");
 
-            node2 = node2->GetNext();
+            lineCount ++;
         }
-
         node = node->GetNext();
     }
 
-    return true;
+    return text;
 }
 
-/// Lay the item out
-bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
+/// Get all the text
+wxString wxRichTextParagraphLayoutBox::GetText() const
 {
-    wxTextAttrEx attr = GetCombinedAttributes();
+    return GetTextForRange(GetOwnRange());
+}
 
-    // ClearLines();
+/// Get the paragraph by number
+wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphAtLine(long paragraphNumber) const
+{
+    if ((size_t) paragraphNumber >= GetChildCount())
+        return NULL;
 
-    // Increase the size of the paragraph due to spacing
-    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());
+    return (wxRichTextParagraph*) GetChild((size_t) paragraphNumber);
+}
 
-    int lineSpacing = 0;
+/// Get the length of the paragraph
+int wxRichTextParagraphLayoutBox::GetParagraphLength(long paragraphNumber) const
+{
+    wxRichTextParagraph* para = GetParagraphAtLine(paragraphNumber);
+    if (para)
+        return para->GetRange().GetLength() - 1; // don't include newline
+    else
+        return 0;
+}
 
-    // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.
-    if (attr.GetLineSpacing() > 10 && attr.GetFont().Ok())
+/// Get the text of the paragraph
+wxString wxRichTextParagraphLayoutBox::GetParagraphText(long paragraphNumber) const
+{
+    wxRichTextParagraph* para = GetParagraphAtLine(paragraphNumber);
+    if (para)
+        return para->GetTextForRange(para->GetRange());
+    else
+        return wxEmptyString;
+}
+
+/// Convert zero-based line column and paragraph number to a position.
+long wxRichTextParagraphLayoutBox::XYToPosition(long x, long y) const
+{
+    wxRichTextParagraph* para = GetParagraphAtLine(y);
+    if (para)
     {
-        dc.SetFont(attr.GetFont());
-        lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10;
+        return para->GetRange().GetStart() + x;
     }
+    else
+        return -1;
+}
 
-    // Available space for text on each line differs.
-    int availableTextSpaceFirstLine = rect.GetWidth() - leftIndent - rightIndent;
+/// Convert zero-based position to line column and paragraph number
+bool wxRichTextParagraphLayoutBox::PositionToXY(long pos, long* x, long* y) const
+{
+    wxRichTextParagraph* para = GetParagraphAtPosition(pos);
+    if (para)
+    {
+        int count = 0;
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+        while (node)
+        {
+            wxRichTextObject* child = node->GetData();
+            if (child == para)
+                break;
+            count ++;
+            node = node->GetNext();
+        }
 
-    // Bullets start the text at the same position as subsequent lines
-    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
-        availableTextSpaceFirstLine -= leftSubIndent;
+        *y = count;
+        *x = pos - para->GetRange().GetStart();
 
-    int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent;
+        return true;
+    }
+    else
+        return false;
+}
 
-    // Start position for each line relative to the paragraph
-    int startPositionFirstLine = leftIndent;
-    int startPositionSubsequentLines = leftIndent + leftSubIndent;
+/// Get the leaf object in a paragraph at this position.
+/// Given a line number, get the corresponding wxRichTextLine object.
+wxRichTextObject* wxRichTextParagraphLayoutBox::GetLeafObjectAtPosition(long position) const
+{
+    wxRichTextParagraph* para = GetParagraphAtPosition(position);
+    if (para)
+    {
+        wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();
 
-    // If we have a bullet in this paragraph, the start position for the first line's text
-    // is actually leftIndent + leftSubIndent.
-    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
-        startPositionFirstLine = startPositionSubsequentLines;
+        while (node)
+        {
+            wxRichTextObject* child = node->GetData();
+            if (child->GetRange().Contains(position))
+                return child;
 
-    long lastEndPos = GetRange().GetStart()-1;
-    long lastCompletedEndPos = lastEndPos;
+            node = node->GetNext();
+        }
+        if (position == para->GetRange().GetEnd() && para->GetChildCount() > 0)
+            return para->GetChildren().GetLast()->GetData();
+    }
+    return NULL;
+}
 
-    int currentWidth = 0;
-    SetPosition(rect.GetPosition());
+/// Set character or paragraph text attributes: apply character styles only to immediate text nodes
+bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
+{
+    bool characterStyle = false;
+    bool paragraphStyle = false;
 
-    wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph
-    int lineHeight = 0;
-    int maxWidth = 0;
-    int maxDescent = 0;
+    if (style.IsCharacterStyle())
+        characterStyle = true;
+    if (style.IsParagraphStyle())
+        paragraphStyle = true;
 
-    int lineCount = 0;
+    wxRichTextBuffer* buffer = GetBuffer();
 
-    // Split up lines
+    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);
+    bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+    bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0);
 
-    // We may need to go back to a previous child, in which case create the new line,
-    // find the child corresponding to the start position of the string, and
-    // continue.
+    // Apply paragraph style first, if any
+    wxRichTextAttr wholeStyle(style);
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
+    if (!removeStyle && wholeStyle.HasParagraphStyleName() && buffer->GetStyleSheet())
     {
-        wxRichTextObject* child = node->GetData();
+        wxRichTextParagraphStyleDefinition* def = buffer->GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
+        if (def)
+            wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(buffer->GetStyleSheet()));
+    }
 
-        // If this is e.g. a composite text box, it will need to be laid out itself.
-        // But if just a text fragment or image, for example, this will
-        // do nothing. NB: won't we need to set the position after layout?
-        // since for example if position is dependent on vertical line size, we
-        // can't tell the position until the size is determined. So possibly introduce
-        // another layout phase.
+    // Limit the attributes to be set to the content to only character attributes.
+    wxRichTextAttr characterAttributes(wholeStyle);
+    characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 
-        // TODO: can't this be called only once per child?
-        child->Layout(dc, rect, style);
+    if (!removeStyle && characterAttributes.HasCharacterStyleName() && buffer->GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = buffer->GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
+        if (def)
+            wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(buffer->GetStyleSheet()));
+    }
 
-        // Available width depends on whether we're on the first or subsequent lines
-        int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines);
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
 
-        currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
+    bool haveControl = (buffer->GetRichTextCtrl() != NULL);
 
-        // We may only be looking at part of a child, if we searched back for wrapping
-        // and found a suitable point some way into the child. So get the size for the fragment
-        // if necessary.
-        
-        long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
-        long lastPosToUse = child->GetRange().GetEnd();
-        bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd());
-        
-        if (lineBreakInThisObject)
-            lastPosToUse = nextBreakPos;
+    wxRichTextAction* action = NULL;
 
-        wxSize childSize;
-        int childDescent = 0;
-        
-        if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing
-        {
-            childSize = child->GetCachedSize();
-            childDescent = child->GetDescent();
-        }
-        else
-            GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Change Style"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
+    }
 
-        // Cases:
-        // 1) There was a line break BEFORE the natural break
-        // 2) There was a line break AFTER the natural break
-        // 3) The child still fits (carry on)
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
 
-        if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableSpaceForText)) ||
-            (childSize.x + currentWidth > availableSpaceForText))
+        if (para && para->GetChildCount() > 0)
         {
-            long wrapPosition = 0;
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
 
-            // Find a place to wrap. This may walk back to previous children,
-            // for example if a word spans several objects.
-            if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition))
+            if (!para->GetRange().IsOutside(range))
             {
-                // If the function failed, just cut it off at the end of this child.
-                wrapPosition = child->GetRange().GetEnd();
-            }
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
 
-            // FindWrapPosition can still return a value that will put us in an endless wrapping loop
-            if (wrapPosition <= lastCompletedEndPos)
-                wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd());
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
 
-            // wxLogDebug(wxT("Split at %ld"), wrapPosition);
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
 
-            // Let's find the actual size of the current line now
-            wxSize actualSize;
-            wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
-            GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);
-            currentWidth = actualSize.x;
-            lineHeight = wxMax(lineHeight, actualSize.y);
-            maxDescent = wxMax(childDescent, maxDescent);
+                // If we're specifying paragraphs only, then we really mean character formatting
+                // to be included in the paragraph style
+                if ((paragraphStyle || parasOnly) && !charactersOnly)
+                {
+                    if (removeStyle)
+                    {
+                        // Removes the given style from the paragraph
+                        wxRichTextRemoveStyle(newPara->GetAttributes(), style);
+                    }
+                    else if (resetExistingStyle)
+                        newPara->GetAttributes() = wholeStyle;
+                    else
+                    {
+                        if (applyMinimal)
+                        {
+                            // Only apply attributes that will make a difference to the combined
+                            // style as seen on the display
+                            wxRichTextAttr combinedAttr(para->GetCombinedAttributes(true));
+                            wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr);
+                        }
+                        else
+                            wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle);
+                    }
+                }
 
-            // Add a new line
-            wxRichTextLine* line = AllocateLine(lineCount);
+                // When 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.
 
-            // 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);
+                // 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.
 
-            // Now move down a line. TODO: add margins, spacing
-            currentPosition.y += lineHeight;
-            currentPosition.y += lineSpacing;
-            currentWidth = 0;
-            maxDescent = 0;
-            maxWidth = wxMax(maxWidth, currentWidth);
+                if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd())
+                {
+                    wxRichTextRange childRange(range);
+                    childRange.LimitTo(newPara->GetRange());
 
-            lineCount ++;
+                    // 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 wxDUMMY_INITIALIZE(NULL);
+                    wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL);
 
-            // TODO: account for zero-length objects, such as fields
-            wxASSERT(wrapPosition > lastCompletedEndPos);
+                    if (childRange.GetStart() == newPara->GetRange().GetStart())
+                        firstObject = newPara->GetChildren().GetFirst()->GetData();
+                    else
+                        firstObject = newPara->SplitAt(range.GetStart());
 
-            lastEndPos = wrapPosition;
-            lastCompletedEndPos = lastEndPos;
+                    // Increment by 1 because we're apply the style one _after_ the split point
+                    long splitPoint = childRange.GetEnd();
+                    if (splitPoint != newPara->GetRange().GetEnd())
+                        splitPoint ++;
 
-            lineHeight = 0;
+                    // Find last object
+                    if (splitPoint == newPara->GetRange().GetEnd())
+                        lastObject = newPara->GetChildren().GetLast()->GetData();
+                    else
+                        // lastObject is set as a side-effect of splitting. It's
+                        // returned as the object before the new object.
+                        (void) newPara->SplitAt(splitPoint, & lastObject);
 
-            // May need to set the node back to a previous one, due to searching back in wrapping
-            wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1);
-            if (childAfterWrapPosition)
-                node = m_children.Find(childAfterWrapPosition);
-            else
-                node = node->GetNext();
-        }
-        else
-        {
-            // We still fit, so don't add a line, and keep going
-            currentWidth += childSize.x;
-            lineHeight = wxMax(lineHeight, childSize.y);
-            maxDescent = wxMax(childDescent, maxDescent);
+                    wxASSERT(firstObject != NULL);
+                    wxASSERT(lastObject != NULL);
 
-            maxWidth = wxMax(maxWidth, currentWidth);
-            lastEndPos = child->GetRange().GetEnd();
+                    if (!firstObject || !lastObject)
+                        continue;
 
-            node = node->GetNext();
-        }
-    }
+                    wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
+                    wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
 
-    // Add the last line - it's the current pos -> last para pos
-    // Substract -1 because the last position is always the end-paragraph position.
-    if (lastCompletedEndPos <= GetRange().GetEnd()-1)
-    {
-        currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
+                    wxASSERT(firstNode);
+                    wxASSERT(lastNode);
 
-        wxRichTextLine* line = AllocateLine(lineCount);
+                    wxRichTextObjectList::compatibility_iterator node2 = firstNode;
 
-        wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1);
+                    while (node2)
+                    {
+                        wxRichTextObject* child = node2->GetData();
 
-        // 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()));
+                        if (removeStyle)
+                        {
+                            // Removes the given style from the paragraph
+                            wxRichTextRemoveStyle(child->GetAttributes(), style);
+                        }
+                        else if (resetExistingStyle)
+                            child->GetAttributes() = characterAttributes;
+                        else
+                        {
+                            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(), true));
+                                wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr);
+                            }
+                            else
+                                wxRichTextApplyStyle(child->GetAttributes(), characterAttributes);
+                        }
 
-        line->SetPosition(currentPosition);
+                        if (node2 == lastNode)
+                            break;
 
-        if (lineHeight == 0)
-        {
-            if (attr.GetFont().Ok())
-                dc.SetFont(attr.GetFont());
-            lineHeight = dc.GetCharHeight();
-        }
-        if (maxDescent == 0)
-        {
-            int w, h;
-            dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent);
+                        node2 = node2->GetNext();
+                    }
+                }
+            }
         }
 
-        line->SetSize(wxSize(currentWidth, lineHeight));
-        line->SetDescent(maxDescent);
-        currentPosition.y += lineHeight;
-        currentPosition.y += lineSpacing;
-        lineCount ++;
+        node = node->GetNext();
     }
 
-    // Remove remaining unused line objects, if any
-    ClearUnusedLines(lineCount);
-
-    // Apply styles to wrapped lines
-    ApplyParagraphStyle(attr, rect);
-
-    SetCachedSize(wxSize(maxWidth, currentPosition.y + spaceBeforePara + spaceAfterPara));
-
-    m_dirty = false;
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        buffer->SubmitAction(action);
 
     return true;
 }
 
-/// Apply paragraph styles, such as centering, to wrapped lines
-void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wxRect& rect)
+// Just change the attributes for this single object.
+void wxRichTextParagraphLayoutBox::SetStyle(wxRichTextObject* obj, const wxRichTextAttr& textAttr, int flags)
 {
-    if (!attr.HasAlignment())
-        return;
-
-    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
-    while (node)
-    {
-        wxRichTextLine* line = node->GetData();
+    wxRichTextBuffer* buffer = GetBuffer();
+    bool withUndo = flags & wxRICHTEXT_SETSTYLE_WITH_UNDO;
+    bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+    bool haveControl = (buffer->GetRichTextCtrl() != NULL);
 
-        wxPoint pos = line->GetPosition();
-        wxSize size = line->GetSize();
+    wxRichTextAction *action = NULL;
+    wxRichTextAttr newAttr = obj->GetAttributes();
+    if (resetExistingStyle)
+        newAttr = textAttr;
+    else
+        newAttr.Apply(textAttr);
 
-        // centering, right-justification
-        if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
-        {
-            pos.x = (rect.GetWidth() - size.x)/2 + pos.x;
-            line->SetPosition(pos);
-        }
-        else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
-        {
-            pos.x = pos.x + rect.GetWidth() - size.x;
-            line->SetPosition(pos);
-        }
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Change Object Style"), wxRICHTEXT_CHANGE_ATTRIBUTES, buffer, obj->GetContainer(), buffer->GetRichTextCtrl());
+        action->SetRange(obj->GetRange().FromInternal());
+        action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
+        action->MakeObject(obj);
 
-        node = node->GetNext();
+        action->GetAttributes() = newAttr;
     }
+    else
+        obj->GetAttributes() = newAttr;
+
+    if (haveControl && withUndo)
+        buffer->SubmitAction(action);
 }
 
-/// Insert text at the given position
-bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
+/// Get the text attributes for this position.
+bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)
 {
-    wxRichTextObject* childToUse = NULL;
-    wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator();
+    return DoGetStyle(position, style, true);
+}
 
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        if (child->GetRange().Contains(pos) && child->GetRange().GetLength() > 0)
-        {
-            childToUse = child;
-            nodeToUse = node;
-            break;
-        }
+bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
+{
+    return DoGetStyle(position, style, false);
+}
 
-        node = node->GetNext();
-    }
+/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
+/// context attributes.
+bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles)
+{
+    wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
 
-    if (childToUse)
+    if (style.IsParagraphStyle())
     {
-        wxRichTextPlainText* textObject = wxDynamicCast(childToUse, wxRichTextPlainText);
-        if (textObject)
+        obj = GetParagraphAtPosition(position);
+        if (obj)
         {
-            int posInString = pos - textObject->GetRange().GetStart();
-
-            wxString newText = textObject->GetText().Mid(0, posInString) +
-                               text + textObject->GetText().Mid(posInString);
-            textObject->SetText(newText);
-
-            int textLength = text.length();
-
-            textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(),
-                                                 textObject->GetRange().GetEnd() + textLength));
-
-            // Increment the end range of subsequent fragments in this paragraph.
-            // We'll set the paragraph range itself at a higher level.
-
-            wxRichTextObjectList::compatibility_iterator node = nodeToUse->GetNext();
-            while (node)
+            if (combineStyles)
             {
-                wxRichTextObject* child = node->GetData();
-                child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength,
-                                                 textObject->GetRange().GetEnd() + textLength));
+                // Start with the base style
+                style = GetAttributes();
+                style.GetTextBoxAttr().Reset();
 
-                node = node->GetNext();
+                // Apply the paragraph style
+                wxRichTextApplyStyle(style, obj->GetAttributes());
             }
+            else
+                style = obj->GetAttributes();
 
             return true;
         }
-        else
-        {
-            // TODO: if not a text object, insert at closest position, e.g. in front of it
-        }
     }
     else
     {
-        // Add at end.
-        // Don't pass parent initially to suppress auto-setting of parent range.
-        // We'll do that at a higher level.
-        wxRichTextPlainText* textObject = new wxRichTextPlainText(text, this);
+        obj = GetLeafObjectAtPosition(position);
+        if (obj)
+        {
+            if (combineStyles)
+            {
+                wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);
+                style = para ? para->GetCombinedAttributes(obj->GetAttributes()) : obj->GetAttributes();
+            }
+            else
+                style = obj->GetAttributes();
 
-        AppendChild(textObject);
-        return true;
+            return true;
+        }
     }
-
     return false;
 }
 
-void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj)
+static bool wxHasStyle(long flags, long style)
 {
-    wxRichTextBox::Copy(obj);
+    return (flags & style) != 0;
 }
 
-/// Clear the cached lines
-void wxRichTextParagraph::ClearLines()
+/// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of
+/// content.
+bool wxRichTextParagraphLayoutBox::CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr)
 {
-    WX_CLEAR_LIST(wxRichTextLineList, m_cachedLines);
+    currentStyle.CollectCommonAttributes(style, clashingAttr, absentAttr);
+
+    return true;
 }
 
-/// 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, wxPoint position) const
+/// 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, wxRichTextAttr& style)
 {
-    if (!range.IsWithin(GetRange()))
-        return false;
-
-    if (flags & wxRICHTEXT_UNFORMATTED)
-    {
-        // Just use unformatted data, assume no line breaks
-        // TODO: take into account line breaks
+    style = wxRichTextAttr();
 
-        wxSize sz;
+    wxRichTextAttr clashingAttr;
+    wxRichTextAttr absentAttrPara, absentAttrChar;
 
-        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-        while (node)
+    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        if (para && !(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
         {
-            wxRichTextObject* child = node->GetData();
-            if (!child->GetRange().IsOutside(range))
+            if (para->GetChildren().GetCount() == 0)
             {
-                wxSize childSize;
+                wxRichTextAttr paraStyle = para->GetCombinedAttributes(true /* use box attributes */);
 
-                wxRichTextRange rangeToUse = range;
-                rangeToUse.LimitTo(child->GetRange());
-                int childDescent = 0;
+                CollectStyle(style, paraStyle, clashingAttr, absentAttrPara);
+            }
+            else
+            {
+                wxRichTextRange paraRange(para->GetRange());
+                paraRange.LimitTo(range);
+
+                // First collect paragraph attributes only
+                wxRichTextAttr paraStyle = para->GetCombinedAttributes();
+                paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
+                CollectStyle(style, paraStyle, clashingAttr, absentAttrPara);
+
+                wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
 
-                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
+                while (childNode)
                 {
-                    sz.y = wxMax(sz.y, childSize.y);
-                    sz.x += childSize.x;
-                    descent = wxMax(descent, childDescent);
+                    wxRichTextObject* child = childNode->GetData();
+                    if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
+                    {
+                        wxRichTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes(), true /* include box attributes */);
+
+                        // Now collect character attributes only
+                        childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
+
+                        CollectStyle(style, childStyle, clashingAttr, absentAttrChar);
+                    }
+
+                    childNode = childNode->GetNext();
                 }
             }
-
-            node = node->GetNext();
         }
-        size = sz;
+        node = node->GetNext();
     }
-    else
-    {
-        // Use formatted data, with line breaks
-        wxSize sz;
+    return true;
+}
 
-        // We're going to loop through each line, and then for each line,
-        // call GetRangeSize for the fragment that comprises that line.
-        // Only we have to do that multiple times within the line, because
-        // the line may be broken into pieces. For now ignore line break commands
-        // (so we can assume that getting the unformatted size for a fragment
-        // within a line is the actual size)
+/// Set default style
+bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxRichTextAttr& style)
+{
+    m_defaultAttributes = style;
+    return true;
+}
 
-        wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
-        while (node)
+/// 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)
         {
-            wxRichTextLine* line = node->GetData();
-            wxRichTextRange lineRange = line->GetAbsoluteRange();
-            if (!lineRange.IsOutside(range))
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                return foundCount == matchingCount && foundCount != 0;
+
+            if (!para->GetRange().IsOutside(range))
             {
-                wxSize lineSize;
+                wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
 
-                wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
                 while (node2)
                 {
                     wxRichTextObject* child = node2->GetData();
+                    // Allow for empty string if no buffer
+                    wxRichTextRange childRange = child->GetRange();
+                    if (childRange.GetLength() == 0 && GetRange().GetLength() == 1)
+                        childRange.SetEnd(childRange.GetEnd()+1);
 
-                    if (!child->GetRange().IsOutside(lineRange))
+                    if (!childRange.IsOutside(range) && wxDynamicCast(child, wxRichTextPlainText))
                     {
-                        wxRichTextRange rangeToUse = lineRange;
-                        rangeToUse.LimitTo(child->GetRange());
+                        foundCount ++;
+                        wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());
 
-                        wxSize childSize;
-                        int childDescent = 0;
-                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
-                        {
-                            lineSize.y = wxMax(lineSize.y, childSize.y);
-                            lineSize.x += childSize.x;
-                        }
-                        descent = wxMax(descent, childDescent);
+                        if (textAttr.EqPartial(style, false /* strong test - attributes must be valid in both objects */))
+                            matchingCount ++;
                     }
 
                     node2 = node2->GetNext();
                 }
-
-                // Increase size by a line (TODO: paragraph spacing)
-                sz.y += lineSize.y;
-                sz.x = wxMax(sz.x, lineSize.x);
             }
-            node = node->GetNext();
         }
-        size = sz;
-    }
-    return true;
-}
-
-/// Finds the absolute position and row height for the given character position
-bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* height, bool forceLineStart)
-{
-    if (index == -1)
-    {
-        wxRichTextLine* line = ((wxRichTextParagraphLayoutBox*)GetParent())->GetLineAtPosition(0);
-        if (line)
-            *height = line->GetSize().y;
-        else
-            *height = dc.GetCharHeight();
-
-        // -1 means 'the start of the buffer'.
-        pt = GetPosition();
-        if (line)
-            pt = pt + line->GetPosition();
 
-        return true;
+        node = node->GetNext();
     }
 
-    // The final position in a paragraph is taken to mean the position
-    // at the start of the next paragraph.
-    if (index == GetRange().GetEnd())
-    {
-        wxRichTextParagraphLayoutBox* parent = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
-        wxASSERT( parent != NULL );
-
-        // Find the height at the next paragraph, if any
-        wxRichTextLine* line = parent->GetLineAtPosition(index + 1);
-        if (line)
-        {
-            *height = line->GetSize().y;
-            pt = line->GetAbsolutePosition();
-        }
-        else
-        {
-            *height = dc.GetCharHeight();
-            int indent = ConvertTenthsMMToPixels(dc, m_attributes.GetLeftIndent());
-            pt = wxPoint(indent, GetCachedSize().y);
-        }
-
-        return true;
-    }
+    return foundCount == matchingCount && foundCount != 0;
+}
 
-    if (index < GetRange().GetStart() || index > GetRange().GetEnd())
-        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
+{
+    int foundCount = 0;
+    int matchingCount = 0;
 
-    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextLine* line = node->GetData();
-        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 (index == lineRange.GetEnd() && forceLineStart)
-            {
-                if (node->GetNext())
-                {
-                    wxRichTextLine* nextLine = node->GetNext()->GetData();
-                    *height = nextLine->GetSize().y;
-                    pt = nextLine->GetAbsolutePosition();
-                    return true;
-                }
-            }
-
-            pt.y = line->GetPosition().y + GetPosition().y;
-
-            wxRichTextRange r(lineRange.GetStart(), index);
-            wxSize rangeSize;
-            int descent = 0;
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
 
-            // We find the size of the line up to this point,
-            // then we can add this size to the line start position and
-            // paragraph start position to find the actual position.
+        if (para)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                return foundCount == matchingCount && foundCount != 0;
 
-            if (GetRangeSize(r, rangeSize, descent, dc, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition()))
+            if (!para->GetRange().IsOutside(range))
             {
-                pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x;
-                *height = line->GetSize().y;
+                wxRichTextAttr textAttr = GetAttributes();
+                // Apply the paragraph style
+                wxRichTextApplyStyle(textAttr, para->GetAttributes());
 
-                return true;
+                foundCount ++;
+                if (textAttr.EqPartial(style, false /* strong test */))
+                    matchingCount ++;
             }
-
         }
 
         node = node->GetNext();
     }
+    return foundCount == matchingCount && foundCount != 0;
+}
 
-    return false;
+void wxRichTextParagraphLayoutBox::PrepareContent(wxRichTextParagraphLayoutBox& container)
+{
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer && buffer->GetRichTextCtrl())
+        buffer->GetRichTextCtrl()->PrepareContent(container);
 }
 
-/// Hit-testing: returns a flag indicating hit test details, plus
-/// information about position
-int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+/// Set character or paragraph properties
+bool wxRichTextParagraphLayoutBox::SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags)
 {
-    wxPoint paraPos = GetPosition();
+    wxRichTextBuffer* buffer = GetBuffer();
 
-    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
-    while (node)
+    bool withUndo = ((flags & wxRICHTEXT_SETPROPERTIES_WITH_UNDO) != 0);
+    bool parasOnly = ((flags & wxRICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY) != 0);
+    bool charactersOnly = ((flags & wxRICHTEXT_SETPROPERTIES_CHARACTERS_ONLY) != 0);
+    bool resetExistingProperties = ((flags & wxRICHTEXT_SETPROPERTIES_RESET) != 0);
+    bool removeProperties = ((flags & wxRICHTEXT_SETPROPERTIES_REMOVE) != 0);
+
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
+
+    bool haveControl = (buffer->GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
     {
-        wxRichTextLine* line = node->GetData();
-        wxPoint linePos = paraPos + line->GetPosition();
-        wxSize lineSize = line->GetSize();
-        wxRichTextRange lineRange = line->GetAbsoluteRange();
+        action = new wxRichTextAction(NULL, _("Change Properties"), wxRICHTEXT_CHANGE_PROPERTIES, buffer, this, buffer->GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
+    }
 
-        if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y)
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
+
+        if (para && para->GetChildCount() > 0)
         {
-            if (pt.x < linePos.x)
-            {
-                textPosition = lineRange.GetStart();
-                return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE;
-            }
-            else if (pt.x >= (linePos.x + lineSize.x))
-            {
-                textPosition = lineRange.GetEnd();
-                return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
-            }
-            else
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
+
+            if (!para->GetRange().IsOutside(range))
             {
-                long i;
-                int lastX = linePos.x;
-                for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++)
+                // 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)
                 {
-                    wxSize childSize;
-                    int descent = 0;
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
 
-                    wxRichTextRange rangeToUse(lineRange.GetStart(), i);
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
 
-                    GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED, linePos);
+                if (parasOnly)
+                {
+                    if (removeProperties)
+                    {
+                        // Removes the given style from the paragraph
+                        // TODO
+                        newPara->GetProperties().RemoveProperties(properties);
+                    }
+                    else if (resetExistingProperties)
+                        newPara->GetProperties() = properties;
+                    else
+                        newPara->GetProperties().MergeProperties(properties);
+                }
 
-                    int nextX = childSize.x + linePos.x;
+                // When 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.
 
-                    if (pt.x >= lastX && pt.x <= nextX)
-                    {
-                        textPosition = i;
+                // 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.
 
-                        // So now we know it's between i-1 and i.
-                        // Let's see if we can be more precise about
-                        // which side of the position it's on.
+                if (!parasOnly && charactersOnly && range.GetStart() != newPara->GetRange().GetEnd())
+                {
+                    wxRichTextRange childRange(range);
+                    childRange.LimitTo(newPara->GetRange());
 
-                        int midPoint = (nextX - lastX)/2 + lastX;
-                        if (pt.x >= midPoint)
-                            return wxRICHTEXT_HITTEST_AFTER;
-                        else
-                            return wxRICHTEXT_HITTEST_BEFORE;
-                    }
+                    // Find the starting position and if necessary split it so
+                    // we can start applying different properties.
+                    // TODO: check that the properties actually change or are different
+                    // from properties outside of range
+                    wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL);
+                    wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL);
+
+                    if (childRange.GetStart() == newPara->GetRange().GetStart())
+                        firstObject = newPara->GetChildren().GetFirst()->GetData();
                     else
-                    {
-                        lastX = nextX;
-                    }
-                }
-            }
-        }
+                        firstObject = newPara->SplitAt(range.GetStart());
 
-        node = node->GetNext();
-    }
+                    // Increment by 1 because we're apply the style one _after_ the split point
+                    long splitPoint = childRange.GetEnd();
+                    if (splitPoint != newPara->GetRange().GetEnd())
+                        splitPoint ++;
 
-    return wxRICHTEXT_HITTEST_NONE;
-}
+                    // Find last object
+                    if (splitPoint == newPara->GetRange().GetEnd())
+                        lastObject = newPara->GetChildren().GetLast()->GetData();
+                    else
+                        // lastObject is set as a side-effect of splitting. It's
+                        // returned as the object before the new object.
+                        (void) newPara->SplitAt(splitPoint, & lastObject);
 
-/// Split an object at this position if necessary, and return
-/// the previous object, or NULL if inserting at beginning.
-wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** previousObject)
-{
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
+                    wxASSERT(firstObject != NULL);
+                    wxASSERT(lastObject != NULL);
 
-        if (pos == child->GetRange().GetStart())
-        {
-            if (previousObject)
-            {
-                if (node->GetPrevious())
-                    *previousObject = node->GetPrevious()->GetData();
-                else
-                    *previousObject = NULL;
-            }
+                    if (!firstObject || !lastObject)
+                        continue;
 
-            return child;
-        }
+                    wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject);
+                    wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject);
 
-        if (child->GetRange().Contains(pos))
-        {
-            // This should create a new object, transferring part of
-            // the content to the old object and the rest to the new object.
-            wxRichTextObject* newObject = child->DoSplit(pos);
+                    wxASSERT(firstNode);
+                    wxASSERT(lastNode);
 
-            // If we couldn't split this object, just insert in front of it.
-            if (!newObject)
-            {
-                // Maybe this is an empty string, try the next one
-                // return child;
-            }
-            else
-            {
-                // Insert the new object after 'child'
-                if (node->GetNext())
-                    m_children.Insert(node->GetNext(), newObject);
-                else
-                    m_children.Append(newObject);
-                newObject->SetParent(this);
+                    wxRichTextObjectList::compatibility_iterator node2 = firstNode;
 
-                if (previousObject)
-                    *previousObject = child;
+                    while (node2)
+                    {
+                        wxRichTextObject* child = node2->GetData();
 
-                return newObject;
+                        if (removeProperties)
+                        {
+                            // Removes the given properties from the paragraph
+                            child->GetProperties().RemoveProperties(properties);
+                        }
+                        else if (resetExistingProperties)
+                            child->GetProperties() = properties;
+                        else
+                        {
+                            child->GetProperties().MergeProperties(properties);
+                        }
+
+                        if (node2 == lastNode)
+                            break;
+
+                        node2 = node2->GetNext();
+                    }
+                }
             }
         }
 
         node = node->GetNext();
     }
-    if (previousObject)
-        *previousObject = NULL;
-    return NULL;
+
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        buffer->SubmitAction(action);
+
+    return true;
 }
 
-/// Move content to a list from obj on
-void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list)
+void wxRichTextParagraphLayoutBox::Reset()
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.Find(obj);
-    while (node)
+    Clear();
+
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer && buffer->GetRichTextCtrl())
     {
-        wxRichTextObject* child = node->GetData();
-        list.Append(child);
+        wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, buffer->GetRichTextCtrl()->GetId());
+        event.SetEventObject(buffer->GetRichTextCtrl());
+        event.SetContainer(this);
 
-        wxRichTextObjectList::compatibility_iterator oldNode = node;
+        buffer->SendEvent(event, true);
+    }
 
-        node = node->GetNext();
+    AddParagraph(wxEmptyString);
 
-        m_children.DeleteNode(oldNode);
-    }
+    PrepareContent(*this);
+
+    InvalidateHierarchy(wxRICHTEXT_ALL);
 }
 
-/// Add content back from list
-void wxRichTextParagraph::MoveFromList(wxList& list)
+/// Invalidate the buffer. With no argument, invalidates whole buffer.
+void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange)
 {
-    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
+    wxRichTextCompositeObject::Invalidate(invalidRange);
+
+    DoInvalidate(invalidRange);
+}
+
+// Do the (in)validation for this object only
+void wxRichTextParagraphLayoutBox::DoInvalidate(const wxRichTextRange& invalidRange)
+{
+    if (invalidRange == wxRICHTEXT_ALL)
+    {
+        m_invalidRange = wxRICHTEXT_ALL;
+    }
+    // Already invalidating everything
+    else if (m_invalidRange == wxRICHTEXT_ALL)
     {
-        AppendChild((wxRichTextObject*) node->GetData());
+    }
+    else
+    {
+        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());
     }
 }
 
-/// Calculate range
-void wxRichTextParagraph::CalculateRange(long start, long& end)
+// Do the (in)validation both up and down the hierarchy
+void wxRichTextParagraphLayoutBox::InvalidateHierarchy(const wxRichTextRange& invalidRange)
 {
-    wxRichTextCompositeObject::CalculateRange(start, end);
+    Invalidate(invalidRange);
 
-    // Add one for end of paragraph
-    end ++;
+    if (invalidRange != wxRICHTEXT_NONE)
+    {
+        // Now go up the hierarchy
+        wxRichTextObject* thisObj = this;
+        wxRichTextObject* p = GetParent();
+        while (p)
+        {
+            wxRichTextParagraphLayoutBox* l = wxDynamicCast(p, wxRichTextParagraphLayoutBox);
+            if (l)
+                l->DoInvalidate(thisObj->GetRange());
 
-    m_range.SetRange(start, end);
+            thisObj = p;
+            p = p->GetParent();
+        }
+    }
 }
 
-/// Find the object at the given position
-wxRichTextObject* wxRichTextParagraph::FindObjectAtPosition(long position)
+/// Get invalid range, rounding to entire paragraphs if argument is true.
+wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const
 {
-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* obj = node->GetData();
-        if (obj->GetRange().Contains(position))
-            return obj;
+    if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE)
+        return m_invalidRange;
 
-        node = node->GetNext();
+    wxRichTextRange range = m_invalidRange;
+
+    if (wholeParagraphs)
+    {
+        wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
+        if (para1)
+            range.SetStart(para1->GetRange().GetStart());
+        // floating layout make all child should be relayout
+        range.SetEnd(GetOwnRange().GetEnd());
     }
-    return NULL;
+    return range;
 }
 
-/// Get the plain text searching from the start or end of the range.
-/// The resulting string may be shorter than the range given.
-bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTextRange& range, bool fromStart)
+/// Apply the style sheet to the buffer, for example if the styles have changed.
+bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
 {
-    text = wxEmptyString;
+    wxASSERT(styleSheet != NULL);
+    if (!styleSheet)
+        return false;
 
-    if (fromStart)
+    int foundCount = 0;
+
+    wxRichTextAttr attr(GetBasicStyle());
+    if (GetBasicStyle().HasParagraphStyleName())
     {
-        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-        while (node)
+        wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
+        if (paraDef)
         {
-            wxRichTextObject* obj = node->GetData();
-            if (!obj->GetRange().IsOutside(range))
-            {
-                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-                if (textObj)
-                {
-                    text += textObj->GetTextForRange(range);
-                }
-                else
-                    return true;
-            }
-
-            node = node->GetNext();
+            attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
+            SetBasicStyle(attr);
+            foundCount ++;
         }
     }
-    else
+
+    if (GetBasicStyle().HasCharacterStyleName())
     {
-        wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
-        while (node)
+        wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
+        if (charDef)
         {
-            wxRichTextObject* obj = node->GetData();
-            if (!obj->GetRange().IsOutside(range))
-            {
-                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-                if (textObj)
-                {
-                    text = textObj->GetTextForRange(range) + text;
-                }
-                else
-                    return true;
-            }
-
-            node = node->GetPrevious();
+            attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
+            SetBasicStyle(attr);
+            foundCount ++;
         }
     }
 
-    return true;
-}
-
-/// Find a suitable wrap position.
-bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition)
-{
-    // Find the first position where the line exceeds the available space.
-    wxSize sz;
-    long i;
-    long breakPosition = range.GetEnd();
-    for (i = range.GetStart(); i <= range.GetEnd(); i++)
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        int descent = 0;
-        GetRangeSize(wxRichTextRange(range.GetStart(), i), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
 
-        if (sz.x > availableSpace)
+        if (para)
         {
-            breakPosition = i-1;
-            break;
-        }
-    }
+            // 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.
 
-    // Now we know the last position on the line.
-    // Let's try to find a word break.
+            int outline = -1;
+            int num = -1;
+            if (para->GetAttributes().HasOutlineLevel())
+                outline = para->GetAttributes().GetOutlineLevel();
+            if (para->GetAttributes().HasBulletNumber())
+                num = para->GetAttributes().GetBulletNumber();
 
-    wxString plainText;
-    if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false))
-    {
-        int newLinePos = plainText.Find(wxRichTextLineBreakChar);
-        if (newLinePos != wxNOT_FOUND)
-        {
-            breakPosition = wxMax(0, range.GetStart() + newLinePos);
-        }
-        else
-        {
-            int spacePos = plainText.Find(wxT(' '), true);
-            if (spacePos != wxNOT_FOUND)
+            if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
             {
-                int positionsFromEndOfString = plainText.length() - spacePos - 1;
-                breakPosition = breakPosition - positionsFromEndOfString;
-            }
-        }
-    }
-
-    wrapPosition = breakPosition;
+                int currentIndent = para->GetAttributes().GetLeftIndent();
 
-    return true;
-}
+                wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+                if (paraDef && !listDef)
+                {
+                    para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet);
+                    foundCount ++;
+                }
+                else if (listDef && !paraDef)
+                {
+                    // Set overall style defined for the list style definition
+                    para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
 
-/// Get the bullet text for this paragraph.
-wxString wxRichTextParagraph::GetBulletText()
-{
-    if (GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE ||
-        (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP))
-        return wxEmptyString;
+                    // 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->GetStyleMergedWithBase(styleSheet));
+                    foundCount ++;
+                }
+            }
+            else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                int currentIndent = para->GetAttributes().GetLeftIndent();
 
-    int number = GetAttributes().GetBulletNumber();
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
 
-    wxString text;
-    if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE))
-    {
-        text.Printf(wxT("%d"), number);
-    }
-    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
-    {
-        // TODO: Unicode, and also check if number > 26
-        text.Printf(wxT("%c"), (wxChar) (number+64));
-    }
-    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER)
-    {
-        // TODO: Unicode, and also check if number > 26
-        text.Printf(wxT("%c"), (wxChar) (number+96));
-    }
-    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
-    {
-        text = wxRichTextDecimalToRoman(number);
-    }
-    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
-    {
-        text = wxRichTextDecimalToRoman(number);
-        text.MakeLower();
-    }
-    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
-    {
-        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();
-    }
+                // Overall list definition style
+                para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);
 
-    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(")");
-    }
+                // Style for this level
+                wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
 
-    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
-    {
-        text += wxT(".");
-    }
+                foundCount ++;
+            }
+            else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+                if (def)
+                {
+                    para->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);
+                    foundCount ++;
+                }
+            }
 
-    return text;
-}
+            if (outline != -1)
+                para->GetAttributes().SetOutlineLevel(outline);
+            if (num != -1)
+                para->GetAttributes().SetBulletNumber(num);
+        }
 
-/// 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;
+        node = node->GetNext();
     }
+    return foundCount != 0;
 }
 
-/// Clear remaining unused line objects, if any
-bool wxRichTextParagraph::ClearUnusedLines(int lineCount)
+/// Set list style
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
-    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;
-}
+    wxRichTextBuffer* buffer = GetBuffer();
+    wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
 
-/// 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();
+    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);
 
-    wxRichTextApplyStyle(attr, contentStyle);
-    return attr;
-}
+    // Current number, if numbering
+    int n = startFrom;
 
-/// 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();
+    wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
 
-    return attr;
-}
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
 
-/// Create default tabstop array
-void wxRichTextParagraph::InitDefaultTabs()
-{
-    // create a default tab list at 10 mm each.
-    for (int i = 0; i < 20; ++i)
+    bool haveControl = (buffer->GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
     {
-        sm_defaultTabs.Add(i*100);
+        action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
     }
-}
-
-/// Clear default tabstop array
-void wxRichTextParagraph::ClearDefaultTabs()
-{
-    sm_defaultTabs.Clear();
-}
 
-/// Get the first position from pos that has a line break character.
-long wxRichTextParagraph::GetFirstLineBreakPosition(long pos)
-{
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxRichTextObject* obj = node->GetData();
-        if (pos >= obj->GetRange().GetStart() && pos <= obj->GetRange().GetEnd())
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
+
+        if (para && para->GetChildCount() > 0)
         {
-            wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-            if (textObj)
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
+
+            if (!para->GetRange().IsOutside(range))
             {
-                long breakPos = textObj->GetFirstLineBreakPosition(pos);
-                if (breakPos > -1)
-                    return breakPos;
+                // 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
+                    wxRichTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+
+                    // Now we need to do numbering
+                    // Preserve the existing list item continuation bullet style, if any
+                    if (para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION))
+                        newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle()|wxTEXT_ATTR_BULLET_STYLE_CONTINUATION);
+                    else
+                    {
+                        // 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);
+
+                    if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty())
+                    {
+                        wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName());
+                        if (def)
+                        {
+                            newPara->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);
+                        }
+                    }
+                }
             }
         }
+
         node = node->GetNext();
     }
-    return -1;
-}
-
-/*!
- * wxRichTextLine
- * This object represents a line in a paragraph, and stores
- * offsets from the start of the paragraph representing the
- * start and end positions of the line.
- */
 
-wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent)
-{
-    Init(parent);
-}
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        buffer->SubmitAction(action);
 
-/// Initialisation
-void wxRichTextLine::Init(wxRichTextParagraph* parent)
-{
-    m_parent = parent;
-    m_range.SetRange(-1, -1);
-    m_pos = wxPoint(0, 0);
-    m_size = wxSize(0, 0);
-    m_descent = 0;
+    return true;
 }
 
-/// Copy
-void wxRichTextLine::Copy(const wxRichTextLine& obj)
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {
-    m_range = obj.m_range;
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer && buffer->GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = buffer->GetStyleSheet()->FindListStyle(defName);
+        if (def)
+            return SetListStyle(range, def, flags, startFrom, specifiedLevel);
+    }
+    return false;
 }
 
-/// Get the absolute object position
-wxPoint wxRichTextLine::GetAbsolutePosition() const
+/// Clear list for given range
+bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags)
 {
-    return m_parent->GetPosition() + m_pos;
+    return SetListStyle(range, NULL, flags);
 }
 
-/// Get the absolute range
-wxRichTextRange wxRichTextLine::GetAbsoluteRange() const
+/// Number/renumber any list elements in the given range
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
-    wxRichTextRange range(m_range.GetStart() + m_parent->GetRange().GetStart(), 0);
-    range.SetEnd(range.GetStart() + m_range.GetLength()-1);
-    return range;
+    return DoNumberList(range, range, 0, def, flags, startFrom, specifiedLevel);
 }
 
-/*!
- * wxRichTextPlainText
- * This object represents a single piece of text.
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
-
-wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
-    wxRichTextObject(parent)
+/// 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)
 {
-    if (style)
-        SetAttributes(*style);
+    wxRichTextBuffer* buffer = GetBuffer();
+    wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
 
-    m_text = text;
-}
+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+#if wxDEBUG_LEVEL
+    bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
+#endif
 
-#define USE_KERNING_FIX 1
+    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
 
-/// Draw the item
-bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
-{
-    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
-    wxASSERT (para != NULL);
+    // Max number of levels
+    const int maxLevels = 10;
 
-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+    // The level we're looking at now
+    int currentLevel = -1;
 
-    int offset = GetRange().GetStart();
+    // The item number for each level
+    int levels[maxLevels];
+    int i;
 
-    // Replace line break characters with spaces
-    wxString str = m_text;
-    wxString toRemove = wxRichTextLineBreakChar;
-    str.Replace(toRemove, wxT(" "));
-    
-    long len = range.GetLength();
-    wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len);
-    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
-        stringChunk.MakeUpper();
+    // 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
+    }
 
-    int charHeight = dc.GetCharHeight();
+#if wxDEBUG_LEVEL
+    wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+#endif
 
-    int x = rect.x;
-    int y = rect.y + (rect.height - charHeight - (descent - m_descent));
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
 
-    // Test for the optimized situations where all is selected, or none
-    // is selected.
+    bool haveControl = (buffer->GetRichTextCtrl() != NULL);
 
-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
+    wxRichTextAction* action = NULL;
 
-    // (a) All selected.
-    if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
-    {
-        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, true);
-    }
-    // (b) None selected.
-    else if (selectionRange.GetEnd() < range.GetStart() || selectionRange.GetStart() > range.GetEnd())
+    if (haveControl && withUndo)
     {
-        // Draw all unselected
-        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, false);
+        action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, buffer, this, buffer->GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(buffer->GetRichTextCtrl()->GetCaretPosition());
     }
-    else
-    {
-        // (c) Part selected, part not
-        // Let's draw unselected chunk, selected chunk, then unselected chunk.
 
-        dc.SetBackgroundMode(wxTRANSPARENT);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        // wxASSERT (para != NULL);
 
-        // 1. Initial unselected chunk, if any, up until start of selection.
-        if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd())
+        if (para && para->GetChildCount() > 0)
         {
-            int r1 = range.GetStart();
-            int s1 = selectionRange.GetStart()-1;
-            int fragmentLen = s1 - r1 + 1;
-            if (fragmentLen < 0)
-                wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
-            wxString stringFragment = str.Mid(r1 - offset, fragmentLen);
-
-            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
 
-#if USE_KERNING_FIX
-            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
+            if (!para->GetRange().IsOutside(range))
             {
-                // Compensate for kerning difference
-                wxString stringFragment2(str.Mid(r1 - offset, fragmentLen+1));
-                wxString stringFragment3(str.Mid(r1 - offset + fragmentLen, 1));
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
 
-                wxCoord w1, h1, w2, h2, w3, h3;
-                dc.GetTextExtent(stringFragment,  & w1, & h1);
-                dc.GetTextExtent(stringFragment2, & w2, & h2);
-                dc.GetTextExtent(stringFragment3, & w3, & h3);
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
 
-                int kerningDiff = (w1 + w3) - w2;
-                x = x - kerningDiff;
-            }
-#endif
-        }
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
 
-        // 2. Selected chunk, if any.
-        if (selectionRange.GetEnd() >= range.GetStart())
-        {
-            int s1 = wxMax(selectionRange.GetStart(), range.GetStart());
-            int s2 = wxMin(selectionRange.GetEnd(), range.GetEnd());
+                wxRichTextListStyleDefinition* defToUse = def;
+                if (!defToUse)
+                {
+                    if (styleSheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
+                        defToUse = styleSheet->FindListStyle(newPara->GetAttributes().GetListStyleName());
+                }
 
-            int fragmentLen = s2 - s1 + 1;
-            if (fragmentLen < 0)
-                wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
-            wxString stringFragment = str.Mid(s1 - offset, fragmentLen);
+                if (defToUse)
+                {
+                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
+                    int thisLevel = defToUse->FindLevelForIndent(thisIndent);
 
-            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);
+                    // If we've specified a level to apply to all, change the level.
+                    if (specifiedLevel != -1)
+                        thisLevel = specifiedLevel;
 
-#if USE_KERNING_FIX
-            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
-            {
-                // Compensate for kerning difference
-                wxString stringFragment2(str.Mid(s1 - offset, fragmentLen+1));
-                wxString stringFragment3(str.Mid(s1 - offset + fragmentLen, 1));
+                    // Do promotion if specified
+                    if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange))
+                    {
+                        thisLevel = thisLevel - promoteBy;
+                        if (thisLevel < 0)
+                            thisLevel = 0;
+                        if (thisLevel > 9)
+                            thisLevel = 9;
+                    }
 
-                wxCoord w1, h1, w2, h2, w3, h3;
-                dc.GetTextExtent(stringFragment,  & w1, & h1);
-                dc.GetTextExtent(stringFragment2, & w2, & h2);
-                dc.GetTextExtent(stringFragment3, & w3, & h3);
+                    // Apply the overall list style, and item style for this level
+                    wxRichTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
 
-                int kerningDiff = (w1 + w3) - w2;
-                x = x - kerningDiff;
-            }
-#endif
-        }
+                    // Preserve the existing list item continuation bullet style, if any
+                    if (para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION))
+                        newPara->GetAttributes().SetBulletStyle(newPara->GetAttributes().GetBulletStyle()|wxTEXT_ATTR_BULLET_STYLE_CONTINUATION);
 
-        // 3. Remaining unselected chunk, if any
-        if (selectionRange.GetEnd() < range.GetEnd())
-        {
-            int s2 = wxMin(selectionRange.GetEnd()+1, range.GetEnd());
-            int r2 = range.GetEnd();
+                    // OK, we've (re)applied the style, now let's get the numbering right.
 
-            int fragmentLen = r2 - s2 + 1;
-            if (fragmentLen < 0)
-                wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
-            wxString stringFragment = str.Mid(s2 - offset, fragmentLen);
+                    if (currentLevel == -1)
+                        currentLevel = thisLevel;
 
-            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
+                    // 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
+                    {
+                        if (!(para->GetAttributes().HasBulletStyle() && (para->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION)))
+                            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();
     }
 
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        buffer->SubmitAction(action);
+
     return true;
 }
 
-bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected)
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {
-    bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND);
-
-    wxArrayInt tabArray;
-    int tabCount;
-    if (hasTabs)
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer->GetStyleSheet())
     {
-        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;
-        }
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = buffer->GetStyleSheet()->FindListStyle(defName);
+        return NumberList(range, def, flags, startFrom, specifiedLevel);
     }
-    else
-        tabCount = 0;
+    return false;
+}
 
-    int nextTabPos = -1;
-    int tabPos = -1;
-    wxCoord w, h;
+/// 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)
+{
+    // 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.
 
-    if (selected)
+    // For now, only renumber within the promotion range.
+
+    return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel);
+}
+
+bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
+{
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer->GetStyleSheet())
     {
-        dc.SetBrush(*wxBLACK_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetTextForeground(*wxWHITE);
-        dc.SetBackgroundMode(wxTRANSPARENT);
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = buffer->GetStyleSheet()->FindListStyle(defName);
+        return PromoteList(promoteBy, range, def, flags, specifiedLevel);
     }
-    else
+    return false;
+}
+
+/// 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
+{
+    // Search for a paragraph that isn't a continuation paragraph (no bullet)
+    while (previousParagraph && previousParagraph->GetAttributes().HasBulletStyle() && previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION)
     {
-        dc.SetTextForeground(attr.GetTextColour());
-        dc.SetBackgroundMode(wxTRANSPARENT);
+        wxRichTextObjectList::compatibility_iterator node = ((wxRichTextCompositeObject*) previousParagraph->GetParent())->GetChildren().Find(previousParagraph);
+        if (node)
+        {
+            node = node->GetPrevious();
+            if (node)
+                previousParagraph = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+            else
+                previousParagraph = NULL;
+        }
+        else
+            previousParagraph = NULL;
     }
 
-    while (hasTabs)
+    if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
+        return false;
+
+    wxRichTextBuffer* buffer = GetBuffer();
+    wxRichTextStyleSheet* styleSheet = buffer->GetStyleSheet();
+    if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
     {
-        // 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)
+        wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
+        if (def)
         {
-            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);
+            // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
+            // int thisLevel = def->FindLevelForIndent(thisIndent);
 
-                if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
+            bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;
+
+            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())
                 {
-                    wxPen oldPen = dc.GetPen();
-                    dc.SetPen(wxPen(attr.GetTextColour(), 1));
-                    dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
-                    dc.SetPen(oldPen);
+                    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);
                 }
-
-                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);
+            return true;
         }
-        dc.DrawText(str, x, y);
+        else
+            return false;
+    }
+    else
+        return false;
+}
 
-        if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
-        {
-            wxPen oldPen = dc.GetPen();
-            dc.SetPen(wxPen(attr.GetTextColour(), 1));
-            dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
-            dc.SetPen(oldPen);
-        }
+/*!
+ * wxRichTextParagraph
+ * This object represents a single paragraph (or in a straight text editor, a line).
+ */
 
-        x += w;
-    }
-    return true;
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextCompositeObject)
 
-}
+wxArrayInt wxRichTextParagraph::sm_defaultTabs;
 
-/// Lay the item out
-bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
+wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxRichTextAttr* style):
+    wxRichTextCompositeObject(parent)
 {
-    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
-    wxASSERT (para != NULL);
+    if (style)
+        SetAttributes(*style);
+}
 
-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* paraStyle, wxRichTextAttr* charStyle):
+    wxRichTextCompositeObject(parent)
+{
+    if (paraStyle)
+        SetAttributes(*paraStyle);
 
-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
+    AppendChild(new wxRichTextPlainText(text, this, charStyle));
+}
 
-    wxString str = m_text;    
-    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
-        str.MakeUpper();
+wxRichTextParagraph::~wxRichTextParagraph()
+{
+    ClearLines();
+}
 
-    wxString toReplace = wxRichTextLineBreakChar;
-    str.Replace(toReplace, wxT(" "));
+/// Draw the item
+bool wxRichTextParagraph::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int WXUNUSED(descent), int style)
+{
+    if (!IsShown())
+        return true;
 
-    wxCoord w, h;
-    dc.GetTextExtent(str, & w, & h, & m_descent);
-    m_size = wxSize(w, dc.GetCharHeight());
+    // Currently we don't merge these attributes with the parent, but we
+    // should consider whether we should (e.g. if we set a border colour
+    // for all paragraphs). But generally box attributes are likely to be
+    // different for different objects.
+    wxRect paraRect = GetRect();
+    wxRichTextAttr attr = GetCombinedAttributes();
+    context.ApplyVirtualAttributes(attr, this);
 
-    return true;
-}
+    DrawBoxAttributes(dc, GetBuffer(), attr, paraRect);
 
-/// Copy
-void wxRichTextPlainText::Copy(const wxRichTextPlainText& obj)
-{
-    wxRichTextObject::Copy(obj);
+    // Draw the bullet, if any
+    if ((attr.GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) == 0 && (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_CONTINUATION) == 0)
+    {
+        if (attr.GetLeftSubIndent() != 0)
+        {
+            int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
+            int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
 
-    m_text = obj.m_text;
-}
+            wxRichTextAttr bulletAttr(attr);
 
-/// 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), wxPoint position) const
-{
-    if (!range.IsWithin(GetRange()))
-        return false;
+            // Combine with the font of the first piece of content, if one is specified
+            if (GetChildren().GetCount() > 0)
+            {
+                wxRichTextObject* firstObj = (wxRichTextObject*) GetChildren().GetFirst()->GetData();
+                if (!firstObj->IsFloatable() && firstObj->GetAttributes().HasFont())
+                {
+                    wxRichTextApplyStyle(bulletAttr, firstObj->GetAttributes());
+                }
+            }
 
-    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
-    wxASSERT (para != NULL);
+            // Get line height from first line, if any
+            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : NULL;
+
+            wxPoint linePos;
+            int lineHeight wxDUMMY_INITIALIZE(0);
+            if (line)
+            {
+                lineHeight = line->GetSize().y;
+                linePos = line->GetPosition() + GetPosition();
+            }
+            else
+            {
+                wxFont font;
+                if (bulletAttr.HasFont() && GetBuffer())
+                    font = GetBuffer()->GetFontTable().FindFont(bulletAttr);
+                else
+                    font = (*wxNORMAL_FONT);
 
-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+                wxCheckSetFont(dc, font);
 
-    // 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
+                lineHeight = dc.GetCharHeight();
+                linePos = GetPosition();
+                linePos.y += spaceBeforePara;
+            }
 
-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
+            wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight);
 
-    int startPos = range.GetStart() - GetRange().GetStart();
-    long len = range.GetLength();
-    
-    wxString str(m_text);
-    wxString toReplace = wxRichTextLineBreakChar;
-    str.Replace(toReplace, wxT(" "));
+            if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)
+            {
+                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();
 
-    wxString stringChunk = str.Mid(startPos, (size_t) len);
+                if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);
+            }
+        }
+    }
 
-    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
-        stringChunk.MakeUpper();
+    // Draw the range for each line, one object at a time.
 
-    wxCoord w, h;
-    int width = 0;
-    if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND)
+    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
+    while (node)
     {
-        // the string has a tab
-        wxArrayInt tabArray;
-        if (textAttr.GetTabs().IsEmpty())
-            tabArray = wxRichTextParagraph::GetDefaultTabs();
-        else
-            tabArray = textAttr.GetTabs();
+        wxRichTextLine* line = node->GetData();
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
 
-        int tabCount = tabArray.GetCount();
+        // Lines are specified relative to the paragraph
 
-        for (int i = 0; i < tabCount; ++i)
+        wxPoint linePosition = line->GetPosition() + GetPosition();
+
+        // Don't draw if off the screen
+        if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) != 0) || ((linePosition.y + line->GetSize().y) >= rect.y && linePosition.y <= rect.y + rect.height))
         {
-            int pos = tabArray[i];
-            pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos);
-            tabArray[i] = pos;
-        }
+            wxPoint objectPosition = linePosition;
+            int maxDescent = line->GetDescent();
 
-        int nextTabPos = -1;
+            // Loop through objects until we get to the one within range
+            wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
 
-        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)
+            int i = 0;
+            while (node2)
             {
-                nextTabPos = tabArray.Item(i);
-                if (nextTabPos > absoluteWidth)
+                wxRichTextObject* child = node2->GetData();
+
+                if (!child->IsFloating() && child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
                 {
-                    notFound = false;
-                    width = nextTabPos - position.x;
+                    // Draw this part of the line at the correct position
+                    wxRichTextRange objectRange(child->GetRange());
+                    objectRange.LimitTo(lineRange);
+
+                    wxSize objectSize;
+                    if (child->IsTopLevel())
+                    {
+                        objectSize = child->GetCachedSize();
+                        objectRange = child->GetOwnRange();
+                    }
+                    else
+                    {
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+                        if (i < (int) line->GetObjectSizes().GetCount())
+                        {
+                            objectSize.x = line->GetObjectSizes()[(size_t) i];
+                        }
+                        else
+#endif
+                        {
+                            int descent = 0;
+                            child->GetRangeSize(objectRange, objectSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, objectPosition);
+                        }
+                    }
+
+                    // Use the child object's width, but the whole line's height
+                    wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
+                    child->Draw(dc, context, objectRange, selection, childRect, maxDescent, style);
+
+                    objectPosition.x += objectSize.x;
+                    i ++;
                 }
+                else if (child->GetRange().GetStart() > lineRange.GetEnd())
+                    // Can break out of inner loop now since we've passed this line's range
+                    break;
+
+                node2 = node2->GetNext();
             }
         }
+
+        node = node->GetNext();
     }
-    dc.GetTextExtent(stringChunk, & w, & h, & descent);
-    width += w;
-    size = wxSize(width, dc.GetCharHeight());
 
     return true;
 }
 
-/// Do a split, returning an object containing the second part, and setting
-/// the first part in 'this'.
-wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
+// Get the range width using partial extents calculated for the whole paragraph.
+static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents)
 {
-    long index = pos - GetRange().GetStart();
-    
-    if (index < 0 || index >= (int) m_text.length())
-        return NULL;
+    wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength());
 
-    wxString firstPart = m_text.Mid(0, index);
-    wxString secondPart = m_text.Mid(index);
+    if (partialExtents.GetCount() < (size_t) range.GetLength())
+        return 0;
 
-    m_text = firstPart;
+    int leftMostPos = 0;
+    if (range.GetStart() - para.GetRange().GetStart() > 0)
+        leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1];
 
-    wxRichTextPlainText* newObject = new wxRichTextPlainText(secondPart);
-    newObject->SetAttributes(GetAttributes());
+    int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()];
 
-    newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
-    GetRange().SetEnd(pos-1);
-    
-    return newObject;
-}
+    int w = rightMostPos - leftMostPos;
 
-/// Calculate range
-void wxRichTextPlainText::CalculateRange(long start, long& end)
-{
-    end = start + m_text.length() - 1;
-    m_range.SetRange(start, end);
+    return w;
 }
 
-/// Delete range
-bool wxRichTextPlainText::DeleteRange(const wxRichTextRange& range)
+/// Lay the item out
+bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
 {
-    wxRichTextRange r = range;
+    // Deal with floating objects firstly before the normal layout
+    wxRichTextBuffer* buffer = GetBuffer();
+    wxASSERT(buffer);
+    wxRichTextFloatCollector* collector = GetContainer()->GetFloatCollector();
+    wxASSERT(collector);
+    LayoutFloat(dc, context, rect, style, collector);
 
-    r.LimitTo(GetRange());
+    wxRichTextAttr attr = GetCombinedAttributes();
+    context.ApplyVirtualAttributes(attr, this);
 
-    if (r.GetStart() == GetRange().GetStart() && r.GetEnd() == GetRange().GetEnd())
+    // ClearLines();
+
+    // Increase the size of the paragraph due to spacing
+    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.
+    if (attr.HasLineSpacing() && attr.GetLineSpacing() > 0 && attr.GetFont().IsOk())
     {
-        m_text.Empty();
-        return true;
+        wxCheckSetFont(dc, attr.GetFont());
+        lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0));
     }
 
-    long startIndex = r.GetStart() - GetRange().GetStart();
-    long len = r.GetLength();
+    // Start position for each line relative to the paragraph
+    int startPositionFirstLine = leftIndent;
+    int startPositionSubsequentLines = leftIndent + leftSubIndent;
 
-    m_text = m_text.Mid(0, startIndex) + m_text.Mid(startIndex+len);
-    return true;
-}
+    // If we have a bullet in this paragraph, the start position for the first line's text
+    // is actually leftIndent + leftSubIndent.
+    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
+        startPositionFirstLine = startPositionSubsequentLines;
 
-/// Get text for the given range.
-wxString wxRichTextPlainText::GetTextForRange(const wxRichTextRange& range) const
-{
-    wxRichTextRange r = range;
+    long lastEndPos = GetRange().GetStart()-1;
+    long lastCompletedEndPos = lastEndPos;
 
-    r.LimitTo(GetRange());
+    int currentWidth = 0;
+    SetPosition(rect.GetPosition());
 
-    long startIndex = r.GetStart() - GetRange().GetStart();
-    long len = r.GetLength();
+    wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph
+    int lineHeight = 0;
+    int maxWidth = 0;
+    int maxHeight = currentPosition.y;
+    int maxAscent = 0;
+    int maxDescent = 0;
+    int lineCount = 0;
+    int lineAscent = 0;
+    int lineDescent = 0;
 
-    return m_text.Mid(startIndex, len);
-}
+    wxRichTextObjectList::compatibility_iterator node;
 
-/// Returns true if this object can merge itself with the given one.
-bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const
-{
-    return object->GetClassInfo() == CLASSINFO(wxRichTextPlainText) &&
-        (m_text.empty() || wxTextAttrEq(GetAttributes(), object->GetAttributes()));
-}
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+    wxUnusedVar(style);
+    wxArrayInt partialExtents;
 
-/// Returns true if this object merged itself with the given one.
-/// The calling code will then delete the given object.
-bool wxRichTextPlainText::Merge(wxRichTextObject* object)
-{
-    wxRichTextPlainText* textObject = wxDynamicCast(object, wxRichTextPlainText);
-    wxASSERT( textObject != NULL );
+    wxSize paraSize;
+    int paraDescent = 0;
 
-    if (textObject)
+    // This calculates the partial text extents
+    GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, rect.GetPosition(), & partialExtents);
+#else
+    node = m_children.GetFirst();
+    while (node)
     {
-        m_text += textObject->GetText();
-        return true;
-    }
-    else
-        return false;
-}
+        wxRichTextObject* child = node->GetData();
 
-/// Dump to output stream for debugging
-void wxRichTextPlainText::Dump(wxTextOutputStream& stream)
-{
-    wxRichTextObject::Dump(stream);
-    stream << m_text << wxT("\n");
-}
+        //child->SetCachedSize(wxDefaultSize);
+        child->Layout(dc, context, rect, style);
 
-/// Get the first position from pos that has a line break character.
-long wxRichTextPlainText::GetFirstLineBreakPosition(long pos)
-{
-    int i;
-    int len = m_text.length();
-    int startPos = pos - m_range.GetStart();
-    for (i = startPos; i < len; i++)
-    {
-        wxChar ch = m_text[i];
-        if (ch == wxRichTextLineBreakChar)
-        {
-            return i + m_range.GetStart();
-        }
+        node = node->GetNext();
     }
-    return -1;
-}
+#endif
 
-/*!
- * wxRichTextBuffer
- * This is a kind of box, used to represent the whole buffer
- */
+    // Split up lines
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
+    // We may need to go back to a previous child, in which case create the new line,
+    // find the child corresponding to the start position of the string, and
+    // continue.
 
-wxList                  wxRichTextBuffer::sm_handlers;
-wxRichTextRenderer*     wxRichTextBuffer::sm_renderer = NULL;
-int                     wxRichTextBuffer::sm_bulletRightMargin = 20;
-float                   wxRichTextBuffer::sm_bulletProportion = (float) 0.3;
+    wxRect availableRect;
 
-/// Initialisation
-void wxRichTextBuffer::Init()
-{
-    m_commandProcessor = new wxCommandProcessor;
-    m_styleSheet = NULL;
-    m_modified = false;
-    m_batchedCommandDepth = 0;
-    m_batchedCommand = NULL;
-    m_suppressUndo = 0;
-    m_handlerFlags = 0;
-    m_scale = 1.0;
-}
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
 
-/// Initialisation
-wxRichTextBuffer::~wxRichTextBuffer()
-{
-    delete m_commandProcessor;
-    delete m_batchedCommand;
+        // If floating, ignore. We already laid out floats.
+        // Also ignore if empty object, except if we haven't got any
+        // size yet.
+        if (child->IsFloating() || !child->IsShown() ||
+            (child->GetRange().GetLength() == 0 && maxHeight > spaceBeforePara)
+            )
+        {
+            node = node->GetNext();
+            continue;
+        }
 
-    ClearStyleStack();
-    ClearEventHandlers();
-}
+        // If this is e.g. a composite text box, it will need to be laid out itself.
+        // But if just a text fragment or image, for example, this will
+        // do nothing. NB: won't we need to set the position after layout?
+        // since for example if position is dependent on vertical line size, we
+        // can't tell the position until the size is determined. So possibly introduce
+        // another layout phase.
 
-void wxRichTextBuffer::ResetAndClearCommands()
-{
-    Reset();
-    
-    GetCommandProcessor()->ClearCommands();
+        // We may only be looking at part of a child, if we searched back for wrapping
+        // and found a suitable point some way into the child. So get the size for the fragment
+        // if necessary.
 
-    Modify(false);
-    Invalidate(wxRICHTEXT_ALL);
-}
+        long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
+        long lastPosToUse = child->GetRange().GetEnd();
+        bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd());
 
-void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj)
-{
-    wxRichTextParagraphLayoutBox::Copy(obj);
+        if (lineBreakInThisObject)
+            lastPosToUse = nextBreakPos;
 
-    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;
-}
+        wxSize childSize;
+        int childDescent = 0;
 
-/// Push style sheet to top of stack
-bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet)
-{
-    if (m_styleSheet)
-        styleSheet->InsertSheet(m_styleSheet);
+        int startOffset = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
+        availableRect = wxRect(rect.x + startOffset, rect.y + currentPosition.y,
+                                     rect.width - startOffset - rightIndent, rect.height);
 
-    SetStyleSheet(styleSheet);
+        if (child->IsTopLevel())
+        {
+            wxSize oldSize = child->GetCachedSize();
 
-    return true;
-}
+            child->Invalidate(wxRICHTEXT_ALL);
+            child->SetPosition(wxPoint(0, 0));
 
-/// Pop style sheet from top of stack
-wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet()
-{
-    if (m_styleSheet)
-    {
-        wxRichTextStyleSheet* oldSheet = m_styleSheet;
-        m_styleSheet = oldSheet->GetNextSheet();
-        oldSheet->Unlink();
+            // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+            // lays out the object again using the minimum size
+            // The position will be determined by its location in its line,
+            // and not by the child's actual position.
+            child->LayoutToBestSize(dc, context, buffer,
+                    attr, child->GetAttributes(), availableRect, parentRect, style);
 
-        return oldSheet;
-    }
-    else
-        return NULL;
-}
+            if (oldSize != child->GetCachedSize())
+            {
+                partialExtents.Clear();
 
-/// 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);
+                // Recalculate the partial text extents since the child object changed size
+                GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+            }
+        }
 
-    wxTextAttrEx attr(GetDefaultStyle());
+        // Problem: we need to layout composites here for which we need the available width,
+        // but we can't get the available width without using the float collector which
+        // needs to know the object height.
 
-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
-    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
-    {
-        paraAttr = GetStyleForNewParagraph(pos);
-        if (!paraAttr.IsDefault())
-            p = & paraAttr;
-    }
-    else
-        p = & attr;
+        if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing
+        {
+            childSize = child->GetCachedSize();
+            childDescent = child->GetDescent();
+        }
+        else
+        {
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+            // Get height only, then the width using the partial extents
+            GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+            childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents);
+#else
+            GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
+#endif
+        }
 
-    action->GetNewParagraphs() = paragraphs;
+        bool doLoop = true;
+        int loopIterations = 0;
 
-    if (p)
-    {
-        wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
-        while (node)
+        // If there are nested objects that need to lay themselves out, we have to do this in a
+        // loop because the height of the object may well depend on the available width.
+        // And because of floating object positioning, the available width depends on the
+        // height of the object and whether it will clash with the floating objects.
+        // So, we see whether the available width changes due to the presence of floating images.
+        // If it does, then we'll use the new restricted width to find the object height again.
+        // If this causes another restriction in the available width, we'll try again, until
+        // either we lose patience or the available width settles down.
+        do
         {
-            wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData();
-            obj->SetAttributes(*p);
-            node = node->GetPrevious();
-        }
-    }
+            loopIterations ++;
 
-    action->SetPosition(pos);
+            wxRect oldAvailableRect = availableRect;
 
-    // Set the range we'll need to delete in Undo
-    action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1));
+            // Available width depends on the floating objects and the line height.
+            // Note: the floating objects may be placed vertically along the two sides of
+            // buffer, so we may have different available line widths with different
+            // [startY, endY]. So, we can't determine how wide the available
+            // space is until we know the exact line height.
+            if (childDescent == 0)
+            {
+                lineHeight = wxMax(lineHeight, childSize.y);
+                lineDescent = maxDescent;
+                lineAscent = maxAscent;
+            }
+            else
+            {
+                lineDescent = wxMax(childDescent, maxDescent);
+                lineAscent = wxMax(childSize.y-childDescent, maxAscent);
+            }
+            lineHeight = wxMax(lineHeight, (lineDescent + lineAscent));
+            wxRect floatAvailableRect = collector->GetAvailableRect(rect.y + currentPosition.y, rect.y + currentPosition.y + lineHeight);
 
-    SubmitAction(action);
+            // Adjust availableRect to the space that is available when taking floating objects into account.
 
-    return true;
-}
+            if (floatAvailableRect.x + startOffset > availableRect.x)
+            {
+                int newX = floatAvailableRect.x + startOffset;
+                int newW = availableRect.width - (newX - availableRect.x);
+                availableRect.x = newX;
+                availableRect.width = newW;
+            }
 
-/// Submit command to insert the given text
-bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
-{
-    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
+            if (floatAvailableRect.width < availableRect.width)
+                availableRect.width = floatAvailableRect.width;
 
-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
-    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
-    {
-        // Get appropriate paragraph style
-        paraAttr = GetStyleForNewParagraph(pos, false, false);
-        if (!paraAttr.IsDefault())
-            p = & paraAttr;
-    }
+            currentPosition.x = availableRect.x - rect.x;
 
-    action->GetNewParagraphs().AddParagraphs(text, p);
+            if (child->IsTopLevel() && loopIterations <= 20)
+            {
+                if (availableRect != oldAvailableRect)
+                {
+                    wxSize oldSize = child->GetCachedSize();
 
-    int length = action->GetNewParagraphs().GetRange().GetLength();
+                    // Lays out the object first with a given amount of space, and then if no width was specified in attr,
+                    // lays out the object again using the minimum size
+                    child->Invalidate(wxRICHTEXT_ALL);
+                    child->LayoutToBestSize(dc, context, buffer,
+                                attr, child->GetAttributes(), availableRect, parentRect, style);
+                    childSize = child->GetCachedSize();
+                    childDescent = child->GetDescent();
 
-    if (text.length() > 0 && text.Last() != wxT('\n'))
-    {
-        // Don't count the newline when undoing
-        length --;
-        action->GetNewParagraphs().SetPartialParagraph(true);
-    }
-    else if (text.length() > 0 && text.Last() == wxT('\n'))
-        length --;
+                    if (oldSize != child->GetCachedSize())
+                    {
+                        partialExtents.Clear();
 
-    action->SetPosition(pos);
+                        // Recalculate the partial text extents since the child object changed size
+                        GetRangeSize(GetRange(), paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+                    }
 
-    // Set the range we'll need to delete in Undo
-    action->SetRange(wxRichTextRange(pos, pos + length - 1));
+                    // Go around the loop finding the available rect for the given floating objects
+                }
+                else
+                    doLoop = false;
+            }
+            else
+                doLoop = false;
+        }
+        while (doLoop);
 
-    SubmitAction(action);
+        if (child->IsTopLevel())
+        {
+            // We can move it to the correct position at this point
+            // TODO: probably need to add margin
+            child->Move(GetPosition() + wxPoint(currentWidth + (wxMax(leftIndent, leftIndent + leftSubIndent)), currentPosition.y));
+        }
 
-    return true;
-}
+        // Cases:
+        // 1) There was a line break BEFORE the natural break
+        // 2) There was a line break AFTER the natural break
+        // 3) It's the last line
+        // 4) The child still fits (carry on) - 'else' clause
 
-/// Submit command to insert the given text
-bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags)
-{
-    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
+        if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableRect.width))
+            ||
+            (childSize.x + currentWidth > availableRect.width)
+            ||
+            ((childSize.x + currentWidth <= availableRect.width) && !node->GetNext())
 
-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
-    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
-    {
-        paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */);
-        if (!paraAttr.IsDefault())
-            p = & paraAttr;
-    }
+            )
+        {
+            long wrapPosition = 0;
+            if ((childSize.x + currentWidth <= availableRect.width) && !node->GetNext() && !lineBreakInThisObject)
+                wrapPosition = child->GetRange().GetEnd();
+            else
 
-    wxTextAttrEx attr(GetDefaultStyle());
+            // Find a place to wrap. This may walk back to previous children,
+            // for example if a word spans several objects.
+            // Note: one object must contains only one wxTextAtrr, so the line height will not
+            //       change inside one object. Thus, we can pass the remain line width to the
+            //       FindWrapPosition function.
+            if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, context, availableRect.width, wrapPosition, & partialExtents))
+            {
+                // If the function failed, just cut it off at the end of this child.
+                wrapPosition = child->GetRange().GetEnd();
+            }
 
-    wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
-    action->GetNewParagraphs().AppendChild(newPara);
-    action->GetNewParagraphs().UpdateRanges();
-    action->GetNewParagraphs().SetPartialParagraph(false);
-    action->SetPosition(pos);
+            // FindWrapPosition can still return a value that will put us in an endless wrapping loop
+            if (wrapPosition <= lastCompletedEndPos)
+                wrapPosition = wxMax(lastCompletedEndPos+1,child->GetRange().GetEnd());
 
-    if (p)
-        newPara->SetAttributes(*p);
+            // Line end position shouldn't be the same as the end, or greater.
+            if (wrapPosition >= GetRange().GetEnd())
+                wrapPosition = wxMax(0, GetRange().GetEnd()-1);
 
-    // Set the range we'll need to delete in Undo
-    action->SetRange(wxRichTextRange(pos, pos));
+            // wxLogDebug(wxT("Split at %ld"), wrapPosition);
 
-    SubmitAction(action);
+            // Let's find the actual size of the current line now
+            wxSize actualSize;
+            wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
 
-    return true;
-}
+            childDescent = 0;
 
-/// Submit command to insert the given image
-bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags)
-{
-    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false);
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+            if (!child->IsEmpty())
+            {
+                // Get height only, then the width using the partial extents
+                GetRangeSize(actualRange, actualSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+                actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents);
+            }
+            else
+#endif
+                GetRangeSize(actualRange, actualSize, childDescent, dc, context, wxRICHTEXT_UNFORMATTED);
 
-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
-    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
-    {
-        paraAttr = GetStyleForNewParagraph(pos);
-        if (!paraAttr.IsDefault())
-            p = & paraAttr;
-    }
+            currentWidth = actualSize.x;
 
-    wxTextAttrEx attr(GetDefaultStyle());
+            // The descent for the whole line at this point, is the correct max descent
+            maxDescent = childDescent;
+            // Maximum ascent
+            maxAscent = actualSize.y-childDescent;
 
-    wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
-    if (p)
-        newPara->SetAttributes(*p);
+            // lineHeight is given by the height for the whole line, since it will
+            // take into account ascend/descend.
+            lineHeight = actualSize.y;
 
-    wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
-    newPara->AppendChild(imageObject);
-    action->GetNewParagraphs().AppendChild(newPara);
-    action->GetNewParagraphs().UpdateRanges();
+            if (lineHeight == 0 && buffer)
+            {
+                wxFont font(buffer->GetFontTable().FindFont(attr));
+                wxCheckSetFont(dc, font);
+                lineHeight = dc.GetCharHeight();
+            }
 
-    action->GetNewParagraphs().SetPartialParagraph(true);
+            if (maxDescent == 0)
+            {
+                int w, h;
+                dc.GetTextExtent(wxT("X"), & w, &h, & maxDescent);
+            }
 
-    action->SetPosition(pos);
+            // Add a new line
+            wxRichTextLine* line = AllocateLine(lineCount);
 
-    // Set the range we'll need to delete in Undo
-    action->SetRange(wxRichTextRange(pos, pos));
+            // 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);
 
-    SubmitAction(action);
+            maxHeight = currentPosition.y + lineHeight;
 
-    return true;
-}
+            // Now move down a line. TODO: add margins, spacing
+            currentPosition.y += lineHeight;
+            currentPosition.y += lineSpacing;
+            maxDescent = 0;
+            maxAscent = 0;
+            maxWidth = wxMax(maxWidth, currentWidth+startOffset);
+            currentWidth = 0;
 
-/// 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, bool lookUpNewParaStyle) const
-{
-    wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
-    if (para)
-    {
-        wxRichTextAttr attr;
-        bool foundAttributes = false;
-        
-        // Look for a matching paragraph style
-        if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
-        {
-            wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
-            if (paraDef)
+            lineCount ++;
+
+            // TODO: account for zero-length objects
+            // wxASSERT(wrapPosition > lastCompletedEndPos);
+
+            lastEndPos = wrapPosition;
+            lastCompletedEndPos = lastEndPos;
+
+            lineHeight = 0;
+
+            if (wrapPosition < GetRange().GetEnd()-1)
             {
-                if (!paraDef->GetNextStyle().IsEmpty())
-                {
-                    wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
-                    if (nextParaDef)
-                    {
-                        foundAttributes = true;
-                        attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());
-                    }
-                }
-                
-                // If we didn't find the 'next style', use this style instead.
-                if (!foundAttributes)
-                {
-                    foundAttributes = true;
-                    attr = paraDef->GetStyleMergedWithBase(GetStyleSheet());
-                }
+                // May need to set the node back to a previous one, due to searching back in wrapping
+                wxRichTextObject* childAfterWrapPosition = FindObjectAtPosition(wrapPosition+1);
+                if (childAfterWrapPosition)
+                    node = m_children.Find(childAfterWrapPosition);
+                else
+                    node = node->GetNext();
             }
-        }
-        if (!foundAttributes)
-        {
-            attr = para->GetAttributes();
-            int flags = attr.GetFlags();
+            else
+                node = node->GetNext();
 
-            // Eliminate character styles
-            flags &= ( (~ wxTEXT_ATTR_FONT) |
-                    (~ wxTEXT_ATTR_TEXT_COLOUR) |
-                    (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
-            attr.SetFlags(flags);
+            // Apply paragraph styles such as alignment to the wrapped line
+            ApplyParagraphStyle(line, attr, availableRect, dc);
         }
-        
-        // Now see if we need to number the paragraph.
-        if (attr.HasBulletStyle())
+        else
         {
-            wxRichTextAttr numberingAttr;
-            if (FindNextParagraphNumber(para, numberingAttr))
-                wxRichTextApplyStyle(attr, (const wxRichTextAttr&) numberingAttr);
-        }
+            // We still fit, so don't add a line, and keep going
+            currentWidth += childSize.x;
 
-        return attr;
+            if (childDescent == 0)
+            {
+                // An object with a zero descend value wants to take up the whole
+                // height regardless of baseline
+                lineHeight = wxMax(lineHeight, childSize.y);
+            }
+            else
+            {
+                maxDescent = wxMax(childDescent, maxDescent);
+                maxAscent = wxMax(childSize.y-childDescent, maxAscent);
+            }
+
+            lineHeight = wxMax(lineHeight, (maxDescent + maxAscent));
+
+            maxWidth = wxMax(maxWidth, currentWidth+startOffset);
+            lastEndPos = child->GetRange().GetEnd();
+
+            node = node->GetNext();
+        }
     }
-    else
-        return wxRichTextAttr();
-}
 
-/// Submit command to delete this range
-bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl)
-{
-    wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
+    //wxASSERT(!(lastCompletedEndPos != -1 && lastCompletedEndPos < GetRange().GetEnd()-1));
 
-    action->SetPosition(ctrl->GetCaretPosition());
+    // Remove remaining unused line objects, if any
+    ClearUnusedLines(lineCount);
 
-    // Set the range to delete
-    action->SetRange(range);
+    // We need to add back the margins etc.
+    {
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(maxWidth, currentPosition.y + spaceAfterPara));
+        GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetCachedSize(marginRect.GetSize());
+    }
 
-    // Copy the fragment that we'll need to restore in Undo
-    CopyFragment(range, action->GetOldParagraphs());
+    // The maximum size is the length of the paragraph stretched out into a line.
+    // So if there were a single word, or an image, or a fixed-size text box, the object could be shrunk around
+    // this size. TODO: take into account line breaks.
+    {
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(paraSize.x + wxMax(leftIndent, leftIndent + leftSubIndent) + rightIndent, currentPosition.y + spaceAfterPara));
+        GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetMaxSize(marginRect.GetSize());
+    }
 
-    // Special case: if there is only one (non-partial) paragraph,
-    // we must save the *next* paragraph's style, because that
-    // is the style we must apply when inserting the content back
-    // when undoing the delete. (This is because we're merging the
-    // paragraph with the previous paragraph and throwing away
-    // the style, and we need to restore it.)
-    if (!action->GetOldParagraphs().GetPartialParagraph() && action->GetOldParagraphs().GetChildCount() == 1)
+    // Find the greatest minimum size. Currently we only look at non-text objects,
+    // which isn't ideal but it would be slow to find the maximum word width to
+    // use as the minimum.
     {
-        wxRichTextParagraph* lastPara = GetParagraphAtPosition(range.GetStart());
-        if (lastPara)
+        int minWidth = 0;
+        node = m_children.GetFirst();
+        while (node)
         {
-            wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetEnd()+1);
-            if (nextPara)
+            wxRichTextObject* child = node->GetData();
+
+            // If floating, ignore. We already laid out floats.
+            // Also ignore if empty object, except if we haven't got any
+            // size yet.
+            if (!child->IsFloating() && child->GetRange().GetLength() != 0 && !wxDynamicCast(child, wxRichTextPlainText))
             {
-                wxRichTextParagraph* para = (wxRichTextParagraph*) action->GetOldParagraphs().GetChild(0);
-                para->SetAttributes(nextPara->GetAttributes());
+                if (child->GetCachedSize().x > minWidth)
+                    minWidth = child->GetMinSize().x;
             }
+            node = node->GetNext();
         }
+
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(minWidth, currentPosition.y + spaceAfterPara));
+        GetBoxRects(dc, buffer, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetMinSize(marginRect.GetSize());
     }
 
-    SubmitAction(action);
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+    // Use the text extents to calculate the size of each fragment in each line
+    wxRichTextLineList::compatibility_iterator lineNode = m_cachedLines.GetFirst();
+    while (lineNode)
+    {
+        wxRichTextLine* line = lineNode->GetData();
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
 
-    return true;
-}
+        // Loop through objects until we get to the one within range
+        wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
 
-/// Collapse undo/redo commands
-bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName)
-{
-    if (m_batchedCommandDepth == 0)
-    {
-        wxASSERT(m_batchedCommand == NULL);
-        if (m_batchedCommand)
+        while (node2)
         {
-            GetCommandProcessor()->Submit(m_batchedCommand);
+            wxRichTextObject* child = node2->GetData();
+
+            if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange))
+            {
+                wxRichTextRange rangeToUse = lineRange;
+                rangeToUse.LimitTo(child->GetRange());
+
+                // Find the size of the child from the text extents, and store in an array
+                // for drawing later
+                int left = 0;
+                if (rangeToUse.GetStart() > GetRange().GetStart())
+                    left = partialExtents[(rangeToUse.GetStart()-1) - GetRange().GetStart()];
+                int right = partialExtents[rangeToUse.GetEnd() - GetRange().GetStart()];
+                int sz = right - left;
+                line->GetObjectSizes().Add(sz);
+            }
+            else if (child->GetRange().GetStart() > lineRange.GetEnd())
+                // Can break out of inner loop now since we've passed this line's range
+                break;
+
+            node2 = node2->GetNext();
         }
-        m_batchedCommand = new wxRichTextCommand(cmdName);
-    }
 
-    m_batchedCommandDepth ++;
+        lineNode = lineNode->GetNext();
+    }
+#endif
+#endif
 
     return true;
 }
 
-/// Collapse undo/redo commands
-bool wxRichTextBuffer::EndBatchUndo()
+/// Apply paragraph styles, such as centering, to wrapped lines
+/// TODO: take into account box attributes, possibly
+void wxRichTextParagraph::ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc)
 {
-    m_batchedCommandDepth --;
+    if (!attr.HasAlignment())
+        return;
 
-    wxASSERT(m_batchedCommandDepth >= 0);
-    wxASSERT(m_batchedCommand != NULL);
+    wxPoint pos = line->GetPosition();
+    wxPoint originalPos = pos;
+    wxSize size = line->GetSize();
 
-    if (m_batchedCommandDepth == 0)
+    // centering, right-justification
+    if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
     {
-        GetCommandProcessor()->Submit(m_batchedCommand);
-        m_batchedCommand = NULL;
+        int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+        pos.x = (rect.GetWidth() - rightIndent - size.x)/2 + pos.x;
+        line->SetPosition(pos);
+    }
+    else if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+    {
+        int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+        pos.x = pos.x + rect.GetWidth() - size.x - rightIndent;
+        line->SetPosition(pos);
     }
 
-    return true;
-}
-
-/// Submit immediately, or delay according to whether collapsing is on
-bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
-{
-    if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
-        m_batchedCommand->AddAction(action);
-    else
+    if (pos != originalPos)
     {
-        wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
-        cmd->AddAction(action);
+        wxPoint inc = pos - originalPos;
 
-        // Only store it if we're not suppressing undo.
-        return GetCommandProcessor()->Submit(cmd, !SuppressingUndo());
-    }
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
-    return true;
+        while (node)
+        {
+            wxRichTextObject* child = node->GetData();
+            if (child->IsTopLevel() && !child->GetRange().IsOutside(line->GetAbsoluteRange()))
+                child->Move(child->GetPosition() + inc);
+
+            node = node->GetNext();
+        }
+    }
 }
 
-/// Begin suppressing undo/redo commands.
-bool wxRichTextBuffer::BeginSuppressUndo()
+/// Insert text at the given position
+bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 {
-    m_suppressUndo ++;
+    wxRichTextObject* childToUse = NULL;
+    wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator();
 
-    return true;
-}
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        if (child->GetRange().Contains(pos) && child->GetRange().GetLength() > 0)
+        {
+            childToUse = child;
+            nodeToUse = node;
+            break;
+        }
 
-/// End suppressing undo/redo commands.
-bool wxRichTextBuffer::EndSuppressUndo()
-{
-    m_suppressUndo --;
+        node = node->GetNext();
+    }
 
-    return true;
-}
+    if (childToUse)
+    {
+        wxRichTextPlainText* textObject = wxDynamicCast(childToUse, wxRichTextPlainText);
+        if (textObject)
+        {
+            int posInString = pos - textObject->GetRange().GetStart();
 
-/// Begin using a style
-bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style)
-{
-    wxTextAttrEx newStyle(GetDefaultStyle());
+            wxString newText = textObject->GetText().Mid(0, posInString) +
+                               text + textObject->GetText().Mid(posInString);
+            textObject->SetText(newText);
 
-    // Save the old default style
-    m_attributeStack.Append((wxObject*) new wxTextAttrEx(GetDefaultStyle()));
+            int textLength = text.length();
 
-    wxRichTextApplyStyle(newStyle, style);
-    newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
+            textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(),
+                                                 textObject->GetRange().GetEnd() + textLength));
 
-    SetDefaultStyle(newStyle);
+            // Increment the end range of subsequent fragments in this paragraph.
+            // We'll set the paragraph range itself at a higher level.
 
-    // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize());
+            wxRichTextObjectList::compatibility_iterator node = nodeToUse->GetNext();
+            while (node)
+            {
+                wxRichTextObject* child = node->GetData();
+                child->SetRange(wxRichTextRange(textObject->GetRange().GetStart() + textLength,
+                                                 textObject->GetRange().GetEnd() + textLength));
 
-    return true;
-}
+                node = node->GetNext();
+            }
 
-/// End the style
-bool wxRichTextBuffer::EndStyle()
-{
-    if (!m_attributeStack.GetFirst())
-    {
-        wxLogDebug(_("Too many EndStyle calls!"));
-        return false;
+            return true;
+        }
+        else
+        {
+            // TODO: if not a text object, insert at closest position, e.g. in front of it
+        }
     }
+    else
+    {
+        // Add at end.
+        // Don't pass parent initially to suppress auto-setting of parent range.
+        // We'll do that at a higher level.
+        wxRichTextPlainText* textObject = new wxRichTextPlainText(text, this);
 
-    wxList::compatibility_iterator node = m_attributeStack.GetLast();
-    wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
-    m_attributeStack.Erase(node);
-
-    SetDefaultStyle(*attr);
+        AppendChild(textObject);
+        return true;
+    }
 
-    delete attr;
-    return true;
+    return false;
 }
 
-/// End all styles
-bool wxRichTextBuffer::EndAllStyles()
+void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj)
 {
-    while (m_attributeStack.GetCount() != 0)
-        EndStyle();
-    return true;
+    wxRichTextCompositeObject::Copy(obj);
 }
 
-/// Clear the style stack
-void wxRichTextBuffer::ClearStyleStack()
+/// Clear the cached lines
+void wxRichTextParagraph::ClearLines()
 {
-    for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())
-        delete (wxTextAttrEx*) node->GetData();
-    m_attributeStack.Clear();
+    WX_CLEAR_LIST(wxRichTextLineList, m_cachedLines);
 }
 
-/// Begin using bold
-bool wxRichTextBuffer::BeginBold()
+/// 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, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
 {
-    wxFont font(GetBasicStyle().GetFont());
-    font.SetWeight(wxBOLD);
-
-    wxTextAttrEx attr;
-    attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT);
-
-    return BeginStyle(attr);
-}
-
-/// Begin using italic
-bool wxRichTextBuffer::BeginItalic()
-{
-    wxFont font(GetBasicStyle().GetFont());
-    font.SetStyle(wxITALIC);
+    if (!range.IsWithin(GetRange()))
+        return false;
 
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC);
+    if (flags & wxRICHTEXT_UNFORMATTED)
+    {
+        // Just use unformatted data, assume no line breaks
+        wxSize sz;
 
-    return BeginStyle(attr);
-}
+        wxArrayInt childExtents;
+        wxArrayInt* p;
+        if (partialExtents)
+            p = & childExtents;
+        else
+            p = NULL;
 
-/// Begin using underline
-bool wxRichTextBuffer::BeginUnderline()
-{
-    wxFont font(GetBasicStyle().GetFont());
-    font.SetUnderlined(true);
+        int maxDescent = 0;
+        int maxAscent = 0;
+        int maxLineHeight = 0;
 
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE);
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+        while (node)
+        {
+            wxRichTextObject* child = node->GetData();
+            if (!child->GetRange().IsOutside(range))
+            {
+                // Floating objects have a zero size within the paragraph.
+                if (child->IsFloating())
+                {
+                    if (partialExtents)
+                    {
+                        int lastSize;
+                        if (partialExtents->GetCount() > 0)
+                            lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                        else
+                            lastSize = 0;
 
-    return BeginStyle(attr);
-}
+                        partialExtents->Add(0 /* zero size */ + lastSize);
+                    }
+                }
+                else
+                {
+                    wxSize childSize;
 
-/// Begin using point size
-bool wxRichTextBuffer::BeginFontSize(int pointSize)
-{
-    wxFont font(GetBasicStyle().GetFont());
-    font.SetPointSize(pointSize);
+                    wxRichTextRange rangeToUse = range;
+                    rangeToUse.LimitTo(child->GetRange());
+                    int childDescent = 0;
 
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE);
+                    // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we've already cached the size,
+                    // but it's only going to be used after caching has taken place.
+                    if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
+                    {
+                        childDescent = child->GetDescent();
+                        childSize = child->GetCachedSize();
 
-    return BeginStyle(attr);
-}
+                        if (childDescent == 0)
+                        {
+                            maxLineHeight = wxMax(maxLineHeight, childSize.y);
+                        }
+                        else
+                        {
+                            maxDescent = wxMax(maxDescent, childDescent);
+                            maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+                        }
 
-/// Begin using this font
-bool wxRichTextBuffer::BeginFont(const wxFont& font)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_FONT);
-    attr.SetFont(font);
+                        maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
 
-    return BeginStyle(attr);
-}
+                        sz.y = wxMax(sz.y, maxLineHeight);
+                        sz.x += childSize.x;
+                        descent = maxDescent;
+                    }
+                    else if (child->IsTopLevel())
+                    {
+                        childDescent = child->GetDescent();
+                        childSize = child->GetCachedSize();
 
-/// Begin using this colour
-bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
-    attr.SetTextColour(colour);
+                        if (childDescent == 0)
+                        {
+                            maxLineHeight = wxMax(maxLineHeight, childSize.y);
+                        }
+                        else
+                        {
+                            maxDescent = wxMax(maxDescent, childDescent);
+                            maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+                        }
 
-    return BeginStyle(attr);
-}
+                        maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
 
-/// Begin using alignment
-bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
-    attr.SetAlignment(alignment);
+                        sz.y = wxMax(sz.y, maxLineHeight);
+                        sz.x += childSize.x;
+                        descent = maxDescent;
 
-    return BeginStyle(attr);
-}
+                        // FIXME: this won't change the original values.
+                        // Should we be calling GetRangeSize above instead of using cached values?
+#if 0
+                        if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
+                        {
+                            child->SetCachedSize(childSize);
+                            child->SetDescent(childDescent);
+                        }
+#endif
 
-/// Begin left indent
-bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
-    attr.SetLeftIndent(leftIndent, leftSubIndent);
+                        if (partialExtents)
+                        {
+                            int lastSize;
+                            if (partialExtents->GetCount() > 0)
+                                lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                            else
+                                lastSize = 0;
 
-    return BeginStyle(attr);
-}
+                            partialExtents->Add(childSize.x + lastSize);
+                        }
+                    }
+                    else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y), p))
+                    {
+                        if (childDescent == 0)
+                        {
+                            maxLineHeight = wxMax(maxLineHeight, childSize.y);
+                        }
+                        else
+                        {
+                            maxDescent = wxMax(maxDescent, childDescent);
+                            maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+                        }
 
-/// Begin right indent
-bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
-    attr.SetRightIndent(rightIndent);
+                        maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
 
-    return BeginStyle(attr);
-}
+                        sz.y = wxMax(sz.y, maxLineHeight);
+                        sz.x += childSize.x;
+                        descent = maxDescent;
 
-/// Begin paragraph spacing
-bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after)
-{
-    long flags = 0;
-    if (before != 0)
-        flags |= wxTEXT_ATTR_PARA_SPACING_BEFORE;
-    if (after != 0)
-        flags |= wxTEXT_ATTR_PARA_SPACING_AFTER;
+                        if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
+                        {
+                            child->SetCachedSize(childSize);
+                            child->SetDescent(childDescent);
+                        }
 
-    wxTextAttrEx attr;
-    attr.SetFlags(flags);
-    attr.SetParagraphSpacingBefore(before);
-    attr.SetParagraphSpacingAfter(after);
+                        if (partialExtents)
+                        {
+                            int lastSize;
+                            if (partialExtents->GetCount() > 0)
+                                lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                            else
+                                lastSize = 0;
 
-    return BeginStyle(attr);
-}
+                            size_t i;
+                            for (i = 0; i < childExtents.GetCount(); i++)
+                            {
+                                partialExtents->Add(childExtents[i] + lastSize);
+                            }
+                        }
+                    }
+                }
 
-/// Begin line spacing
-bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
-    attr.SetLineSpacing(lineSpacing);
+                if (p)
+                    p->Clear();
+            }
 
-    return BeginStyle(attr);
-}
+            node = node->GetNext();
+        }
+        size = sz;
+    }
+    else
+    {
+        // Use formatted data, with line breaks
+        wxSize sz;
 
-/// Begin numbered bullet
-bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
-{
-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
-    attr.SetBulletStyle(bulletStyle);
-    attr.SetBulletNumber(bulletNumber);
-    attr.SetLeftIndent(leftIndent, leftSubIndent);
+        // We're going to loop through each line, and then for each line,
+        // call GetRangeSize for the fragment that comprises that line.
+        // Only we have to do that multiple times within the line, because
+        // the line may be broken into pieces. For now ignore line break commands
+        // (so we can assume that getting the unformatted size for a fragment
+        // within a line is the actual size)
 
-    return BeginStyle(attr);
-}
+        wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
+        while (node)
+        {
+            wxRichTextLine* line = node->GetData();
+            wxRichTextRange lineRange = line->GetAbsoluteRange();
+            if (!lineRange.IsOutside(range))
+            {
+                int maxDescent = 0;
+                int maxAscent = 0;
+                int maxLineHeight = 0;
+                int maxLineWidth = 0;
 
-/// Begin symbol bullet
-bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, 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.SetBulletText(symbol);
+                wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
+                while (node2)
+                {
+                    wxRichTextObject* child = node2->GetData();
 
-    return BeginStyle(attr);
-}
+                    if (!child->IsFloating() && !child->GetRange().IsOutside(lineRange))
+                    {
+                        wxRichTextRange rangeToUse = lineRange;
+                        rangeToUse.LimitTo(child->GetRange());
+                        if (child->IsTopLevel())
+                            rangeToUse = child->GetOwnRange();
 
-/// 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);
+                        wxSize childSize;
+                        int childDescent = 0;
+                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, context, flags, wxPoint(position.x + sz.x, position.y)))
+                        {
+                            if (childDescent == 0)
+                            {
+                                // Assume that if descent is zero, this child can occupy the full line height
+                                // and does not need space for the line's maximum descent. So we influence
+                                // the overall max line height only.
+                                maxLineHeight = wxMax(maxLineHeight, childSize.y);
+                            }
+                            else
+                            {
+                                maxAscent = wxMax(maxAscent, (childSize.y - childDescent));
+                                maxDescent = wxMax(maxAscent, childDescent);
+                            }
+                            maxLineHeight = wxMax(maxLineHeight, (maxAscent + maxDescent));
+                            maxLineWidth += childSize.x;
+                        }
+                    }
 
-    return BeginStyle(attr);
-}
+                    node2 = node2->GetNext();
+                }
 
-/// Begin named character style
-bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle)
-{
-    if (GetStyleSheet())
-    {
-        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
-        if (def)
-        {
-            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
-            return BeginStyle(attr);
-        }
-    }
-    return false;
-}
+                descent = wxMax(descent, maxDescent);
 
-/// Begin named paragraph style
-bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle)
-{
-    if (GetStyleSheet())
-    {
-        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle);
-        if (def)
-        {
-            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
-            return BeginStyle(attr);
+                // Increase size by a line (TODO: paragraph spacing)
+                sz.y += maxLineHeight;
+                sz.x = wxMax(sz.x, maxLineWidth);
+            }
+            node = node->GetNext();
         }
+        size = sz;
     }
-    return false;
+    return true;
 }
 
-/// Begin named list style
-bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number)
+/// Finds the absolute position and row height for the given character position
+bool wxRichTextParagraph::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
 {
-    if (GetStyleSheet())
+    if (index == -1)
     {
-        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
-        if (def)
-        {
-            wxTextAttrEx attr(def->GetCombinedStyleForLevel(level));
+        wxRichTextLine* line = ((wxRichTextParagraphLayoutBox*)GetParent())->GetLineAtPosition(0);
+        if (line)
+            *height = line->GetSize().y;
+        else
+            *height = dc.GetCharHeight();
 
-            attr.SetBulletNumber(number);
+        // -1 means 'the start of the buffer'.
+        pt = GetPosition();
+        if (line)
+            pt = pt + line->GetPosition();
 
-            return BeginStyle(attr);
-        }
+        return true;
     }
-    return false;
-}
 
-/// Begin URL
-bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
-{
-    wxTextAttrEx attr;
-
-    if (!characterStyle.IsEmpty() && GetStyleSheet())
+    // The final position in a paragraph is taken to mean the position
+    // at the start of the next paragraph.
+    if (index == GetRange().GetEnd())
     {
-        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
-        if (def)
+        wxRichTextParagraphLayoutBox* parent = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
+        wxASSERT( parent != NULL );
+
+        // Find the height at the next paragraph, if any
+        wxRichTextLine* line = parent->GetLineAtPosition(index + 1);
+        if (line)
         {
-            attr = def->GetStyleMergedWithBase(GetStyleSheet());
+            *height = line->GetSize().y;
+            pt = line->GetAbsolutePosition();
+        }
+        else
+        {
+            *height = dc.GetCharHeight();
+            int indent = ConvertTenthsMMToPixels(dc, m_attributes.GetLeftIndent());
+            pt = wxPoint(indent, GetCachedSize().y);
         }
-    }
-    attr.SetURL(url);
-
-    return BeginStyle(attr);
-}
-
-/// Adds a handler to the end
-void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler)
-{
-    sm_handlers.Append(handler);
-}
-
-/// Inserts a handler at the front
-void wxRichTextBuffer::InsertHandler(wxRichTextFileHandler *handler)
-{
-    sm_handlers.Insert( handler );
-}
 
-/// Removes a handler
-bool wxRichTextBuffer::RemoveHandler(const wxString& name)
-{
-    wxRichTextFileHandler *handler = FindHandler(name);
-    if (handler)
-    {
-        sm_handlers.DeleteObject(handler);
-        delete handler;
         return true;
     }
-    else
+
+    if (index < GetRange().GetStart() || index > GetRange().GetEnd())
         return false;
-}
 
-/// Finds a handler by filename or, if supplied, type
-wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType)
-{
-    if (imageType != wxRICHTEXT_TYPE_ANY)
-        return FindHandler(imageType);
-    else if (!filename.IsEmpty())
+    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
+    while (node)
     {
-        wxString path, file, ext;
-        wxSplitPath(filename, & path, & file, & ext);
-        return FindHandler(ext, imageType);
-    }
-    else
-        return NULL;
-}
+        wxRichTextLine* line = node->GetData();
+        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 (index == lineRange.GetEnd() && forceLineStart)
+            {
+                if (node->GetNext())
+                {
+                    wxRichTextLine* nextLine = node->GetNext()->GetData();
+                    *height = nextLine->GetSize().y;
+                    pt = nextLine->GetAbsolutePosition();
+                    return true;
+                }
+            }
 
+            pt.y = line->GetPosition().y + GetPosition().y;
 
-/// Finds a handler by name
-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxRichTextFileHandler *handler = (wxRichTextFileHandler*)node->GetData();
-        if (handler->GetName().Lower() == name.Lower()) return handler;
+            wxRichTextRange r(lineRange.GetStart(), index);
+            wxSize rangeSize;
+            int descent = 0;
 
-        node = node->GetNext();
-    }
-    return NULL;
-}
+            // We find the size of the line up to this point,
+            // then we can add this size to the line start position and
+            // paragraph start position to find the actual position.
 
-/// Finds a handler by extension and type
-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxRichTextFileHandler *handler = (wxRichTextFileHandler*)node->GetData();
-        if ( handler->GetExtension().Lower() == extension.Lower() &&
-            (type == wxRICHTEXT_TYPE_ANY || handler->GetType() == type) )
-            return handler;
-        node = node->GetNext();
-    }
-    return 0;
-}
+            if (GetRangeSize(r, rangeSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, line->GetPosition()+ GetPosition()))
+            {
+                pt.x = line->GetPosition().x + GetPosition().x + rangeSize.x;
+                *height = line->GetSize().y;
+
+                return true;
+            }
+
+        }
 
-/// Finds a handler by type
-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxRichTextFileHandler *handler = (wxRichTextFileHandler *)node->GetData();
-        if (handler->GetType() == type) return handler;
         node = node->GetNext();
     }
-    return NULL;
-}
 
-void wxRichTextBuffer::InitStandardHandlers()
-{
-    if (!FindHandler(wxRICHTEXT_TYPE_TEXT))
-        AddHandler(new wxRichTextPlainTextHandler);
+    return false;
 }
 
-void wxRichTextBuffer::CleanUpHandlers()
+/// Hit-testing: returns a flag indicating hit test details, plus
+/// information about position
+int wxRichTextParagraph::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
 {
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
+    if (!IsShown())
+        return wxRICHTEXT_HITTEST_NONE;
+
+    // If we're in the top-level container, then we can return
+    // a suitable hit test code even if the point is outside the container area,
+    // so that we can position the caret sensibly even if we don't
+    // click on valid content. If we're not at the top-level, and the point
+    // is not within this paragraph object, then we don't want to stop more
+    // precise hit-testing from working prematurely, so return immediately.
+    // NEW STRATEGY: use the parent boundary to test whether we're in the
+    // right region, not the paragraph, since the paragraph may be positioned
+    // some way in from where the user clicks.
     {
-        wxRichTextFileHandler* handler = (wxRichTextFileHandler*)node->GetData();
-        wxList::compatibility_iterator next = node->GetNext();
-        delete handler;
-        node = next;
+        long tmpPos;
+        wxRichTextObject* tempObj, *tempContextObj;
+        if (GetParent() && GetParent()->wxRichTextObject::HitTest(dc, context, pt, tmpPos, & tempObj, & tempContextObj, flags) == wxRICHTEXT_HITTEST_NONE)
+            return wxRICHTEXT_HITTEST_NONE;
     }
 
-    sm_handlers.Clear();
-}
+    wxRichTextObjectList::compatibility_iterator objNode = m_children.GetFirst();
+    while (objNode)
+    {
+        wxRichTextObject* child = objNode->GetData();
+        // Don't recurse if we have wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS,
+        // and also, if this seems composite but actually is marked as atomic,
+        // don't recurse.
+        if (child->IsTopLevel() && ((flags & wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS) == 0) &&
+            (! (((flags & wxRICHTEXT_HITTEST_HONOUR_ATOMIC) != 0) && child->IsAtomic())))
+        {
+            {
+                int hitTest = child->HitTest(dc, context, pt, textPosition, obj, contextObj);
+                if (hitTest != wxRICHTEXT_HITTEST_NONE)
+                    return hitTest;
+            }
+        }
 
-wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* types)
-{
-    if (types)
-        types->Clear();
+        objNode = objNode->GetNext();
+    }
 
-    wxString wildcard;
+    wxPoint paraPos = GetPosition();
 
-    wxList::compatibility_iterator node = GetHandlers().GetFirst();
-    int count = 0;
+    wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetFirst();
     while (node)
     {
-        wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
-        if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad()))
+        wxRichTextLine* line = node->GetData();
+        wxPoint linePos = paraPos + line->GetPosition();
+        wxSize lineSize = line->GetSize();
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
+
+        if (pt.y <= linePos.y + lineSize.y)
         {
-            if (combine)
+            if (pt.x < linePos.x)
             {
-                if (count > 0)
-                    wildcard += wxT(";");
-                wildcard += wxT("*.") + handler->GetExtension();
+                textPosition = lineRange.GetStart();
+                *obj = FindObjectAtPosition(textPosition);
+                *contextObj = GetContainer();
+                return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE;
+            }
+            else if (pt.x >= (linePos.x + lineSize.x))
+            {
+                textPosition = lineRange.GetEnd();
+                *obj = FindObjectAtPosition(textPosition);
+                *contextObj = GetContainer();
+                return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
             }
             else
             {
-                if (count > 0)
-                    wildcard += wxT("|");
-                wildcard += handler->GetName();
-                wildcard += wxT(" ");
-                wildcard += _("files");
-                wildcard += wxT(" (*.");
-                wildcard += handler->GetExtension();
-                wildcard += wxT(")|*.");
-                wildcard += handler->GetExtension();
-                if (types)
-                    types->Add(handler->GetType());
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+                wxArrayInt partialExtents;
+
+                wxSize paraSize;
+                int paraDescent;
+
+                // This calculates the partial text extents
+                GetRangeSize(lineRange, paraSize, paraDescent, dc, context, wxRICHTEXT_UNFORMATTED, linePos, & partialExtents);
+
+                int lastX = linePos.x;
+                size_t i;
+                for (i = 0; i < partialExtents.GetCount(); i++)
+                {
+                    int nextX = partialExtents[i] + linePos.x;
+
+                    if (pt.x >= lastX && pt.x <= nextX)
+                    {
+                        textPosition = i + lineRange.GetStart(); // minus 1?
+
+                        *obj = FindObjectAtPosition(textPosition);
+                        *contextObj = GetContainer();
+
+                        // So now we know it's between i-1 and i.
+                        // Let's see if we can be more precise about
+                        // which side of the position it's on.
+
+                        int midPoint = (nextX + lastX)/2;
+                        if (pt.x >= midPoint)
+                            return wxRICHTEXT_HITTEST_AFTER;
+                        else
+                            return wxRICHTEXT_HITTEST_BEFORE;
+                    }
+
+                    lastX = nextX;
+                }
+#else
+                long i;
+                int lastX = linePos.x;
+                for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++)
+                {
+                    wxSize childSize;
+                    int descent = 0;
+
+                    wxRichTextRange rangeToUse(lineRange.GetStart(), i);
+
+                    GetRangeSize(rangeToUse, childSize, descent, dc, context, wxRICHTEXT_UNFORMATTED, linePos);
+
+                    int nextX = childSize.x + linePos.x;
+
+                    if (pt.x >= lastX && pt.x <= nextX)
+                    {
+                        textPosition = i;
+
+                        *obj = FindObjectAtPosition(textPosition);
+                        *contextObj = GetContainer();
+
+                        // So now we know it's between i-1 and i.
+                        // Let's see if we can be more precise about
+                        // which side of the position it's on.
+
+                        int midPoint = (nextX + lastX)/2;
+                        if (pt.x >= midPoint)
+                            return wxRICHTEXT_HITTEST_AFTER;
+                        else
+                            return wxRICHTEXT_HITTEST_BEFORE;
+                    }
+                    else
+                    {
+                        lastX = nextX;
+                    }
+                }
+#endif
             }
-            count ++;
         }
 
         node = node->GetNext();
     }
 
-    if (combine)
-        wildcard = wxT("(") + wildcard + wxT(")|") + wildcard;
-    return wildcard;
+    return wxRICHTEXT_HITTEST_NONE;
 }
 
-/// Load a file
-bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
+/// Split an object at this position if necessary, and return
+/// the previous object, or NULL if inserting at beginning.
+wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** previousObject)
 {
-    wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
-    if (handler)
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        SetDefaultStyle(wxTextAttrEx());
-        handler->SetFlags(GetHandlerFlags());
-        bool success = handler->LoadFile(this, filename);
-        Invalidate(wxRICHTEXT_ALL);
-        return success;
+        wxRichTextObject* child = node->GetData();
+
+        if (pos == child->GetRange().GetStart())
+        {
+            if (previousObject)
+            {
+                if (node->GetPrevious())
+                    *previousObject = node->GetPrevious()->GetData();
+                else
+                    *previousObject = NULL;
+            }
+
+            return child;
+        }
+
+        if (child->GetRange().Contains(pos))
+        {
+            // This should create a new object, transferring part of
+            // the content to the old object and the rest to the new object.
+            wxRichTextObject* newObject = child->DoSplit(pos);
+
+            // If we couldn't split this object, just insert in front of it.
+            if (!newObject)
+            {
+                // Maybe this is an empty string, try the next one
+                // return child;
+            }
+            else
+            {
+                // Insert the new object after 'child'
+                if (node->GetNext())
+                    m_children.Insert(node->GetNext(), newObject);
+                else
+                    m_children.Append(newObject);
+                newObject->SetParent(this);
+
+                if (previousObject)
+                    *previousObject = child;
+
+                return newObject;
+            }
+        }
+
+        node = node->GetNext();
     }
-    else
-        return false;
+    if (previousObject)
+        *previousObject = NULL;
+    return NULL;
 }
 
-/// Save a file
-bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
+/// Move content to a list from obj on
+void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list)
 {
-    wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
-    if (handler)
+    wxRichTextObjectList::compatibility_iterator node = m_children.Find(obj);
+    while (node)
     {
-        handler->SetFlags(GetHandlerFlags());
-        return handler->SaveFile(this, filename);
+        wxRichTextObject* child = node->GetData();
+        list.Append(child);
+
+        wxRichTextObjectList::compatibility_iterator oldNode = node;
+
+        node = node->GetNext();
+
+        m_children.DeleteNode(oldNode);
     }
-    else
-        return false;
 }
 
-/// Load from a stream
-bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
+/// Add content back from list
+void wxRichTextParagraph::MoveFromList(wxList& list)
 {
-    wxRichTextFileHandler* handler = FindHandler(type);
-    if (handler)
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
     {
-        SetDefaultStyle(wxTextAttrEx());
-        handler->SetFlags(GetHandlerFlags());
-        bool success = handler->LoadFile(this, stream);
-        Invalidate(wxRICHTEXT_ALL);
-        return success;
+        AppendChild((wxRichTextObject*) node->GetData());
     }
-    else
-        return false;
 }
 
-/// Save to a stream
-bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
+/// Calculate range
+void wxRichTextParagraph::CalculateRange(long start, long& end)
 {
-    wxRichTextFileHandler* handler = FindHandler(type);
-    if (handler)
+    wxRichTextCompositeObject::CalculateRange(start, end);
+
+    // Add one for end of paragraph
+    end ++;
+
+    m_range.SetRange(start, end);
+}
+
+/// Find the object at the given position
+wxRichTextObject* wxRichTextParagraph::FindObjectAtPosition(long position)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
     {
-        handler->SetFlags(GetHandlerFlags());
-        return handler->SaveFile(this, stream);
+        wxRichTextObject* obj = node->GetData();
+        if (obj->GetRange().Contains(position) ||
+            obj->GetRange().GetStart() == position ||
+            obj->GetRange().GetEnd() == position)
+            return obj;
+
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+/// Get the plain text searching from the start or end of the range.
+/// The resulting string may be shorter than the range given.
+bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTextRange& range, bool fromStart)
+{
+    text = wxEmptyString;
+
+    if (fromStart)
+    {
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+        while (node)
+        {
+            wxRichTextObject* obj = node->GetData();
+            if (!obj->GetRange().IsOutside(range))
+            {
+                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
+                if (textObj)
+                {
+                    text += textObj->GetTextForRange(range);
+                }
+                else
+                {
+                    text += wxT(" ");
+                }
+            }
+
+            node = node->GetNext();
+        }
     }
     else
+    {
+        wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
+        while (node)
+        {
+            wxRichTextObject* obj = node->GetData();
+            if (!obj->GetRange().IsOutside(range))
+            {
+                wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
+                if (textObj)
+                {
+                    text = textObj->GetTextForRange(range) + text;
+                }
+                else
+                {
+                    text = wxT(" ") + text;
+                }
+            }
+
+            node = node->GetPrevious();
+        }
+    }
+
+    return true;
+}
+
+/// Find a suitable wrap position.
+bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, wxRichTextDrawingContext& context, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents)
+{
+    if (range.GetLength() <= 0)
         return false;
+
+    // Find the first position where the line exceeds the available space.
+    wxSize sz;
+    long breakPosition = range.GetEnd();
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+    if (partialExtents && partialExtents->GetCount() >= (size_t) (GetRange().GetLength()-1)) // the final position in a paragraph is the newline
+    {
+        int widthBefore;
+
+        if (range.GetStart() > GetRange().GetStart())
+            widthBefore = (*partialExtents)[range.GetStart() - GetRange().GetStart() - 1];
+        else
+            widthBefore = 0;
+
+        size_t i;
+        for (i = (size_t) range.GetStart(); i <= (size_t) range.GetEnd(); i++)
+        {
+            int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore;
+
+            if (widthFromStartOfThisRange > availableSpace)
+            {
+                breakPosition = i-1;
+                break;
+            }
+        }
+    }
+    else
+#endif
+    {
+        // Binary chop for speed
+        long minPos = range.GetStart();
+        long maxPos = range.GetEnd();
+        while (true)
+        {
+            if (minPos == maxPos)
+            {
+                int descent = 0;
+                GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
+
+                if (sz.x > availableSpace)
+                    breakPosition = minPos - 1;
+                break;
+            }
+            else if ((maxPos - minPos) == 1)
+            {
+                int descent = 0;
+                GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
+
+                if (sz.x > availableSpace)
+                    breakPosition = minPos - 1;
+                else
+                {
+                    GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
+                    if (sz.x > availableSpace)
+                        breakPosition = maxPos-1;
+                }
+                break;
+            }
+            else
+            {
+                long nextPos = minPos + ((maxPos - minPos) / 2);
+
+                int descent = 0;
+                GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, context, wxRICHTEXT_UNFORMATTED);
+
+                if (sz.x > availableSpace)
+                {
+                    maxPos = nextPos;
+                }
+                else
+                {
+                    minPos = nextPos;
+                }
+            }
+        }
+    }
+
+    // Now we know the last position on the line.
+    // Let's try to find a word break.
+
+    wxString plainText;
+    if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false))
+    {
+        int newLinePos = plainText.Find(wxRichTextLineBreakChar);
+        if (newLinePos != wxNOT_FOUND)
+        {
+            breakPosition = wxMax(0, range.GetStart() + newLinePos);
+        }
+        else
+        {
+            int spacePos = plainText.Find(wxT(' '), true);
+            int tabPos = plainText.Find(wxT('\t'), true);
+            int pos = wxMax(spacePos, tabPos);
+            if (pos != wxNOT_FOUND)
+            {
+                int positionsFromEndOfString = plainText.length() - pos - 1;
+                breakPosition = breakPosition - positionsFromEndOfString;
+            }
+        }
+    }
+
+    wrapPosition = breakPosition;
+
+    return true;
 }
 
-/// Copy the range to the clipboard
-bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
-{
-    bool success = false;
-#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+/// Get the bullet text for this paragraph.
+wxString wxRichTextParagraph::GetBulletText()
+{
+    if (GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE ||
+        (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP))
+        return wxEmptyString;
+
+    int number = GetAttributes().GetBulletNumber();
+
+    wxString text;
+    if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE))
+    {
+        text.Printf(wxT("%d"), number);
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER)
+    {
+        // TODO: Unicode, and also check if number > 26
+        text.Printf(wxT("%c"), (wxChar) (number+64));
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER)
+    {
+        // TODO: Unicode, and also check if number > 26
+        text.Printf(wxT("%c"), (wxChar) (number+96));
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER)
+    {
+        text = wxRichTextDecimalToRoman(number);
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER)
+    {
+        text = wxRichTextDecimalToRoman(number);
+        text.MakeLower();
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
+    {
+        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(")");
+    }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS)
+    {
+        text = text + wxT(")");
+    }
+
+    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
+    {
+        text += wxT(".");
+    }
+
+    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.
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle, bool includingBoxAttr) const
+{
+    wxRichTextAttr attr;
+    wxRichTextParagraphLayoutBox* buf = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
+    if (buf)
+    {
+        attr = buf->GetBasicStyle();
+        if (!includingBoxAttr)
+        {
+            attr.GetTextBoxAttr().Reset();
+            // The background colour will be painted by the container, and we don't
+            // want to unnecessarily overwrite the background when we're drawing text
+            // because this may erase the guideline (which appears just under the text
+            // if there's no padding).
+            attr.SetFlags(attr.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
+        }
+        wxRichTextApplyStyle(attr, GetAttributes());
+    }
+    else
+        attr = GetAttributes();
+
+    wxRichTextApplyStyle(attr, contentStyle);
+    return attr;
+}
+
+/// Get combined attributes of the base style and paragraph style.
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(bool includingBoxAttr) const
+{
+    wxRichTextAttr attr;
+    wxRichTextParagraphLayoutBox* buf = wxDynamicCast(GetParent(), wxRichTextParagraphLayoutBox);
+    if (buf)
+    {
+        attr = buf->GetBasicStyle();
+        if (!includingBoxAttr)
+            attr.GetTextBoxAttr().Reset();
+        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();
+}
+
+void wxRichTextParagraph::LayoutFloat(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector)
+{
+    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)
+    {
+        wxRichTextObject* anchored = node->GetData();
+        if (anchored && anchored->IsFloating() && !floatCollector->HasFloat(anchored))
+        {
+            wxSize size;
+            int descent, x = 0;
+            anchored->GetRangeSize(anchored->GetRange(), size, descent, dc, context, style);
+
+            int offsetY = 0;
+            if (anchored->GetAttributes().GetTextBoxAttr().GetTop().IsValid())
+            {
+                offsetY = anchored->GetAttributes().GetTextBoxAttr().GetTop().GetValue();
+                if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+                {
+                    offsetY = ConvertTenthsMMToPixels(dc, offsetY);
+                }
+            }
+
+            int pos = floatCollector->GetFitPosition(anchored->GetAttributes().GetTextBoxAttr().GetFloatMode(), rect.y + offsetY, size.y);
+
+            /* Update the offset */
+            int newOffsetY = pos - rect.y;
+            if (newOffsetY != offsetY)
+            {
+                if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+                    newOffsetY = ConvertPixelsToTenthsMM(dc, newOffsetY);
+                anchored->GetAttributes().GetTextBoxAttr().GetTop().SetValue(newOffsetY);
+            }
+
+            if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_LEFT)
+                x = rect.x;
+            else if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_RIGHT)
+                x = rect.x + rect.width - size.x;
+
+            anchored->SetPosition(wxPoint(x, pos));
+            anchored->SetCachedSize(size);
+            floatCollector->CollectFloat(this, anchored);
+        }
+
+        node = node->GetNext();
+    }
+}
+
+// Get the first position from pos that has a line break character.
+long wxRichTextParagraph::GetFirstLineBreakPosition(long pos)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* obj = node->GetData();
+        if (pos >= obj->GetRange().GetStart() && pos <= obj->GetRange().GetEnd())
+        {
+            wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
+            if (textObj)
+            {
+                long breakPos = textObj->GetFirstLineBreakPosition(pos);
+                if (breakPos > -1)
+                    return breakPos;
+            }
+        }
+        node = node->GetNext();
+    }
+    return -1;
+}
+
+/*!
+ * wxRichTextLine
+ * This object represents a line in a paragraph, and stores
+ * offsets from the start of the paragraph representing the
+ * start and end positions of the line.
+ */
+
+wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent)
+{
+    Init(parent);
+}
+
+/// Initialisation
+void wxRichTextLine::Init(wxRichTextParagraph* parent)
+{
+    m_parent = parent;
+    m_range.SetRange(-1, -1);
+    m_pos = wxPoint(0, 0);
+    m_size = wxSize(0, 0);
+    m_descent = 0;
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+    m_objectSizes.Clear();
+#endif
+}
+
+/// Copy
+void wxRichTextLine::Copy(const wxRichTextLine& obj)
+{
+    m_range = obj.m_range;
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+    m_objectSizes = obj.m_objectSizes;
+#endif
+}
+
+/// Get the absolute object position
+wxPoint wxRichTextLine::GetAbsolutePosition() const
+{
+    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.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
+
+wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* style):
+    wxRichTextObject(parent)
+{
+    if (style)
+        SetAttributes(*style);
+
+    m_text = text;
+}
+
+#define USE_KERNING_FIX 1
+
+// If insufficient tabs are defined, this is the tab width used
+#define WIDTH_FOR_DEFAULT_TABS 50
+
+/// Draw the item
+bool wxRichTextPlainText::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int WXUNUSED(style))
+{
+    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
+    wxASSERT (para != NULL);
+
+    wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes(), false /* no box attributes */) : GetAttributes());
+    context.ApplyVirtualAttributes(textAttr, this);
+
+    // Let's make the assumption for now that for content in a paragraph, including
+    // text, we never have a discontinuous selection. So we only deal with a
+    // single range.
+    wxRichTextRange selectionRange;
+    if (selection.IsValid())
+    {
+        wxRichTextRangeArray selectionRanges = selection.GetSelectionForObject(this);
+        if (selectionRanges.GetCount() > 0)
+            selectionRange = selectionRanges[0];
+        else
+            selectionRange = wxRICHTEXT_NO_SELECTION;
+    }
+    else
+        selectionRange = wxRICHTEXT_NO_SELECTION;
+
+    int offset = GetRange().GetStart();
+
+    // Replace line break characters with spaces
+    wxString str = m_text;
+    wxString toRemove = wxRichTextLineBreakChar;
+    str.Replace(toRemove, wxT(" "));
+    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & (wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS)))
+        str.MakeUpper();
+
+    long len = range.GetLength();
+    wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len);
+
+    // Test for the optimized situations where all is selected, or none
+    // is selected.
+
+    wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr));
+    wxCheckSetFont(dc, textFont);
+    int charHeight = dc.GetCharHeight();
+
+    int x, y;
+    if ( textFont.IsOk() )
+    {
+        if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SMALL_CAPITALS))
+        {
+            textFont.SetPointSize((int) (textFont.GetPointSize()*0.75));
+            wxCheckSetFont(dc, textFont);
+            charHeight = dc.GetCharHeight();
+        }
+
+        if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) )
+        {
+            if (textFont.IsUsingSizeInPixels())
+            {
+                double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+                x = rect.x;
+                y = rect.y;
+            }
+            else
+            {
+                double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPointSize(static_cast<int>(size));
+                x = rect.x;
+                y = rect.y;
+            }
+            wxCheckSetFont(dc, textFont);
+        }
+        else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) )
+        {
+            if (textFont.IsUsingSizeInPixels())
+            {
+                double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+                x = rect.x;
+                int sub_height = static_cast<int>(static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
+                y = rect.y + (rect.height - sub_height + (descent - m_descent));
+            }
+            else
+            {
+                double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPointSize(static_cast<int>(size));
+                x = rect.x;
+                int sub_height = static_cast<int>(static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
+                y = rect.y + (rect.height - sub_height + (descent - m_descent));
+            }
+            wxCheckSetFont(dc, textFont);
+        }
+        else
+        {
+            x = rect.x;
+            y = rect.y + (rect.height - charHeight - (descent - m_descent));
+        }
+    }
+    else
+    {
+        x = rect.x;
+        y = rect.y + (rect.height - charHeight - (descent - m_descent));
+    }
+
+    // TODO: new selection code
+
+    // (a) All selected.
+    if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
+    {
+        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, true);
+    }
+    // (b) None selected.
+    else if (selectionRange.GetEnd() < range.GetStart() || selectionRange.GetStart() > range.GetEnd())
+    {
+        // Draw all unselected
+        DrawTabbedString(dc, textAttr, rect, stringChunk, x, y, false);
+    }
+    else
+    {
+        // (c) Part selected, part not
+        // Let's draw unselected chunk, selected chunk, then unselected chunk.
+
+        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+
+        // 1. Initial unselected chunk, if any, up until start of selection.
+        if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd())
+        {
+            int r1 = range.GetStart();
+            int s1 = selectionRange.GetStart()-1;
+            int fragmentLen = s1 - r1 + 1;
+            if (fragmentLen < 0)
+            {
+                wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
+            }
+            wxString stringFragment = str.Mid(r1 - offset, fragmentLen);
+
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
+
+#if USE_KERNING_FIX
+            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
+            {
+                // Compensate for kerning difference
+                wxString stringFragment2(str.Mid(r1 - offset, fragmentLen+1));
+                wxString stringFragment3(str.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.
+        if (selectionRange.GetEnd() >= range.GetStart())
+        {
+            int s1 = wxMax(selectionRange.GetStart(), range.GetStart());
+            int s2 = wxMin(selectionRange.GetEnd(), range.GetEnd());
+
+            int fragmentLen = s2 - s1 + 1;
+            if (fragmentLen < 0)
+            {
+                wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
+            }
+            wxString stringFragment = str.Mid(s1 - offset, fragmentLen);
+
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);
+
+#if USE_KERNING_FIX
+            if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
+            {
+                // Compensate for kerning difference
+                wxString stringFragment2(str.Mid(s1 - offset, fragmentLen+1));
+                wxString stringFragment3(str.Mid(s1 - 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
+        }
+
+        // 3. Remaining unselected chunk, if any
+        if (selectionRange.GetEnd() < range.GetEnd())
+        {
+            int s2 = wxMin(selectionRange.GetEnd()+1, range.GetEnd());
+            int r2 = range.GetEnd();
+
+            int fragmentLen = r2 - s2 + 1;
+            if (fragmentLen < 0)
+            {
+                wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
+            }
+            wxString stringFragment = str.Mid(s2 - offset, fragmentLen);
+
+            DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
+        }
+    }
+
+    return true;
+}
+
+bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxRichTextAttr& 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)
+    {
+        wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+        wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+
+        wxCheckSetBrush(dc, wxBrush(highlightColour));
+        wxCheckSetPen(dc, wxPen(highlightColour));
+        dc.SetTextForeground(highlightTextColour);
+        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    }
+    else
+    {
+        dc.SetTextForeground(attr.GetTextColour());
+
+        if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk())
+        {
+            dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
+            dc.SetTextBackground(attr.GetBackgroundColour());
+        }
+        else
+            dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    }
+
+    wxCoord x_orig = GetParent()->GetPosition().x;
+    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) + x_orig;
+
+            // Find the next tab position.
+            // Even if we're at the end of the tab array, we must still draw the chunk.
+
+            if (nextTabPos > tabPos || (i == (tabCount - 1)))
+            {
+                if (nextTabPos <= tabPos)
+                {
+                    int defaultTabWidth = ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS);
+                    nextTabPos = tabPos + defaultTabWidth;
+                }
+
+                not_found = false;
+                if (selected)
+                {
+                    w = nextTabPos - x;
+                    wxRect selRect(x, rect.y, w, rect.GetHeight());
+                    dc.DrawRectangle(selRect);
+                }
+                dc.DrawText(stringChunk, x, y);
+
+                if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
+                {
+                    wxPen oldPen = dc.GetPen();
+                    wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));
+                    dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
+                    wxCheckSetPen(dc, oldPen);
+                }
+
+                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);
+
+        if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
+        {
+            wxPen oldPen = dc.GetPen();
+            wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));
+            dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
+            wxCheckSetPen(dc, oldPen);
+        }
+
+        x += w;
+    }
+
+    return true;
+}
+
+/// Lay the item out
+bool wxRichTextPlainText::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& WXUNUSED(rect), const wxRect& WXUNUSED(parentRect), int WXUNUSED(style))
+{
+    // Only lay out if we haven't already cached the size
+    if (m_size.x == -1)
+        GetRangeSize(GetRange(), m_size, m_descent, dc, context, 0, wxPoint(0, 0));
+    m_maxSize = m_size;
+    // Eventually we want to have a reasonable estimate of minimum size.
+    m_minSize = wxSize(0, 0);
+    return true;
+}
+
+/// Copy
+void wxRichTextPlainText::Copy(const wxRichTextPlainText& obj)
+{
+    wxRichTextObject::Copy(obj);
+
+    m_text = obj.m_text;
+}
+
+/// 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, wxRichTextDrawingContext& context, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const
+{
+    if (!range.IsWithin(GetRange()))
+        return false;
+
+    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
+    wxASSERT (para != NULL);
+
+    int relativeX = position.x - GetParent()->GetPosition().x;
+
+    wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+    context.ApplyVirtualAttributes(textAttr, (wxRichTextObject*) this);
+
+    // 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
+
+    bool bScript(false);
+    wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr));
+    if (font.IsOk())
+    {
+        if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+            || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) )
+        {
+            wxFont textFont = font;
+            if (textFont.IsUsingSizeInPixels())
+            {
+                double size = static_cast<double>(textFont.GetPixelSize().y) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPixelSize(wxSize(0, static_cast<int>(size)));
+            }
+            else
+            {
+                double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+                textFont.SetPointSize(static_cast<int>(size));
+            }
+            wxCheckSetFont(dc, textFont);
+            bScript = true;
+        }
+        else if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SMALL_CAPITALS))
+        {
+            wxFont textFont = font;
+            textFont.SetPointSize((int) (textFont.GetPointSize()*0.75));
+            wxCheckSetFont(dc, textFont);
+            bScript = true;
+        }
+        else
+        {
+            wxCheckSetFont(dc, font);
+        }
+    }
+
+    bool haveDescent = false;
+    int startPos = range.GetStart() - GetRange().GetStart();
+    long len = range.GetLength();
+
+    wxString str(m_text);
+    wxString toReplace = wxRichTextLineBreakChar;
+    str.Replace(toReplace, wxT(" "));
+
+    wxString stringChunk = str.Mid(startPos, (size_t) len);
+
+    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & (wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS)))
+        stringChunk.MakeUpper();
+
+    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)
+        {
+            int absoluteWidth = 0;
+
+            // the string has a tab
+            // break up the string at the Tab
+            wxString stringFragment = stringChunk.BeforeFirst(wxT('\t'));
+            stringChunk = stringChunk.AfterFirst(wxT('\t'));
+
+            if (partialExtents)
+            {
+                int oldWidth;
+                if (partialExtents->GetCount() > 0)
+                    oldWidth = (*partialExtents)[partialExtents->GetCount()-1];
+                else
+                    oldWidth = 0;
+
+                // Add these partial extents
+                wxArrayInt p;
+                dc.GetPartialTextExtents(stringFragment, p);
+                size_t j;
+                for (j = 0; j < p.GetCount(); j++)
+                    partialExtents->Add(oldWidth + p[j]);
+
+                if (partialExtents->GetCount() > 0)
+                    absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + relativeX;
+                else
+                    absoluteWidth = relativeX;
+            }
+            else
+            {
+                dc.GetTextExtent(stringFragment, & w, & h);
+                width += w;
+                absoluteWidth = width + relativeX;
+                haveDescent = true;
+            }
+
+            bool notFound = true;
+            for (int i = 0; i < tabCount && notFound; ++i)
+            {
+                nextTabPos = tabArray.Item(i);
+
+                // Find the next tab position.
+                // Even if we're at the end of the tab array, we must still process the chunk.
+
+                if (nextTabPos > absoluteWidth || (i == (tabCount - 1)))
+                {
+                    if (nextTabPos <= absoluteWidth)
+                    {
+                        int defaultTabWidth = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, WIDTH_FOR_DEFAULT_TABS);
+                        nextTabPos = absoluteWidth + defaultTabWidth;
+                    }
+
+                    notFound = false;
+                    width = nextTabPos - relativeX;
+
+                    if (partialExtents)
+                        partialExtents->Add(width);
+                }
+            }
+        }
+    }
+
+    if (!stringChunk.IsEmpty())
+    {
+        if (partialExtents)
+        {
+            int oldWidth;
+            if (partialExtents->GetCount() > 0)
+                oldWidth = (*partialExtents)[partialExtents->GetCount()-1];
+            else
+                oldWidth = 0;
+
+            // Add these partial extents
+            wxArrayInt p;
+            dc.GetPartialTextExtents(stringChunk, p);
+            size_t j;
+            for (j = 0; j < p.GetCount(); j++)
+                partialExtents->Add(oldWidth + p[j]);
+        }
+        else
+        {
+            dc.GetTextExtent(stringChunk, & w, & h, & descent);
+            width += w;
+            haveDescent = true;
+        }
+    }
+
+    if (partialExtents)
+    {
+        int charHeight = dc.GetCharHeight();
+        if ((*partialExtents).GetCount() > 0)
+            w = (*partialExtents)[partialExtents->GetCount()-1];
+        else
+            w = 0;
+        size = wxSize(w, charHeight);
+    }
+    else
+    {
+        size = wxSize(width, dc.GetCharHeight());
+    }
+
+    if (!haveDescent)
+        dc.GetTextExtent(wxT("X"), & w, & h, & descent);
+
+    if ( bScript )
+        dc.SetFont(font);
+
+    return true;
+}
+
+/// Do a split, returning an object containing the second part, and setting
+/// the first part in 'this'.
+wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
+{
+    long index = pos - GetRange().GetStart();
+
+    if (index < 0 || index >= (int) m_text.length())
+        return NULL;
+
+    wxString firstPart = m_text.Mid(0, index);
+    wxString secondPart = m_text.Mid(index);
+
+    m_text = firstPart;
+
+    wxRichTextPlainText* newObject = new wxRichTextPlainText(secondPart);
+    newObject->SetAttributes(GetAttributes());
+    newObject->SetProperties(GetProperties());
+
+    newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
+    GetRange().SetEnd(pos-1);
+
+    return newObject;
+}
+
+/// Calculate range
+void wxRichTextPlainText::CalculateRange(long start, long& end)
+{
+    end = start + m_text.length() - 1;
+    m_range.SetRange(start, end);
+}
+
+/// Delete range
+bool wxRichTextPlainText::DeleteRange(const wxRichTextRange& range)
+{
+    wxRichTextRange r = range;
+
+    r.LimitTo(GetRange());
+
+    if (r.GetStart() == GetRange().GetStart() && r.GetEnd() == GetRange().GetEnd())
+    {
+        m_text.Empty();
+        return true;
+    }
+
+    long startIndex = r.GetStart() - GetRange().GetStart();
+    long len = r.GetLength();
+
+    m_text = m_text.Mid(0, startIndex) + m_text.Mid(startIndex+len);
+    return true;
+}
+
+/// Get text for the given range.
+wxString wxRichTextPlainText::GetTextForRange(const wxRichTextRange& range) const
+{
+    wxRichTextRange r = range;
+
+    r.LimitTo(GetRange());
+
+    long startIndex = r.GetStart() - GetRange().GetStart();
+    long len = r.GetLength();
+
+    return m_text.Mid(startIndex, len);
+}
+
+/// Returns true if this object can merge itself with the given one.
+bool wxRichTextPlainText::CanMerge(wxRichTextObject* object) const
+{
+    return object->GetClassInfo() == wxCLASSINFO(wxRichTextPlainText) &&
+        (m_text.empty() || (wxTextAttrEq(GetAttributes(), object->GetAttributes()) && m_properties == object->GetProperties()));
+}
+
+/// Returns true if this object merged itself with the given one.
+/// The calling code will then delete the given object.
+bool wxRichTextPlainText::Merge(wxRichTextObject* object)
+{
+    wxRichTextPlainText* textObject = wxDynamicCast(object, wxRichTextPlainText);
+    wxASSERT( textObject != NULL );
+
+    if (textObject)
+    {
+        m_text += textObject->GetText();
+        wxRichTextApplyStyle(m_attributes, textObject->GetAttributes());
+        return true;
+    }
+    else
+        return false;
+}
+
+/// Dump to output stream for debugging
+void wxRichTextPlainText::Dump(wxTextOutputStream& stream)
+{
+    wxRichTextObject::Dump(stream);
+    stream << m_text << wxT("\n");
+}
+
+/// Get the first position from pos that has a line break character.
+long wxRichTextPlainText::GetFirstLineBreakPosition(long pos)
+{
+    int i;
+    int len = m_text.length();
+    int startPos = pos - m_range.GetStart();
+    for (i = startPos; i < len; i++)
+    {
+        wxChar ch = m_text[i];
+        if (ch == wxRichTextLineBreakChar)
+        {
+            return i + m_range.GetStart();
+        }
+    }
+    return -1;
+}
+
+/*!
+ * wxRichTextBuffer
+ * This is a kind of box, used to represent the whole buffer
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
+
+wxList                      wxRichTextBuffer::sm_handlers;
+wxList                      wxRichTextBuffer::sm_drawingHandlers;
+wxRichTextFieldTypeHashMap  wxRichTextBuffer::sm_fieldTypes;
+wxRichTextRenderer*         wxRichTextBuffer::sm_renderer = NULL;
+int                         wxRichTextBuffer::sm_bulletRightMargin = 20;
+float                       wxRichTextBuffer::sm_bulletProportion = (float) 0.3;
+
+/// Initialisation
+void wxRichTextBuffer::Init()
+{
+    m_commandProcessor = new wxCommandProcessor;
+    m_styleSheet = NULL;
+    m_modified = false;
+    m_batchedCommandDepth = 0;
+    m_batchedCommand = NULL;
+    m_suppressUndo = 0;
+    m_handlerFlags = 0;
+    m_scale = 1.0;
+    m_dimensionScale = 1.0;
+    m_fontScale = 1.0;
+    SetMargins(4);
+}
+
+/// Initialisation
+wxRichTextBuffer::~wxRichTextBuffer()
+{
+    delete m_commandProcessor;
+    delete m_batchedCommand;
+
+    ClearStyleStack();
+    ClearEventHandlers();
+}
+
+void wxRichTextBuffer::ResetAndClearCommands()
+{
+    Reset();
+
+    GetCommandProcessor()->ClearCommands();
+
+    Modify(false);
+    Invalidate(wxRICHTEXT_ALL);
+}
+
+void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj)
+{
+    wxRichTextParagraphLayoutBox::Copy(obj);
+
+    m_styleSheet = obj.m_styleSheet;
+    m_modified = obj.m_modified;
+    m_batchedCommandDepth = 0;
+    if (m_batchedCommand)
+        delete m_batchedCommand;
+    m_batchedCommand = NULL;
+    m_suppressUndo = obj.m_suppressUndo;
+    m_invalidRange = obj.m_invalidRange;
+    m_dimensionScale = obj.m_dimensionScale;
+    m_fontScale = obj.m_fontScale;
+}
+
+/// 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)
+{
+    return ctrl->GetFocusObject()->InsertParagraphsWithUndo(this, pos, paragraphs, ctrl, flags);
+}
+
+/// Submit command to insert paragraphs
+bool wxRichTextParagraphLayoutBox::InsertParagraphsWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int WXUNUSED(flags))
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    action->GetNewParagraphs() = paragraphs;
+
+    action->SetPosition(pos);
+
+    wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetOwnRange().GetEnd() - 1);
+    if (!paragraphs.GetPartialParagraph())
+        range.SetEnd(range.GetEnd()+1);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(range);
+
+    buffer->SubmitAction(action);
+
+    return true;
+}
+
+/// Submit command to insert the given text
+bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
+{
+    return ctrl->GetFocusObject()->InsertTextWithUndo(this, pos, text, ctrl, flags);
+}
+
+/// Submit command to insert the given text
+bool wxRichTextParagraphLayoutBox::InsertTextWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        // Get appropriate paragraph style
+        paraAttr = GetStyleForNewParagraph(buffer, pos, false, false);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    action->GetNewParagraphs().AddParagraphs(text, p);
+
+    int length = action->GetNewParagraphs().GetOwnRange().GetLength();
+
+    if (!text.empty() && text.Last() != wxT('\n'))
+    {
+        // Don't count the newline when undoing
+        length --;
+        action->GetNewParagraphs().SetPartialParagraph(true);
+    }
+    else if (!text.empty() && text.Last() == wxT('\n'))
+        length --;
+
+    action->SetPosition(pos);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos, pos + length - 1));
+
+    buffer->SubmitAction(action);
+
+    return true;
+}
+
+/// Submit command to insert the given text
+bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags)
+{
+    return ctrl->GetFocusObject()->InsertNewlineWithUndo(this, pos, ctrl, flags);
+}
+
+/// Submit command to insert the given text
+bool wxRichTextParagraphLayoutBox::InsertNewlineWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextCtrl* ctrl, int flags)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(buffer, pos, false, true /* look for next paragraph style */);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    wxRichTextAttr attr(buffer->GetDefaultStyle());
+    // Don't include box attributes such as margins
+    attr.GetTextBoxAttr().Reset();
+
+    wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
+    action->GetNewParagraphs().AppendChild(newPara);
+    action->GetNewParagraphs().UpdateRanges();
+    action->GetNewParagraphs().SetPartialParagraph(false);
+    wxRichTextParagraph* para = GetParagraphAtPosition(pos, false);
+    long pos1 = pos;
+
+    if (p)
+        newPara->SetAttributes(*p);
+
+    if (flags & wxRICHTEXT_INSERT_INTERACTIVE)
+    {
+        if (para && para->GetRange().GetEnd() == pos)
+            pos1 ++;
+
+        // Now see if we need to number the paragraph.
+        if (newPara->GetAttributes().HasBulletNumber())
+        {
+            wxRichTextAttr numberingAttr;
+            if (FindNextParagraphNumber(para, numberingAttr))
+                wxRichTextApplyStyle(newPara->GetAttributes(), (const wxRichTextAttr&) numberingAttr);
+        }
+    }
+
+    action->SetPosition(pos);
+
+    // Use the default character style
+    if (!buffer->GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst())
+    {
+        // Check whether the default style merely reflects the paragraph/basic style,
+        // in which case don't apply it.
+        wxRichTextAttr defaultStyle(buffer->GetDefaultStyle());
+        defaultStyle.GetTextBoxAttr().Reset();
+        wxRichTextAttr toApply;
+        if (para)
+        {
+            wxRichTextAttr combinedAttr = para->GetCombinedAttributes(true /* include box attributes */);
+            wxRichTextAttr newAttr;
+            // This filters out attributes that are accounted for by the current
+            // paragraph/basic style
+            wxRichTextApplyStyle(toApply, defaultStyle, & combinedAttr);
+        }
+        else
+            toApply = defaultStyle;
+
+        if (!toApply.IsDefault())
+            newPara->GetChildren().GetFirst()->GetData()->SetAttributes(toApply);
+    }
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos1, pos1));
+
+    buffer->SubmitAction(action);
+
+    return true;
+}
+
+/// Submit command to insert the given image
+bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags,
+                                            const wxRichTextAttr& textAttr)
+{
+    return ctrl->GetFocusObject()->InsertImageWithUndo(this, pos, imageBlock, ctrl, flags, textAttr);
+}
+
+/// Submit command to insert the given image
+bool wxRichTextParagraphLayoutBox::InsertImageWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextImageBlock& imageBlock,
+                                                        wxRichTextCtrl* ctrl, int flags,
+                                                        const wxRichTextAttr& textAttr)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(buffer, pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+    // Don't include box attributes such as margins
+    attr.GetTextBoxAttr().Reset();
+
+    wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
+    if (p)
+        newPara->SetAttributes(*p);
+
+    wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
+    newPara->AppendChild(imageObject);
+    imageObject->SetAttributes(textAttr);
+    action->GetNewParagraphs().AppendChild(newPara);
+    action->GetNewParagraphs().UpdateRanges();
+
+    action->GetNewParagraphs().SetPartialParagraph(true);
+
+    action->SetPosition(pos);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos, pos));
+
+    buffer->SubmitAction(action);
+
+    return true;
+}
+
+// Insert an object with no change of it
+wxRichTextObject* wxRichTextBuffer::InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
+{
+    return ctrl->GetFocusObject()->InsertObjectWithUndo(this, pos, object, ctrl, flags);
+}
+
+// Insert an object with no change of it
+wxRichTextObject* wxRichTextParagraphLayoutBox::InsertObjectWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Object"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(buffer, pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+    // Don't include box attributes such as margins
+    attr.GetTextBoxAttr().Reset();
+
+    wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
+    if (p)
+        newPara->SetAttributes(*p);
+
+    newPara->AppendChild(object);
+    action->GetNewParagraphs().AppendChild(newPara);
+    action->GetNewParagraphs().UpdateRanges();
+
+    action->GetNewParagraphs().SetPartialParagraph(true);
+
+    action->SetPosition(pos);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos, pos));
+
+    buffer->SubmitAction(action);
+
+    wxRichTextObject* obj = GetLeafObjectAtPosition(pos);
+    return obj;
+}
+
+wxRichTextField* wxRichTextParagraphLayoutBox::InsertFieldWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& fieldType,
+                                                        const wxRichTextProperties& properties,
+                                                        wxRichTextCtrl* ctrl, int flags,
+                                                        const wxRichTextAttr& textAttr)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Field"), wxRICHTEXT_INSERT, buffer, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(buffer, pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    wxRichTextAttr attr(buffer->GetDefaultStyle());
+
+    // Don't include box attributes such as margins
+    attr.GetTextBoxAttr().Reset();
+
+    wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
+    if (p)
+        newPara->SetAttributes(*p);
+
+    wxRichTextField* fieldObject = new wxRichTextField();
+    fieldObject->wxRichTextObject::SetProperties(properties);
+    fieldObject->SetFieldType(fieldType);
+    fieldObject->SetAttributes(textAttr);
+    newPara->AppendChild(fieldObject);
+    action->GetNewParagraphs().AppendChild(newPara);
+    action->GetNewParagraphs().UpdateRanges();
+    action->GetNewParagraphs().SetPartialParagraph(true);
+    action->SetPosition(pos);
+
+    // Set the range we'll need to delete in Undo
+    action->SetRange(wxRichTextRange(pos, pos));
+
+    buffer->SubmitAction(action);
+
+    wxRichTextField* obj = wxDynamicCast(GetLeafObjectAtPosition(pos), wxRichTextField);
+    return obj;
+}
+
+/// 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 wxRichTextParagraphLayoutBox::GetStyleForNewParagraph(wxRichTextBuffer* buffer, long pos, bool caretPosition, bool lookUpNewParaStyle) const
+{
+    wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
+    if (para)
+    {
+        wxRichTextAttr attr;
+        bool foundAttributes = false;
+
+        // Look for a matching paragraph style
+        if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && buffer->GetStyleSheet())
+        {
+            wxRichTextParagraphStyleDefinition* paraDef = buffer->GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+            if (paraDef)
+            {
+                // If we're not at the end of the paragraph, then we apply THIS style, and not the designated next style.
+                if (para->GetRange().GetEnd() == pos && !paraDef->GetNextStyle().IsEmpty())
+                {
+                    wxRichTextParagraphStyleDefinition* nextParaDef = buffer->GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
+                    if (nextParaDef)
+                    {
+                        foundAttributes = true;
+                        attr = nextParaDef->GetStyleMergedWithBase(buffer->GetStyleSheet());
+                    }
+                }
+
+                // If we didn't find the 'next style', use this style instead.
+                if (!foundAttributes)
+                {
+                    foundAttributes = true;
+                    attr = paraDef->GetStyleMergedWithBase(buffer->GetStyleSheet());
+                }
+            }
+        }
+
+        // Also apply list style if present
+        if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && buffer->GetStyleSheet())
+        {
+            wxRichTextListStyleDefinition* listDef = buffer->GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName());
+            if (listDef)
+            {
+                int thisIndent = para->GetAttributes().GetLeftIndent();
+                int thisLevel = para->GetAttributes().HasOutlineLevel() ? para->GetAttributes().GetOutlineLevel() : listDef->FindLevelForIndent(thisIndent);
+
+                // Apply the overall list style, and item style for this level
+                wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, buffer->GetStyleSheet()));
+                wxRichTextApplyStyle(attr, listStyle);
+                attr.SetOutlineLevel(thisLevel);
+                if (para->GetAttributes().HasBulletNumber())
+                    attr.SetBulletNumber(para->GetAttributes().GetBulletNumber());
+            }
+        }
+
+        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);
+        }
+
+        return attr;
+    }
+    else
+        return wxRichTextAttr();
+}
+
+/// Submit command to delete this range
+bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl)
+{
+    return ctrl->GetFocusObject()->DeleteRangeWithUndo(range, ctrl, this);
+}
+
+/// Submit command to delete this range
+bool wxRichTextParagraphLayoutBox::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, buffer, this, ctrl);
+
+    action->SetPosition(ctrl->GetCaretPosition());
+
+    // Set the range to delete
+    action->SetRange(range);
+
+    // Copy the fragment that we'll need to restore in Undo
+    CopyFragment(range, action->GetOldParagraphs());
+
+    // See if we're deleting a paragraph marker, in which case we need to
+    // make a note not to copy the attributes from the 2nd paragraph to the 1st.
+    if (range.GetStart() == range.GetEnd())
+    {
+        wxRichTextParagraph* para = GetParagraphAtPosition(range.GetStart());
+        if (para && para->GetRange().GetEnd() == range.GetEnd())
+        {
+            wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetStart()+1);
+            if (nextPara && nextPara != para)
+            {
+                action->GetOldParagraphs().GetChildren().GetFirst()->GetData()->SetAttributes(nextPara->GetAttributes());
+                action->GetOldParagraphs().GetAttributes().SetFlags(action->GetOldParagraphs().GetAttributes().GetFlags() | wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE);
+            }
+        }
+    }
+
+    buffer->SubmitAction(action);
+
+    return true;
+}
+
+/// Collapse undo/redo commands
+bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName)
+{
+    if (m_batchedCommandDepth == 0)
+    {
+        wxASSERT(m_batchedCommand == NULL);
+        if (m_batchedCommand)
+        {
+            GetCommandProcessor()->Store(m_batchedCommand);
+        }
+        m_batchedCommand = new wxRichTextCommand(cmdName);
+    }
+
+    m_batchedCommandDepth ++;
+
+    return true;
+}
+
+/// Collapse undo/redo commands
+bool wxRichTextBuffer::EndBatchUndo()
+{
+    m_batchedCommandDepth --;
+
+    wxASSERT(m_batchedCommandDepth >= 0);
+    wxASSERT(m_batchedCommand != NULL);
+
+    if (m_batchedCommandDepth == 0)
+    {
+        GetCommandProcessor()->Store(m_batchedCommand);
+        m_batchedCommand = NULL;
+    }
+
+    return true;
+}
+
+/// Submit immediately, or delay according to whether collapsing is on
+bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
+{
+    if (action && !action->GetNewParagraphs().IsEmpty())
+        PrepareContent(action->GetNewParagraphs());
+
+    if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
+    {
+        wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
+        cmd->AddAction(action);
+        cmd->Do();
+        cmd->GetActions().Clear();
+        delete cmd;
+
+        m_batchedCommand->AddAction(action);
+    }
+    else
+    {
+        wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
+        cmd->AddAction(action);
+
+        // Only store it if we're not suppressing undo.
+        return GetCommandProcessor()->Submit(cmd, !SuppressingUndo());
+    }
+
+    return true;
+}
+
+/// Begin suppressing undo/redo commands.
+bool wxRichTextBuffer::BeginSuppressUndo()
+{
+    m_suppressUndo ++;
+
+    return true;
+}
+
+/// End suppressing undo/redo commands.
+bool wxRichTextBuffer::EndSuppressUndo()
+{
+    m_suppressUndo --;
+
+    return true;
+}
+
+/// Begin using a style
+bool wxRichTextBuffer::BeginStyle(const wxRichTextAttr& style)
+{
+    wxRichTextAttr newStyle(GetDefaultStyle());
+    newStyle.GetTextBoxAttr().Reset();
+
+    // Save the old default style
+    m_attributeStack.Append((wxObject*) new wxRichTextAttr(newStyle));
+
+    wxRichTextApplyStyle(newStyle, style);
+    newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
+
+    SetDefaultStyle(newStyle);
+
+    return true;
+}
+
+/// End the style
+bool wxRichTextBuffer::EndStyle()
+{
+    if (!m_attributeStack.GetFirst())
+    {
+        wxLogDebug(_("Too many EndStyle calls!"));
+        return false;
+    }
+
+    wxList::compatibility_iterator node = m_attributeStack.GetLast();
+    wxRichTextAttr* attr = (wxRichTextAttr*)node->GetData();
+    m_attributeStack.Erase(node);
+
+    SetDefaultStyle(*attr);
+
+    delete attr;
+    return true;
+}
+
+/// End all styles
+bool wxRichTextBuffer::EndAllStyles()
+{
+    while (m_attributeStack.GetCount() != 0)
+        EndStyle();
+    return true;
+}
+
+/// Clear the style stack
+void wxRichTextBuffer::ClearStyleStack()
+{
+    for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())
+        delete (wxRichTextAttr*) node->GetData();
+    m_attributeStack.Clear();
+}
+
+/// Begin using bold
+bool wxRichTextBuffer::BeginBold()
+{
+    wxRichTextAttr attr;
+    attr.SetFontWeight(wxFONTWEIGHT_BOLD);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using italic
+bool wxRichTextBuffer::BeginItalic()
+{
+    wxRichTextAttr attr;
+    attr.SetFontStyle(wxFONTSTYLE_ITALIC);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using underline
+bool wxRichTextBuffer::BeginUnderline()
+{
+    wxRichTextAttr attr;
+    attr.SetFontUnderlined(true);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using point size
+bool wxRichTextBuffer::BeginFontSize(int pointSize)
+{
+    wxRichTextAttr attr;
+    attr.SetFontSize(pointSize);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using this font
+bool wxRichTextBuffer::BeginFont(const wxFont& font)
+{
+    wxRichTextAttr attr;
+    attr.SetFont(font);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using this colour
+bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
+    attr.SetTextColour(colour);
+
+    return BeginStyle(attr);
+}
+
+/// Begin using alignment
+bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
+    attr.SetAlignment(alignment);
+
+    return BeginStyle(attr);
+}
+
+/// Begin left indent
+bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+
+    return BeginStyle(attr);
+}
+
+/// Begin right indent
+bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
+    attr.SetRightIndent(rightIndent);
+
+    return BeginStyle(attr);
+}
+
+/// Begin paragraph spacing
+bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after)
+{
+    long flags = 0;
+    if (before != 0)
+        flags |= wxTEXT_ATTR_PARA_SPACING_BEFORE;
+    if (after != 0)
+        flags |= wxTEXT_ATTR_PARA_SPACING_AFTER;
+
+    wxRichTextAttr attr;
+    attr.SetFlags(flags);
+    attr.SetParagraphSpacingBefore(before);
+    attr.SetParagraphSpacingAfter(after);
+
+    return BeginStyle(attr);
+}
+
+/// Begin line spacing
+bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
+    attr.SetLineSpacing(lineSpacing);
+
+    return BeginStyle(attr);
+}
+
+/// Begin numbered bullet
+bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetBulletStyle(bulletStyle);
+    attr.SetBulletNumber(bulletNumber);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+
+    return BeginStyle(attr);
+}
+
+/// Begin symbol bullet
+bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetBulletStyle(bulletStyle);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+    attr.SetBulletText(symbol);
+
+    return BeginStyle(attr);
+}
+
+/// Begin standard bullet
+bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetBulletStyle(bulletStyle);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+    attr.SetBulletName(bulletName);
+
+    return BeginStyle(attr);
+}
+
+/// Begin named character style
+bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
+        if (def)
+        {
+            wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());
+            return BeginStyle(attr);
+        }
+    }
+    return false;
+}
+
+/// Begin named paragraph style
+bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle);
+        if (def)
+        {
+            wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());
+            return BeginStyle(attr);
+        }
+    }
+    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)
+        {
+            wxRichTextAttr attr(def->GetCombinedStyleForLevel(level));
+
+            attr.SetBulletNumber(number);
+
+            return BeginStyle(attr);
+        }
+    }
+    return false;
+}
+
+/// Begin URL
+bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
+{
+    wxRichTextAttr attr;
+
+    if (!characterStyle.IsEmpty() && GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
+        if (def)
+        {
+            attr = def->GetStyleMergedWithBase(GetStyleSheet());
+        }
+    }
+    attr.SetURL(url);
+
+    return BeginStyle(attr);
+}
+
+/// Adds a handler to the end
+void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler)
+{
+    sm_handlers.Append(handler);
+}
+
+/// Inserts a handler at the front
+void wxRichTextBuffer::InsertHandler(wxRichTextFileHandler *handler)
+{
+    sm_handlers.Insert( handler );
+}
+
+/// Removes a handler
+bool wxRichTextBuffer::RemoveHandler(const wxString& name)
+{
+    wxRichTextFileHandler *handler = FindHandler(name);
+    if (handler)
+    {
+        sm_handlers.DeleteObject(handler);
+        delete handler;
+        return true;
+    }
+    else
+        return false;
+}
+
+/// Finds a handler by filename or, if supplied, type
+wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename,
+                                                                   wxRichTextFileType imageType)
+{
+    if (imageType != wxRICHTEXT_TYPE_ANY)
+        return FindHandler(imageType);
+    else if (!filename.IsEmpty())
+    {
+        wxString path, file, ext;
+        wxFileName::SplitPath(filename, & path, & file, & ext);
+        return FindHandler(ext, imageType);
+    }
+    else
+        return NULL;
+}
+
+
+/// Finds a handler by name
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxRichTextFileHandler *handler = (wxRichTextFileHandler*)node->GetData();
+        if (handler->GetName().Lower() == name.Lower()) return handler;
+
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+/// Finds a handler by extension and type
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxRichTextFileHandler *handler = (wxRichTextFileHandler*)node->GetData();
+        if ( handler->GetExtension().Lower() == extension.Lower() &&
+            (type == wxRICHTEXT_TYPE_ANY || handler->GetType() == type) )
+            return handler;
+        node = node->GetNext();
+    }
+    return 0;
+}
+
+/// Finds a handler by type
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxRichTextFileHandler *handler = (wxRichTextFileHandler *)node->GetData();
+        if (handler->GetType() == type) return handler;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+void wxRichTextBuffer::InitStandardHandlers()
+{
+    if (!FindHandler(wxRICHTEXT_TYPE_TEXT))
+        AddHandler(new wxRichTextPlainTextHandler);
+}
+
+void wxRichTextBuffer::CleanUpHandlers()
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxRichTextFileHandler* handler = (wxRichTextFileHandler*)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete handler;
+        node = next;
+    }
+
+    sm_handlers.Clear();
+}
+
+wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* types)
+{
+    if (types)
+        types->Clear();
+
+    wxString wildcard;
+
+    wxList::compatibility_iterator node = GetHandlers().GetFirst();
+    int count = 0;
+    while (node)
+    {
+        wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
+        if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad())))
+        {
+            if (combine)
+            {
+                if (count > 0)
+                    wildcard += wxT(";");
+                wildcard += wxT("*.") + handler->GetExtension();
+            }
+            else
+            {
+                if (count > 0)
+                    wildcard += wxT("|");
+                wildcard += handler->GetName();
+                wildcard += wxT(" ");
+                wildcard += _("files");
+                wildcard += wxT(" (*.");
+                wildcard += handler->GetExtension();
+                wildcard += wxT(")|*.");
+                wildcard += handler->GetExtension();
+                if (types)
+                    types->Add(handler->GetType());
+            }
+            count ++;
+        }
+
+        node = node->GetNext();
+    }
+
+    if (combine)
+        wildcard = wxT("(") + wildcard + wxT(")|") + wildcard;
+    return wildcard;
+}
+
+/// Load a file
+bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type)
+{
+    wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
+    if (handler)
+    {
+        SetDefaultStyle(wxRichTextAttr());
+        handler->SetFlags(GetHandlerFlags());
+        bool success = handler->LoadFile(this, filename);
+        Invalidate(wxRICHTEXT_ALL);
+        return success;
+    }
+    else
+        return false;
+}
+
+/// Save a file
+bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type)
+{
+    wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
+    if (handler)
+    {
+        handler->SetFlags(GetHandlerFlags());
+        return handler->SaveFile(this, filename);
+    }
+    else
+        return false;
+}
+
+/// Load from a stream
+bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type)
+{
+    wxRichTextFileHandler* handler = FindHandler(type);
+    if (handler)
+    {
+        SetDefaultStyle(wxRichTextAttr());
+        handler->SetFlags(GetHandlerFlags());
+        bool success = handler->LoadFile(this, stream);
+        Invalidate(wxRICHTEXT_ALL);
+        return success;
+    }
+    else
+        return false;
+}
+
+/// Save to a stream
+bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type)
+{
+    wxRichTextFileHandler* handler = FindHandler(type);
+    if (handler)
+    {
+        handler->SetFlags(GetHandlerFlags());
+        return handler->SaveFile(this, stream);
+    }
+    else
+        return false;
+}
+
+/// Copy the range to the clipboard
+bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
+{
+    bool success = false;
+    wxRichTextParagraphLayoutBox* container = this;
+    if (GetRichTextCtrl())
+        container = GetRichTextCtrl()->GetFocusObject();
+
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+
+    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
+    {
+        wxTheClipboard->Clear();
+
+        // Add composite object
+
+        wxDataObjectComposite* compositeObject = new wxDataObjectComposite();
+
+        {
+            wxString text = container->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;
+            container->CopyFragment(range, *richTextBuf);
+
+            compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */);
+        }
+
+        if (wxTheClipboard->SetData(compositeObject))
+            success = true;
+
+        wxTheClipboard->Close();
+    }
+
+#else
+    wxUnusedVar(range);
+#endif
+    return success;
+}
+
+/// Paste the clipboard content to the buffer
+bool wxRichTextBuffer::PasteFromClipboard(long position)
+{
+    bool success = false;
+    wxRichTextParagraphLayoutBox* container = this;
+    if (GetRichTextCtrl())
+        container = GetRichTextCtrl()->GetFocusObject();
+
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+    if (CanPasteFromClipboard())
+    {
+        if (wxTheClipboard->Open())
+        {
+            if (wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())))
+            {
+                wxRichTextBufferDataObject data;
+                wxTheClipboard->GetData(data);
+                wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
+                if (richTextBuffer)
+                {
+                    container->InsertParagraphsWithUndo(this, position+1, *richTextBuffer, GetRichTextCtrl(), 0);
+                    if (GetRichTextCtrl())
+                        GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetOwnRange().GetEnd());
+                    delete richTextBuffer;
+                }
+            }
+            else if (wxTheClipboard->IsSupported(wxDF_TEXT)
+ #if wxUSE_UNICODE
+                     || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+ #endif
+                    )
+            {
+                wxTextDataObject data;
+                wxTheClipboard->GetData(data);
+                wxString text(data.GetText());
+#ifdef __WXMSW__
+                wxString text2;
+                text2.Alloc(text.Length()+1);
+                size_t i;
+                for (i = 0; i < text.Length(); i++)
+                {
+                    wxChar ch = text[i];
+                    if (ch != wxT('\r'))
+                        text2 += ch;
+                }
+#else
+                wxString text2 = text;
+#endif
+                container->InsertTextWithUndo(this, position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+
+                if (GetRichTextCtrl())
+                    GetRichTextCtrl()->ShowPosition(position + text2.Length());
+
+                success = true;
+            }
+            else if (wxTheClipboard->IsSupported(wxDF_BITMAP))
+            {
+                wxBitmapDataObject data;
+                wxTheClipboard->GetData(data);
+                wxBitmap bitmap(data.GetBitmap());
+                wxImage image(bitmap.ConvertToImage());
+
+                wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, container, GetRichTextCtrl(), false);
+
+                action->GetNewParagraphs().AddImage(image);
+
+                if (action->GetNewParagraphs().GetChildCount() == 1)
+                    action->GetNewParagraphs().SetPartialParagraph(true);
+
+                action->SetPosition(position+1);
+
+                // Set the range we'll need to delete in Undo
+                action->SetRange(wxRichTextRange(position+1, position+1));
+
+                SubmitAction(action);
+
+                success = true;
+            }
+            wxTheClipboard->Close();
+        }
+    }
+#else
+    wxUnusedVar(position);
+#endif
+    return success;
+}
+
+/// Can we paste from the clipboard?
+bool wxRichTextBuffer::CanPasteFromClipboard() const
+{
+    bool canPaste = false;
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
+    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
+    {
+        if (wxTheClipboard->IsSupported(wxDF_TEXT)
+#if wxUSE_UNICODE
+            || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+#endif
+            || wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) ||
+            wxTheClipboard->IsSupported(wxDF_BITMAP))
+        {
+            canPaste = true;
+        }
+        wxTheClipboard->Close();
+    }
+#endif
+    return canPaste;
+}
+
+/// 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 winid = wxID_ANY;
+    if (GetRichTextCtrl())
+        winid = GetRichTextCtrl()->GetId();
+
+    wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, winid);
+    event.SetEventObject(GetRichTextCtrl());
+    event.SetContainer(GetRichTextCtrl()->GetFocusObject());
+    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;
+}
+
+/// Hit-testing: returns a flag indicating hit test details, plus
+/// information about position
+int wxRichTextBuffer::HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags)
+{
+    int ret = wxRichTextParagraphLayoutBox::HitTest(dc, context, pt, textPosition, obj, contextObj, flags);
+    if (ret != wxRICHTEXT_HITTEST_NONE)
+    {
+        return ret;
+    }
+    else
+    {
+        textPosition = m_ownRange.GetEnd()-1;
+        *obj = this;
+        *contextObj = this;
+        return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
+    }
+}
+
+void wxRichTextBuffer::SetFontScale(double fontScale)
+{
+    m_fontScale = fontScale;
+    m_fontTable.SetFontScale(fontScale);
+}
+
+void wxRichTextBuffer::SetDimensionScale(double dimScale)
+{
+    m_dimensionScale = dimScale;
+}
+
+bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect)
+{
+    if (bulletAttr.GetTextColour().IsOk())
+    {
+        wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour()));
+        wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour()));
+    }
+    else
+    {
+        wxCheckSetPen(dc, *wxBLACK_PEN);
+        wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+    }
+
+    wxFont font;
+    if (bulletAttr.HasFont())
+    {
+        font = paragraph->GetBuffer()->GetFontTable().FindFont(bulletAttr);
+    }
+    else
+        font = (*wxNORMAL_FONT);
+
+    wxCheckSetFont(dc, 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 if (bulletAttr.GetBulletName() == wxT("standard/circle-outline"))
+    {
+        wxCheckSetBrush(dc, *wxTRANSPARENT_BRUSH);
+        dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
+    }
+    else // "standard/circle", and catch-all
+    {
+        dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
+    }
+
+    return true;
+}
+
+bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text)
+{
+    if (!text.empty())
+    {
+        wxFont font;
+        if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont())
+        {
+            wxRichTextAttr fontAttr;
+            if (attr.HasFontPixelSize())
+                fontAttr.SetFontPixelSize(attr.GetFontSize());
+            else
+                fontAttr.SetFontPointSize(attr.GetFontSize());
+            fontAttr.SetFontStyle(attr.GetFontStyle());
+            fontAttr.SetFontWeight(attr.GetFontWeight());
+            fontAttr.SetFontUnderlined(attr.GetFontUnderlined());
+            fontAttr.SetFontFaceName(attr.GetBulletFont());
+            font = paragraph->GetBuffer()->GetFontTable().FindFont(fontAttr);
+        }
+        else if (attr.HasFont())
+            font = paragraph->GetBuffer()->GetFontTable().FindFont(attr);
+        else
+            font = (*wxNORMAL_FONT);
+
+        wxCheckSetFont(dc, font);
+
+        if (attr.GetTextColour().IsOk())
+            dc.SetTextForeground(attr.GetTextColour());
+
+        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+
+        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 wxRichTextAttr& 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)
+{
+    bulletNames.Add(wxTRANSLATE("standard/circle"));
+    bulletNames.Add(wxTRANSLATE("standard/circle-outline"));
+    bulletNames.Add(wxTRANSLATE("standard/square"));
+    bulletNames.Add(wxTRANSLATE("standard/diamond"));
+    bulletNames.Add(wxTRANSLATE("standard/triangle"));
+
+    return true;
+}
+
+/*!
+ * wxRichTextBox
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextParagraphLayoutBox)
+
+wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
+    wxRichTextParagraphLayoutBox(parent)
+{
+}
+
+/// Draw the item
+bool wxRichTextBox::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+    if (!IsShown())
+        return true;
+
+    // TODO: if the active object in the control, draw an indication.
+    // We need to add the concept of active object, and not just focus object,
+    // so we can apply commands (properties, delete, ...) to objects such as text boxes and images.
+    // Ultimately we would like to be able to interactively resize an active object
+    // using drag handles.
+    return wxRichTextParagraphLayoutBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+/// Copy
+void wxRichTextBox::Copy(const wxRichTextBox& obj)
+{
+    wxRichTextParagraphLayoutBox::Copy(obj);
+}
+
+// Edit properties via a GUI
+bool wxRichTextBox::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+    wxRichTextObjectPropertiesDialog boxDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Box Properties"));
+    boxDlg.SetAttributes(GetAttributes());
+
+    if (boxDlg.ShowModal() == wxID_OK)
+    {
+        // By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
+        // indeterminate in the object.
+        boxDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+        return true;
+    }
+    else
+        return false;
+}
+
+/*!
+ * wxRichTextField
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextField, wxRichTextParagraphLayoutBox)
+
+wxRichTextField::wxRichTextField(const wxString& fieldType, wxRichTextObject* parent):
+    wxRichTextParagraphLayoutBox(parent)
+{
+    SetFieldType(fieldType);
+}
+
+/// Draw the item
+bool wxRichTextField::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+    if (!IsShown())
+        return true;
+
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType && fieldType->Draw(this, dc, context, range, selection, rect, descent, style))
+        return true;
+
+    // Fallback; but don't draw guidelines.
+    style &= ~wxRICHTEXT_DRAW_GUIDELINES;
+    return wxRichTextParagraphLayoutBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+bool wxRichTextField::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style)
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType && fieldType->Layout(this, dc, context, rect, parentRect, style))
+        return true;
+
+    // Fallback
+    return wxRichTextParagraphLayoutBox::Layout(dc, context, rect, parentRect, style);
+}
+
+bool wxRichTextField::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->GetRangeSize((wxRichTextField*) this, range, size, descent, dc, context, flags, position, partialExtents);
+
+    return wxRichTextParagraphLayoutBox::GetRangeSize(range, size, descent, dc, context, flags, position, partialExtents);
+}
+
+/// Calculate range
+void wxRichTextField::CalculateRange(long start, long& end)
+{
+    if (IsTopLevel())
+        wxRichTextParagraphLayoutBox::CalculateRange(start, end);
+    else
+        wxRichTextObject::CalculateRange(start, end);
+}
+
+/// Copy
+void wxRichTextField::Copy(const wxRichTextField& obj)
+{
+    wxRichTextParagraphLayoutBox::Copy(obj);
+
+    UpdateField(GetBuffer());
+}
+
+// Edit properties via a GUI
+bool wxRichTextField::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->EditProperties(this, parent, buffer);
+
+    return false;
+}
+
+bool wxRichTextField::CanEditProperties() const
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->CanEditProperties((wxRichTextField*) this);
+
+    return false;
+}
+
+wxString wxRichTextField::GetPropertiesMenuLabel() const
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->GetPropertiesMenuLabel((wxRichTextField*) this);
+
+    return wxEmptyString;
+}
+
+bool wxRichTextField::UpdateField(wxRichTextBuffer* buffer)
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->UpdateField(buffer, (wxRichTextField*) this);
+
+    return false;
+}
+
+bool wxRichTextField::IsTopLevel() const
+{
+    wxRichTextFieldType* fieldType = wxRichTextBuffer::FindFieldType(GetFieldType());
+    if (fieldType)
+        return fieldType->IsTopLevel((wxRichTextField*) this);
+
+    return true;
+}
+
+IMPLEMENT_CLASS(wxRichTextFieldType, wxObject)
+
+IMPLEMENT_CLASS(wxRichTextFieldTypeStandard, wxRichTextFieldType)
+
+wxRichTextFieldTypeStandard::wxRichTextFieldTypeStandard(const wxString& name, const wxString& label, int displayStyle)
+{
+    Init();
+
+    SetName(name);
+    SetLabel(label);
+    SetDisplayStyle(displayStyle);
+}
+
+wxRichTextFieldTypeStandard::wxRichTextFieldTypeStandard(const wxString& name, const wxBitmap& bitmap, int displayStyle)
+{
+    Init();
+
+    SetName(name);
+    SetBitmap(bitmap);
+    SetDisplayStyle(displayStyle);
+}
+
+void wxRichTextFieldTypeStandard::Init()
+{
+    m_displayStyle = wxRICHTEXT_FIELD_STYLE_RECTANGLE;
+    m_font = wxFont(6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+    m_textColour = *wxWHITE;
+    m_borderColour = *wxBLACK;
+    m_backgroundColour = *wxBLACK;
+    m_verticalPadding = 1;
+    m_horizontalPadding = 3;
+    m_horizontalMargin = 2;
+    m_verticalMargin = 0;
+}
+
+void wxRichTextFieldTypeStandard::Copy(const wxRichTextFieldTypeStandard& field)
+{
+    wxRichTextFieldType::Copy(field);
+
+    m_label = field.m_label;
+    m_displayStyle = field.m_displayStyle;
+    m_font = field.m_font;
+    m_textColour = field.m_textColour;
+    m_borderColour = field.m_borderColour;
+    m_backgroundColour = field.m_backgroundColour;
+    m_verticalPadding = field.m_verticalPadding;
+    m_horizontalPadding = field.m_horizontalPadding;
+    m_horizontalMargin = field.m_horizontalMargin;
+    m_bitmap = field.m_bitmap;
+}
+
+bool wxRichTextFieldTypeStandard::Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& WXUNUSED(context), const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int descent, int WXUNUSED(style))
+{
+    if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_COMPOSITE)
+        return false; // USe default composite drawing
+    else // if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_RECTANGLE || m_displayStyle == wxRICHTEXT_FIELD_STYLE_NOBORDER)
+    {
+        int borderSize = 1;
+
+        wxPen borderPen(m_borderColour, 1, wxSOLID);
+        wxBrush backgroundBrush(m_backgroundColour);
+        wxColour textColour(m_textColour);
+
+        if (selection.WithinSelection(obj->GetRange().GetStart(), obj))
+        {
+            wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+            wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+
+            borderPen = wxPen(highlightTextColour, 1, wxSOLID);
+            backgroundBrush = wxBrush(highlightColour);
+
+            wxCheckSetBrush(dc, backgroundBrush);
+            wxCheckSetPen(dc, wxPen(highlightColour, 1, wxSOLID));
+            dc.DrawRectangle(rect);
+        }
+
+        if (m_displayStyle != wxRICHTEXT_FIELD_STYLE_NO_BORDER)
+            borderSize = 0;
+
+        // objectRect is the area where the content is drawn, after margins around it have been taken into account
+        wxRect objectRect = wxRect(wxPoint(rect.x + m_horizontalMargin, rect.y + wxMax(0, rect.height - descent - obj->GetCachedSize().y)),
+            wxSize(obj->GetCachedSize().x - 2*m_horizontalMargin - borderSize, obj->GetCachedSize().y));
+
+        // clientArea is where the text is actually written
+        wxRect clientArea = objectRect;
+
+        if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_RECTANGLE)
+        {
+            dc.SetPen(borderPen);
+            dc.SetBrush(backgroundBrush);
+            dc.DrawRoundedRectangle(objectRect, 4.0);
+        }
+        else if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_START_TAG)
+        {
+            int arrowLength = objectRect.height/2;
+            clientArea.width -= (arrowLength - m_horizontalPadding);
+
+            wxPoint pts[5];
+            pts[0].x = objectRect.x; pts[0].y = objectRect.y;
+            pts[1].x = objectRect.x + objectRect.width - arrowLength; pts[1].y = objectRect.y;
+            pts[2].x = objectRect.x + objectRect.width; pts[2].y = objectRect.y + (objectRect.height/2);
+            pts[3].x = objectRect.x + objectRect.width - arrowLength; pts[3].y = objectRect.y + objectRect.height;
+            pts[4].x = objectRect.x; pts[4].y = objectRect.y + objectRect.height;
+            dc.SetPen(borderPen);
+            dc.SetBrush(backgroundBrush);
+            dc.DrawPolygon(5, pts);
+        }
+        else if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_END_TAG)
+        {
+            int arrowLength = objectRect.height/2;
+            clientArea.width -= (arrowLength - m_horizontalPadding);
+            clientArea.x += (arrowLength - m_horizontalPadding);
+
+            wxPoint pts[5];
+            pts[0].x = objectRect.x + objectRect.width; pts[0].y = objectRect.y;
+            pts[1].x = objectRect.x + arrowLength; pts[1].y = objectRect.y;
+            pts[2].x = objectRect.x; pts[2].y = objectRect.y + (objectRect.height/2);
+            pts[3].x = objectRect.x + arrowLength; pts[3].y = objectRect.y + objectRect.height;
+            pts[4].x = objectRect.x + objectRect.width; pts[4].y = objectRect.y + objectRect.height;
+            dc.SetPen(borderPen);
+            dc.SetBrush(backgroundBrush);
+            dc.DrawPolygon(5, pts);
+        }
+
+        if (m_bitmap.IsOk())
+        {
+            int x = clientArea.x + (clientArea.width - m_bitmap.GetWidth())/2;
+            int y = clientArea.y + m_verticalPadding;
+            dc.DrawBitmap(m_bitmap, x, y, true);
+
+            if (selection.WithinSelection(obj->GetRange().GetStart(), obj))
+            {
+                wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+                wxCheckSetPen(dc, *wxBLACK_PEN);
+                dc.SetLogicalFunction(wxINVERT);
+                dc.DrawRectangle(wxRect(x, y, m_bitmap.GetWidth(), m_bitmap.GetHeight()));
+                dc.SetLogicalFunction(wxCOPY);
+            }
+        }
+        else
+        {
+            wxString label(m_label);
+            if (label.IsEmpty())
+                label = wxT("??");
+            int w, h, maxDescent;
+            dc.SetFont(m_font);
+            dc.GetTextExtent(m_label, & w, &h, & maxDescent);
+            dc.SetTextForeground(textColour);
+
+            int x = clientArea.x + (clientArea.width - w)/2;
+            int y = clientArea.y + (clientArea.height - (h - maxDescent))/2;
+            dc.DrawText(m_label, x, y);
+        }
+    }
+
+    return true;
+}
+
+bool wxRichTextFieldTypeStandard::Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& WXUNUSED(rect), const wxRect& WXUNUSED(parentRect), int style)
+{
+    if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_COMPOSITE)
+        return false; // USe default composite layout
+
+    wxSize size = GetSize(obj, dc, context, style);
+    obj->SetCachedSize(size);
+    obj->SetMinSize(size);
+    obj->SetMaxSize(size);
+    return true;
+}
+
+bool wxRichTextFieldTypeStandard::GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+    if (IsTopLevel(obj))
+        return obj->wxRichTextParagraphLayoutBox::GetRangeSize(range, size, descent, dc, context, flags, position);
+    else
+    {
+        wxSize sz = GetSize(obj, dc, context, 0);
+        if (partialExtents)
+        {
+            int lastSize;
+            if (partialExtents->GetCount() > 0)
+                lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+            else
+                lastSize = 0;
+            partialExtents->Add(lastSize + sz.x);
+        }
+        size = sz;
+       return true;
+    }
+}
+
+wxSize wxRichTextFieldTypeStandard::GetSize(wxRichTextField* WXUNUSED(obj), wxDC& dc, wxRichTextDrawingContext& WXUNUSED(context), int WXUNUSED(style)) const
+{
+    int borderSize = 1;
+    int w = 0, h = 0, maxDescent = 0;
+
+    wxSize sz;
+    if (m_bitmap.IsOk())
+    {
+        w = m_bitmap.GetWidth();
+        h = m_bitmap.GetHeight();
+
+        sz = wxSize(w + m_horizontalMargin*2, h + m_verticalMargin*2);
+    }
+    else
+    {
+        wxString label(m_label);
+        if (label.IsEmpty())
+            label = wxT("??");
+        dc.SetFont(m_font);
+        dc.GetTextExtent(label, & w, &h, & maxDescent);
+
+        sz = wxSize(w + m_horizontalPadding*2 + m_horizontalMargin*2, h + m_verticalPadding *2 + m_verticalMargin*2);
+    }
+
+    if (m_displayStyle != wxRICHTEXT_FIELD_STYLE_NO_BORDER)
+    {
+        sz.x += borderSize*2;
+        sz.y += borderSize*2;
+    }
+
+    if (m_displayStyle == wxRICHTEXT_FIELD_STYLE_START_TAG || m_displayStyle == wxRICHTEXT_FIELD_STYLE_END_TAG)
+    {
+        // Add space for the arrow
+        sz.x += (sz.y/2 - m_horizontalPadding);
+    }
+
+    return sz;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextCell, wxRichTextBox)
+
+wxRichTextCell::wxRichTextCell(wxRichTextObject* parent):
+    wxRichTextBox(parent)
+{
+}
+
+/// Draw the item
+bool wxRichTextCell::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+    return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+/// Copy
+void wxRichTextCell::Copy(const wxRichTextCell& obj)
+{
+    wxRichTextBox::Copy(obj);
+}
+
+// Edit properties via a GUI
+bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+    // We need to gather common attributes for all selected cells.
+
+    wxRichTextTable* table = wxDynamicCast(GetParent(), wxRichTextTable);
+    bool multipleCells = false;
+    wxRichTextAttr attr;
+
+    if (table && buffer && buffer->GetRichTextCtrl() && buffer->GetRichTextCtrl()->GetSelection().IsValid() &&
+        buffer->GetRichTextCtrl()->GetSelection().GetContainer() == GetParent())
+    {
+        wxRichTextAttr clashingAttr, absentAttr;
+        const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection();
+        size_t i;
+        int selectedCellCount = 0;
+        for (i = 0; i < sel.GetCount(); i++)
+        {
+            const wxRichTextRange& range = sel[i];
+            wxRichTextCell* cell = table->GetCell(range.GetStart());
+            if (cell)
+            {
+                wxRichTextAttr cellStyle = cell->GetAttributes();
+
+                CollectStyle(attr, cellStyle, clashingAttr, absentAttr);
+
+                selectedCellCount ++;
+            }
+        }
+        multipleCells = selectedCellCount > 1;
+    }
+    else
+    {
+        attr = GetAttributes();
+    }
+
+    wxString caption;
+    if (multipleCells)
+        caption = _("Multiple Cell Properties");
+    else
+        caption = _("Cell Properties");
+
+    wxRichTextObjectPropertiesDialog cellDlg(this, wxGetTopLevelParent(parent), wxID_ANY, caption);
+    cellDlg.SetAttributes(attr);
+
+    wxRichTextSizePage* sizePage = wxDynamicCast(cellDlg.FindPage(wxCLASSINFO(wxRichTextSizePage)), wxRichTextSizePage);
+    if (sizePage)
+    {
+        // We don't want position and floating controls for a cell.
+        sizePage->ShowPositionControls(false);
+        sizePage->ShowFloatingControls(false);
+    }
+
+    if (cellDlg.ShowModal() == wxID_OK)
+    {
+        if (multipleCells)
+        {
+            const wxRichTextSelection& sel = buffer->GetRichTextCtrl()->GetSelection();
+            // Apply the style; we interpret indeterminate attributes as 'don't touch this attribute'
+            // since it may represent clashing attributes across multiple objects.
+            table->SetCellStyle(sel, attr);
+        }
+        else
+            // For a single object, indeterminate attributes set by the user should be reflected in the
+            // actual object style, so pass the wxRICHTEXT_SETSTYLE_RESET flag to assign
+            // the style directly instead of applying (which ignores indeterminate attributes,
+            // leaving them as they were).
+            cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+        return true;
+    }
+    else
+        return false;
+}
+
+WX_DEFINE_OBJARRAY(wxRichTextObjectPtrArrayArray)
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextTable, wxRichTextBox)
+
+wxRichTextTable::wxRichTextTable(wxRichTextObject* parent): wxRichTextBox(parent)
+{
+    m_rowCount = 0;
+    m_colCount = 0;
+}
+
+// Draws the object.
+bool wxRichTextTable::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style)
+{
+    return wxRichTextBox::Draw(dc, context, range, selection, rect, descent, style);
+}
+
+WX_DECLARE_OBJARRAY(wxRect, wxRichTextRectArray);
+WX_DEFINE_OBJARRAY(wxRichTextRectArray);
+
+// Lays the object out. rect is the space available for layout. Often it will
+// be the specified overall space for this object, if trying to constrain
+// layout to a particular size, or it could be the total space available in the
+// parent. rect is the overall size, so we must subtract margins and padding.
+// to get the actual available space.
+bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& WXUNUSED(parentRect), int style)
+{
+    SetPosition(rect.GetPosition());
+
+    // TODO: the meaty bit. Calculate sizes of all cells and rows. Try to use
+    // minimum size if within alloted size, then divide up remaining size
+    // between rows/cols.
+
+    double scale = 1.0;
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer) scale = buffer->GetScale();
+
+    wxRect availableSpace = GetAvailableContentArea(dc, context, rect);
+    wxTextAttrDimensionConverter converter(dc, scale, availableSpace.GetSize());
+
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, this);
+
+    // If we have no fixed table size, and assuming we're not pushed for
+    // space, then we don't have to try to stretch the table to fit the contents.
+    bool stretchToFitTableWidth = false;
+
+    int tableWidth = rect.width;
+    if (attr.GetTextBoxAttr().GetWidth().IsValid())
+    {
+        tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth());
+
+        // Fixed table width, so we do want to stretch columns out if necessary.
+        stretchToFitTableWidth = true;
+
+        // Shouldn't be able to exceed the size passed to this function
+        tableWidth = wxMin(rect.width, tableWidth);
+    }
+
+    // Get internal padding
+    int paddingLeft = 0, paddingTop = 0;
+    if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsValid())
+        paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft());
+    if (attr.GetTextBoxAttr().GetPadding().GetTop().IsValid())
+        paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop());
+
+    // Assume that left and top padding are also used for inter-cell padding.
+    int paddingX = paddingLeft;
+    int paddingY = paddingTop;
+
+    int totalLeftMargin = 0, totalRightMargin = 0, totalTopMargin = 0, totalBottomMargin = 0;
+    GetTotalMargin(dc, buffer, attr, totalLeftMargin, totalRightMargin, totalTopMargin, totalBottomMargin);
+
+    // Internal table width - the area for content
+    int internalTableWidth = tableWidth - totalLeftMargin - totalRightMargin;
+
+    int rowCount = m_cells.GetCount();
+    if (m_colCount == 0 || rowCount == 0)
+    {
+        wxRect overallRect(rect.x, rect.y, totalLeftMargin + totalRightMargin, totalTopMargin + totalBottomMargin);
+        SetCachedSize(overallRect.GetSize());
+
+        // Zero content size
+        SetMinSize(overallRect.GetSize());
+        SetMaxSize(GetMinSize());
+        return true;
+    }
+
+    // The final calculated widths
+    wxArrayInt colWidths;
+    colWidths.Add(0, m_colCount);
+
+    wxArrayInt absoluteColWidths;
+    absoluteColWidths.Add(0, m_colCount);
+
+    wxArrayInt percentageColWidths;
+    percentageColWidths.Add(0, m_colCount);
+    // wxArrayInt percentageColWidthsSpanning(m_colCount);
+    // These are only relevant when the first column contains spanning information.
+    // wxArrayInt columnSpans(m_colCount); // Each contains 1 for non-spanning cell, > 1 for spanning cell.
+    wxArrayInt maxColWidths;
+    maxColWidths.Add(0, m_colCount);
+    wxArrayInt minColWidths;
+    minColWidths.Add(0, m_colCount);
+
+    wxSize tableSize(tableWidth, 0);
+
+    int i, j, k;
+
+    for (i = 0; i < m_colCount; i++)
+    {
+        absoluteColWidths[i] = 0;
+        // absoluteColWidthsSpanning[i] = 0;
+        percentageColWidths[i] = -1;
+        // percentageColWidthsSpanning[i] = -1;
+        colWidths[i] = 0;
+        maxColWidths[i] = 0;
+        minColWidths[i] = 0;
+        // columnSpans[i] = 1;
+    }
+
+    // (0) Determine which cells are visible according to spans
+    //   1  2   3  4   5
+    //  __________________
+    // |  |   |      |    | 1
+    // |------|      |----|
+    // |------|      |    | 2
+    // |------|      |    | 3
+    // |------------------|
+    // |__________________| 4
+
+    // To calculate cell visibility:
+    // First find all spanning cells. Build an array of span records with start x, y and end x, y.
+    // Then for each cell, test whether we're within one of those cells, and unless we're at the start of
+    // that cell, hide the cell.
+
+    // We can also use this array to match the size of spanning cells to the grid. Or just do
+    // this when we iterate through all cells.
+
+    // 0.1: add spanning cells to an array
+    wxRichTextRectArray rectArray;
+    for (j = 0; j < m_rowCount; j++)
+    {
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            int colSpan = 1, rowSpan = 1;
+            if (cell->GetProperties().HasProperty(wxT("colspan")))
+                colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+            if (cell->GetProperties().HasProperty(wxT("rowspan")))
+                rowSpan = cell->GetProperties().GetPropertyLong(wxT("rowspan"));
+            if (colSpan > 1 || rowSpan > 1)
+            {
+                rectArray.Add(wxRect(i, j, colSpan, rowSpan));
+            }
+        }
+    }
+    // 0.2: find which cells are subsumed by a spanning cell
+    for (j = 0; j < m_rowCount; j++)
+    {
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            if (rectArray.GetCount() == 0)
+            {
+                cell->Show(true);
+            }
+            else
+            {
+                int colSpan = 1, rowSpan = 1;
+                if (cell->GetProperties().HasProperty(wxT("colspan")))
+                    colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+                if (cell->GetProperties().HasProperty(wxT("rowspan")))
+                    rowSpan = cell->GetProperties().GetPropertyLong(wxT("rowspan"));
+                if (colSpan > 1 || rowSpan > 1)
+                {
+                    // Assume all spanning cells are shown
+                    cell->Show(true);
+                }
+                else
+                {
+                    bool shown = true;
+                    for (k = 0; k < (int) rectArray.GetCount(); k++)
+                    {
+                        if (rectArray[k].Contains(wxPoint(i, j)))
+                        {
+                            shown = false;
+                            break;
+                        }
+                    }
+                    cell->Show(shown);
+                }
+            }
+        }
+    }
+
+    // TODO: find the first spanned cell in each row that spans the most columns and doesn't
+    // overlap with a spanned cell starting at a previous column position.
+    // This means we need to keep an array of rects so we can check. However
+    // it does also mean that some spans simply may not be taken into account
+    // where there are different spans happening on different rows. In these cases,
+    // they will simply be as wide as their constituent columns.
+
+    // (1) Do an initial layout for all cells to get minimum and maximum size, and get
+    // the absolute or percentage width of each column.
+
+    for (j = 0; j < m_rowCount; j++)
+    {
+        // First get the overall margins so we can calculate percentage widths based on
+        // the available content space for all cells on the row
+
+        int overallRowContentMargin = 0;
+        int visibleCellCount = 0;
+
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                int cellTotalLeftMargin = 0, cellTotalRightMargin = 0, cellTotalTopMargin = 0, cellTotalBottomMargin = 0;
+                GetTotalMargin(dc, buffer, cell->GetAttributes(), cellTotalLeftMargin, cellTotalRightMargin, cellTotalTopMargin, cellTotalBottomMargin);
+
+                overallRowContentMargin += (cellTotalLeftMargin + cellTotalRightMargin);
+                visibleCellCount ++;
+            }
+        }
+
+        // Add in inter-cell padding
+        overallRowContentMargin += ((visibleCellCount-1) * paddingX);
+
+        int rowContentWidth = internalTableWidth - overallRowContentMargin;
+        wxSize rowTableSize(rowContentWidth, 0);
+        wxTextAttrDimensionConverter converter(dc, scale, rowTableSize);
+
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                int colSpan = 1;
+                if (cell->GetProperties().HasProperty(wxT("colspan")))
+                    colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+                // Lay out cell to find min/max widths
+                cell->Invalidate(wxRICHTEXT_ALL);
+                cell->Layout(dc, context, availableSpace, availableSpace, style);
+
+                if (colSpan == 1)
+                {
+                    int absoluteCellWidth = -1;
+                    int percentageCellWidth = -1;
+
+                    // I think we need to calculate percentages from the internal table size,
+                    // minus the padding between cells which we'll need to calculate from the
+                    // (number of VISIBLE cells - 1)*paddingX. Then percentages that add up to 100%
+                    // will add up to 100%. In CSS, the width specifies the cell's content rect width,
+                    // so if we want to conform to that we'll need to add in the overall cell margins.
+                    // However, this will make it difficult to specify percentages that add up to
+                    // 100% and still fit within the table width.
+                    // Let's say two cells have 50% width. They have 10 pixels of overall margin each.
+                    // The table content rect is 500 pixels and the inter-cell padding is 20 pixels.
+                    // If we're using internal content size for the width, we would calculate the
+                    // the overall cell width for n cells as:
+                    // (500 - 20*(n-1) - overallCellMargin1 - overallCellMargin2 - ...) * percentage / 100
+                    // + thisOverallCellMargin
+                    // = 500 - 20 - 10 - 10) * 0.5 + 10 = 240 pixels overall cell width.
+                    // Adding this back, we get 240 + 240 + 20 = 500 pixels.
+
+                    if (cell->GetAttributes().GetTextBoxAttr().GetWidth().IsValid())
+                    {
+                        int w = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetWidth());
+                        if (cell->GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+                        {
+                            percentageCellWidth = w;
+                        }
+                        else
+                        {
+                            absoluteCellWidth = w;
+                        }
+                        // Override absolute width with minimum width if necessary
+                        if (cell->GetMinSize().x > 0 && absoluteCellWidth !=1 && cell->GetMinSize().x > absoluteCellWidth)
+                            absoluteCellWidth = cell->GetMinSize().x;
+                    }
+
+                    if (absoluteCellWidth != -1)
+                    {
+                        if (absoluteCellWidth > absoluteColWidths[i])
+                            absoluteColWidths[i] = absoluteCellWidth;
+                    }
+
+                    if (percentageCellWidth != -1)
+                    {
+                        if (percentageCellWidth > percentageColWidths[i])
+                            percentageColWidths[i] = percentageCellWidth;
+                    }
+
+                    if (colSpan == 1 && cell->GetMinSize().x && cell->GetMinSize().x > minColWidths[i])
+                        minColWidths[i] = cell->GetMinSize().x;
+                    if (colSpan == 1 && cell->GetMaxSize().x && cell->GetMaxSize().x > maxColWidths[i])
+                        maxColWidths[i] = cell->GetMaxSize().x;
+                }
+            }
+        }
+    }
+
+    // (2) Allocate initial column widths from minimum widths, absolute values and proportions
+    // TODO: simply merge this into (1).
+    for (i = 0; i < m_colCount; i++)
+    {
+        if (absoluteColWidths[i] > 0)
+        {
+            colWidths[i] = absoluteColWidths[i];
+        }
+        else if (percentageColWidths[i] > 0)
+        {
+            colWidths[i] = percentageColWidths[i];
+
+            // This is rubbish - we calculated the absolute widths from percentages, so
+            // we can't do it again here.
+            //colWidths[i] = (int) (double(percentageColWidths[i]) * double(tableWidth) / 100.0 + 0.5);
+        }
+    }
+
+    // (3) Process absolute or proportional widths of spanning columns,
+    // now that we know what our fixed column widths are going to be.
+    // Spanned cells will try to adjust columns so the span will fit.
+    // Even existing fixed column widths can be expanded if necessary.
+    // Actually, currently fixed columns widths aren't adjusted; instead,
+    // the algorithm favours earlier rows and adjusts unspecified column widths
+    // the first time only. After that, we can't know whether the column has been
+    // specified explicitly or not. (We could make a note if necessary.)
+    for (j = 0; j < m_rowCount; j++)
+    {
+        // First get the overall margins so we can calculate percentage widths based on
+        // the available content space for all cells on the row
+
+        int overallRowContentMargin = 0;
+        int visibleCellCount = 0;
+
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                int cellTotalLeftMargin = 0, cellTotalRightMargin = 0, cellTotalTopMargin = 0, cellTotalBottomMargin = 0;
+                GetTotalMargin(dc, buffer, cell->GetAttributes(), cellTotalLeftMargin, cellTotalRightMargin, cellTotalTopMargin, cellTotalBottomMargin);
+
+                overallRowContentMargin += (cellTotalLeftMargin + cellTotalRightMargin);
+                visibleCellCount ++;
+            }
+        }
+
+        // Add in inter-cell padding
+        overallRowContentMargin += ((visibleCellCount-1) * paddingX);
+
+        int rowContentWidth = internalTableWidth - overallRowContentMargin;
+        wxSize rowTableSize(rowContentWidth, 0);
+        wxTextAttrDimensionConverter converter(dc, scale, rowTableSize);
+
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextBox* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                int colSpan = 1;
+                if (cell->GetProperties().HasProperty(wxT("colspan")))
+                    colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+                if (colSpan > 1)
+                {
+                    int spans = wxMin(colSpan, m_colCount - i);
+                    int cellWidth = 0;
+                    if (spans > 0)
+                    {
+                        if (cell->GetAttributes().GetTextBoxAttr().GetWidth().IsValid())
+                        {
+                            cellWidth = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetWidth());
+                            // Override absolute width with minimum width if necessary
+                            if (cell->GetMinSize().x > 0 && cellWidth !=1 && cell->GetMinSize().x > cellWidth)
+                                cellWidth = cell->GetMinSize().x;
+                        }
+                        else
+                        {
+                            // Do we want to do this? It's the only chance we get to
+                            // use the cell's min/max sizes, so we need to work out
+                            // how we're going to balance the unspecified spanning cell
+                            // width with the possibility more-constrained constituent cell widths.
+                            // Say there's a tiny bitmap giving it a max width of 10 pixels. We
+                            // don't want to constraint all the spanned columns to fit into this cell.
+                            // OK, let's say that if any of the constituent columns don't fit,
+                            // then we simply stop constraining the columns; instead, we'll just fit the spanning
+                            // cells to the columns later.
+                            cellWidth = cell->GetMinSize().x;
+                            if (cell->GetMaxSize().x > cellWidth)
+                                cellWidth = cell->GetMaxSize().x;
+                        }
+
+                        // Subtract the padding between cells
+                        int spanningWidth = cellWidth;
+                        spanningWidth -= paddingX * (spans-1);
+
+                        if (spanningWidth > 0)
+                        {
+                            // Now share the spanning width between columns within that span
+                            // TODO: take into account min widths of columns within the span
+                            int spanningWidthLeft = spanningWidth;
+                            int stretchColCount = 0;
+                            for (k = i; k < (i+spans); k++)
+                            {
+                                if (colWidths[k] > 0) // absolute or proportional width has been specified
+                                    spanningWidthLeft -= colWidths[k];
+                                else
+                                    stretchColCount ++;
+                            }
+                            // Now divide what's left between the remaining columns
+                            int colShare = 0;
+                            if (stretchColCount > 0)
+                                colShare = spanningWidthLeft / stretchColCount;
+                            int colShareRemainder = spanningWidthLeft - (colShare * stretchColCount);
+
+                            // If fixed-width columns are currently too big, then we'll later
+                            // stretch the spanned cell to fit.
+
+                            if (spanningWidthLeft > 0)
+                            {
+                                for (k = i; k < (i+spans); k++)
+                                {
+                                    if (colWidths[k] <= 0) // absolute or proportional width has not been specified
+                                    {
+                                        int newWidth = colShare;
+                                        if (k == (i+spans-1))
+                                            newWidth += colShareRemainder; // ensure all pixels are filled
+                                        colWidths[k] = newWidth;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // (4) Next, share any remaining space out between columns that have not yet been calculated.
+    // TODO: take into account min widths of columns within the span
+    int tableWidthMinusPadding = internalTableWidth - (m_colCount-1)*paddingX;
+    int widthLeft = tableWidthMinusPadding;
+    int stretchColCount = 0;
+    for (i = 0; i < m_colCount; i++)
+    {
+        // TODO: we need to take into account min widths.
+        // Subtract min width from width left, then
+        // add the colShare to the min width
+        if (colWidths[i] > 0) // absolute or proportional width has been specified
+            widthLeft -= colWidths[i];
+        else
+        {
+            if (minColWidths[i] > 0)
+                widthLeft -= minColWidths[i];
+
+            stretchColCount ++;
+        }
+    }
+
+    // Now divide what's left between the remaining columns
+    int colShare = 0;
+    if (stretchColCount > 0)
+        colShare = widthLeft / stretchColCount;
+    int colShareRemainder = widthLeft - (colShare * stretchColCount);
+
+    // Check we don't have enough space, in which case shrink all columns, overriding
+    // any absolute/proportional widths
+    // TODO: actually we would like to divide up the shrinkage according to size.
+    // How do we calculate the proportions that will achieve this?
+    // Could first choose an arbitrary value for stretching cells, and then calculate
+    // factors to multiply each width by.
+    // TODO: want to record this fact and pass to an iteration that tries e.g. min widths
+    if (widthLeft < 0 || (stretchToFitTableWidth && (stretchColCount == 0)))
+    {
+        colShare = tableWidthMinusPadding / m_colCount;
+        colShareRemainder = tableWidthMinusPadding - (colShare * m_colCount);
+        for (i = 0; i < m_colCount; i++)
+        {
+            colWidths[i] = 0;
+            minColWidths[i] = 0;
+        }
+    }
+
+    // We have to adjust the columns if either we need to shrink the
+    // table to fit the parent/table width, or we explicitly set the
+    // table width and need to stretch out the table.
+    if (widthLeft < 0 || stretchToFitTableWidth)
+    {
+        for (i = 0; i < m_colCount; i++)
+        {
+            if (colWidths[i] <= 0) // absolute or proportional width has not been specified
+            {
+                if (minColWidths[i] > 0)
+                    colWidths[i] = minColWidths[i] + colShare;
+                else
+                    colWidths[i] = colShare;
+                if (i == (m_colCount-1))
+                    colWidths[i] += colShareRemainder; // ensure all pixels are filled
+            }
+        }
+    }
+
+    // TODO: if spanned cells have no specified or max width, make them the
+    // as big as the columns they span. Do this for all spanned cells in all
+    // rows, of course. Size any spanned cells left over at the end - even if they
+    // have width > 0, make sure they're limited to the appropriate column edge.
+
+
+/*
+    Sort out confusion between content width
+    and overall width later. For now, assume we specify overall width.
+
+    So, now we've laid out the table to fit into the given space
+    and have used specified widths and minimum widths.
+
+    Now we need to consider how we will try to take maximum width into account.
+
+*/
+
+    // (??) TODO: take max width into account
+
+    // (6) Lay out all cells again with the current values
+
+    int maxRight = 0;
+    int y = availableSpace.y;
+    for (j = 0; j < m_rowCount; j++)
+    {
+        int x = availableSpace.x; // TODO: take into account centering etc.
+        int maxCellHeight = 0;
+        int maxSpecifiedCellHeight = 0;
+
+        wxArrayInt actualWidths;
+        actualWidths.Add(0, m_colCount);
+
+        wxTextAttrDimensionConverter converter(dc, scale);
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextCell* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                // Get max specified cell height
+                // Don't handle percentages for height
+                if (cell->GetAttributes().GetTextBoxAttr().GetHeight().IsValid() && cell->GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() != wxTEXT_ATTR_UNITS_PERCENTAGE)
+                {
+                    int h = converter.GetPixels(cell->GetAttributes().GetTextBoxAttr().GetHeight());
+                    if (h > maxSpecifiedCellHeight)
+                        maxSpecifiedCellHeight = h;
+                }
+
+                if (colWidths[i] > 0) // absolute or proportional width has been specified
+                {
+                    int colSpan = 1;
+                    if (cell->GetProperties().HasProperty(wxT("colspan")))
+                        colSpan = cell->GetProperties().GetPropertyLong(wxT("colspan"));
+
+                    wxRect availableCellSpace;
+
+                    // TODO: take into acount spans
+                    if (colSpan > 1)
+                    {
+                        // Calculate the size of this spanning cell from its constituent columns
+                        int xx = x;
+                        int spans = wxMin(colSpan, m_colCount - i);
+                        for (k = i; k < spans; k++)
+                        {
+                            if (k != i)
+                                xx += paddingX;
+                            xx += colWidths[k];
+                        }
+                        availableCellSpace = wxRect(x, y, xx, -1);
+                    }
+                    else
+                        availableCellSpace = wxRect(x, y, colWidths[i], -1);
+
+                    // Store actual width so we can force cell to be the appropriate width on the final loop
+                    actualWidths[i] = availableCellSpace.GetWidth();
+
+                    // Lay out cell
+                    cell->Invalidate(wxRICHTEXT_ALL);
+                    cell->Layout(dc, context, availableCellSpace, availableSpace, style);
+
+                    // TODO: use GetCachedSize().x to compute 'natural' size
+
+                    x += (availableCellSpace.GetWidth() + paddingX);
+                    if (cell->GetCachedSize().y > maxCellHeight)
+                        maxCellHeight = cell->GetCachedSize().y;
+                }
+            }
+        }
+
+        maxCellHeight = wxMax(maxCellHeight, maxSpecifiedCellHeight);
+
+        for (i = 0; i < m_colCount; i++)
+        {
+            wxRichTextCell* cell = GetCell(j, i);
+            if (cell->IsShown())
+            {
+                wxRect availableCellSpace = wxRect(cell->GetPosition(), wxSize(actualWidths[i], maxCellHeight));
+                // Lay out cell with new height
+                cell->Invalidate(wxRICHTEXT_ALL);
+                cell->Layout(dc, context, availableCellSpace, availableSpace, style);
+
+                // Make sure the cell size really is the appropriate size,
+                // not the calculated box size
+                cell->SetCachedSize(wxSize(actualWidths[i], maxCellHeight));
+
+                maxRight = wxMax(maxRight, cell->GetPosition().x + cell->GetCachedSize().x);
+            }
+        }
+
+        y += maxCellHeight;
+        if (j < (m_rowCount-1))
+            y += paddingY;
+    }
+
+    // We need to add back the margins etc.
+    {
+        wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+        contentRect = wxRect(wxPoint(0, 0), wxSize(maxRight - availableSpace.x, y - availableSpace.y));
+        GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+        SetCachedSize(marginRect.GetSize());
+    }
+
+    // TODO: calculate max size
+    {
+        SetMaxSize(GetCachedSize());
+    }
+
+    // TODO: calculate min size
+    {
+        SetMinSize(GetCachedSize());
+    }
+
+    // TODO: currently we use either a fixed table width or the parent's size.
+    // We also want to be able to calculate the table width from its content,
+    // whether using fixed column widths or cell content min/max width.
+    // Probably need a boolean flag to say whether we need to stretch cells
+    // to fit the table width, or to simply use min/max cell widths. The
+    // trouble with this is that if cell widths are not specified, they
+    // will be tiny; we could use arbitrary defaults but this seems unsatisfactory.
+    // Anyway, ignoring that problem, we probably need to factor layout into a function
+    // that can can calculate the maximum unconstrained layout in case table size is
+    // not specified. Then LayoutToBestSize() can choose to use either parent size to
+    // constrain Layout(), or the previously-calculated max size to constraint layout.
+
+    return true;
+}
+
+// Finds the absolute position and row height for the given character position
+bool wxRichTextTable::FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart)
+{
+    wxRichTextCell* child = GetCell(index+1);
+    if (child)
+    {
+        // Find the position at the start of the child cell, since the table doesn't
+        // have any caret position of its own.
+        return child->FindPosition(dc, context, -1, pt, height, forceLineStart);
+    }
+    else
+        return false;
+}
+
+// Get the cell at the given character position (in the range of the table).
+wxRichTextCell* wxRichTextTable::GetCell(long pos) const
+{
+    int row = 0, col = 0;
+    if (GetCellRowColumnPosition(pos, row, col))
+    {
+        return GetCell(row, col);
+    }
+    else
+        return NULL;
+}
+
+// Get the row/column for a given character position
+bool wxRichTextTable::GetCellRowColumnPosition(long pos, int& row, int& col) const
+{
+    if (m_colCount == 0 || m_rowCount == 0)
+        return false;
+
+    row = (int) (pos / m_colCount);
+    col = pos - (row * m_colCount);
+
+    wxASSERT(row < m_rowCount && col < m_colCount);
+
+    if (row < m_rowCount && col < m_colCount)
+        return true;
+    else
+        return false;
+}
+
+// Calculate range, taking row/cell ordering into account instead of relying
+// on list ordering.
+void wxRichTextTable::CalculateRange(long start, long& end)
+{
+    long current = start;
+    long lastEnd = current;
+
+    if (IsTopLevel())
+    {
+        current = 0;
+        lastEnd = 0;
+    }
+
+    int i, j;
+    for (i = 0; i < m_rowCount; i++)
+    {
+        for (j = 0; j < m_colCount; j++)
+        {
+            wxRichTextCell* child = GetCell(i, j);
+            if (child)
+            {
+                long childEnd = 0;
+
+                child->CalculateRange(current, childEnd);
+
+                lastEnd = childEnd;
+                current = childEnd + 1;
+            }
+        }
+    }
+
+    // A top-level object always has a range of size 1,
+    // because its children don't count at this level.
+    end = start;
+    m_range.SetRange(start, start);
+
+    // An object with no children has zero length
+    if (m_children.GetCount() == 0)
+        lastEnd --;
+    m_ownRange.SetRange(0, lastEnd);
+}
+
+// Gets the range size.
+bool wxRichTextTable::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, wxPoint position, wxArrayInt* partialExtents) const
+{
+    return wxRichTextBox::GetRangeSize(range, size, descent, dc, context, flags, position, partialExtents);
+}
+
+// Deletes content in the given range.
+bool wxRichTextTable::DeleteRange(const wxRichTextRange& WXUNUSED(range))
+{
+    // TODO: implement deletion of cells
+    return true;
+}
+
+// Gets any text in this object for the given range.
+wxString wxRichTextTable::GetTextForRange(const wxRichTextRange& range) const
+{
+    return wxRichTextBox::GetTextForRange(range);
+}
+
+// Copies this object.
+void wxRichTextTable::Copy(const wxRichTextTable& obj)
+{
+    wxRichTextBox::Copy(obj);
+
+    ClearTable();
+
+    m_rowCount = obj.m_rowCount;
+    m_colCount = obj.m_colCount;
+
+    m_cells.Add(wxRichTextObjectPtrArray(), m_rowCount);
+
+    int i, j;
+    for (i = 0; i < m_rowCount; i++)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[i];
+        for (j = 0; j < m_colCount; j++)
+        {
+            wxRichTextCell* cell = wxDynamicCast(obj.GetCell(i, j)->Clone(), wxRichTextCell);
+            AppendChild(cell);
+
+            colArray.Add(cell);
+        }
+    }
+}
+
+void wxRichTextTable::ClearTable()
+{
+    m_cells.Clear();
+    DeleteChildren();
+}
+
+bool wxRichTextTable::CreateTable(int rows, int cols)
+{
+    ClearTable();
+
+    m_rowCount = rows;
+    m_colCount = cols;
+
+    m_cells.Add(wxRichTextObjectPtrArray(), rows);
+
+    int i, j;
+    for (i = 0; i < rows; i++)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[i];
+        for (j = 0; j < cols; j++)
+        {
+            wxRichTextCell* cell = new wxRichTextCell;
+            AppendChild(cell);
+            cell->AddParagraph(wxEmptyString);
+
+            colArray.Add(cell);
+        }
+    }
+
+    return true;
+}
+
+wxRichTextCell* wxRichTextTable::GetCell(int row, int col) const
+{
+    wxASSERT(row < m_rowCount);
+    wxASSERT(col < m_colCount);
+
+    if (row < m_rowCount && col < m_colCount)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[row];
+        wxRichTextObject* obj = colArray[col];
+        return wxDynamicCast(obj, wxRichTextCell);
+    }
+    else
+        return NULL;
+}
+
+// Returns a selection object specifying the selections between start and end character positions.
+// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
+wxRichTextSelection wxRichTextTable::GetSelection(long start, long end) const
+{
+    wxRichTextSelection selection;
+    selection.SetContainer((wxRichTextTable*) this);
+
+    if (start > end)
+    {
+        long tmp = end;
+        end = start;
+        start = tmp;
+    }
+
+    wxASSERT( start >= 0 && end < (m_colCount * m_rowCount));
+
+    if (end >= (m_colCount * m_rowCount))
+        return selection;
+
+    // We need to find the rectangle of cells that is described by the rectangle
+    // with start, end as the diagonal. Make sure we don't add cells that are
+    // not currenty visible because they are overlapped by spanning cells.
+/*
+    --------------------------
+    | 0  | 1  | 2  | 3  | 4  |
+    --------------------------
+    | 5  | 6  | 7  | 8  | 9  |
+    --------------------------
+    | 10 | 11 | 12 | 13 | 14 |
+    --------------------------
+    | 15 | 16 | 17 | 18 | 19 |
+    --------------------------
+
+    Let's say we select 6 -> 18.
+
+    Left and right edge cols of rectangle are 1 and 3 inclusive. Find least/greatest to find
+    which is left and which is right.
+
+    Top and bottom edge rows are 1 and 3 inclusive. Again, find least/greatest to find top and bottom.
+
+    Now go through rows from 1 to 3 and only add cells that are (a) within above column range
+    and (b) shown.
+
+
+*/
+
+    int leftCol = start - m_colCount * int(start/m_colCount);
+    int rightCol = end - m_colCount * int(end/m_colCount);
+
+    int topRow = int(start/m_colCount);
+    int bottomRow = int(end/m_colCount);
+
+    if (leftCol > rightCol)
+    {
+        int tmp = rightCol;
+        rightCol = leftCol;
+        leftCol = tmp;
+    }
+
+    if (topRow > bottomRow)
+    {
+        int tmp = bottomRow;
+        bottomRow = topRow;
+        topRow = tmp;
+    }
+
+    int i, j;
+    for (i = topRow; i <= bottomRow; i++)
+    {
+        for (j = leftCol; j <= rightCol; j++)
+        {
+            wxRichTextCell* cell = GetCell(i, j);
+            if (cell && cell->IsShown())
+                selection.Add(cell->GetRange());
+        }
+    }
+
+    return selection;
+}
+
+// Sets the attributes for the cells specified by the selection.
+bool wxRichTextTable::SetCellStyle(const wxRichTextSelection& selection, const wxRichTextAttr& style, int flags)
+{
+    if (selection.GetContainer() != this)
+        return false;
+
+    wxRichTextBuffer* buffer = GetBuffer();
+    bool haveControl = (buffer && buffer->GetRichTextCtrl() != NULL);
+    bool withUndo = haveControl && ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+
+    if (withUndo)
+        buffer->BeginBatchUndo(_("Set Cell Style"));
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextCell* cell = wxDynamicCast(node->GetData(), wxRichTextCell);
+        if (cell && selection.WithinSelection(cell->GetRange().GetStart()))
+            SetStyle(cell, style, flags);
+        node = node->GetNext();
+    }
+
+    // Do action, or delay it until end of batch.
+    if (withUndo)
+        buffer->EndBatchUndo();
+
+    return true;
+}
+
+bool wxRichTextTable::DeleteRows(int startRow, int noRows)
+{
+    wxASSERT((startRow + noRows) < m_rowCount);
+    if ((startRow + noRows) >= m_rowCount)
+        return false;
+
+    int i, j;
+    for (i = startRow; i < (startRow+noRows); i++)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[startRow];
+        for (j = 0; j < (int) colArray.GetCount(); j++)
+        {
+            wxRichTextObject* cell = colArray[j];
+            RemoveChild(cell, true);
+        }
+
+        // Keep deleting at the same position, since we move all
+        // the others up
+        m_cells.RemoveAt(startRow);
+    }
+
+    m_rowCount = m_rowCount - noRows;
+
+    return true;
+}
+
+bool wxRichTextTable::DeleteColumns(int startCol, int noCols)
+{
+    wxASSERT((startCol + noCols) < m_colCount);
+    if ((startCol + noCols) >= m_colCount)
+        return false;
+
+    bool deleteRows = (noCols == m_colCount);
+
+    int i, j;
+    for (i = 0; i < m_rowCount; i++)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[deleteRows ? 0 : i];
+        for (j = startCol; j < (startCol+noCols); j++)
+        {
+            wxRichTextObject* cell = colArray[j];
+            RemoveChild(cell, true);
+        }
+
+        if (deleteRows)
+            m_cells.RemoveAt(0);
+    }
+
+    if (deleteRows)
+        m_rowCount = 0;
+    m_colCount = m_colCount - noCols;
+
+    return true;
+}
+
+bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& attr)
+{
+    wxASSERT(startRow <= m_rowCount);
+    if (startRow > m_rowCount)
+        return false;
+
+    int i, j;
+    for (i = 0; i < noRows; i++)
+    {
+        int idx;
+        if (startRow == m_rowCount)
+        {
+            m_cells.Add(wxRichTextObjectPtrArray());
+            idx = m_cells.GetCount() - 1;
+        }
+        else
+        {
+            m_cells.Insert(wxRichTextObjectPtrArray(), startRow+i);
+            idx = startRow+i;
+        }
+
+        wxRichTextObjectPtrArray& colArray = m_cells[idx];
+        for (j = 0; j < m_colCount; j++)
+        {
+            wxRichTextCell* cell = new wxRichTextCell;
+            cell->GetAttributes() = attr;
+
+            AppendChild(cell);
+            colArray.Add(cell);
+        }
+    }
+
+    m_rowCount = m_rowCount + noRows;
+    return true;
+}
+
+bool wxRichTextTable::AddColumns(int startCol, int noCols, const wxRichTextAttr& attr)
+{
+    wxASSERT(startCol <= m_colCount);
+    if (startCol > m_colCount)
+        return false;
+
+    int i, j;
+    for (i = 0; i < m_rowCount; i++)
+    {
+        wxRichTextObjectPtrArray& colArray = m_cells[i];
+        for (j = 0; j < noCols; j++)
+        {
+            wxRichTextCell* cell = new wxRichTextCell;
+            cell->GetAttributes() = attr;
+
+            AppendChild(cell);
+
+            if (startCol == m_colCount)
+                colArray.Add(cell);
+            else
+                colArray.Insert(cell, startCol+j);
+        }
+    }
+
+    m_colCount = m_colCount + noCols;
+
+    return true;
+}
+
+// Edit properties via a GUI
+bool wxRichTextTable::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+    wxRichTextObjectPropertiesDialog boxDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Table Properties"));
+    boxDlg.SetAttributes(GetAttributes());
+
+    if (boxDlg.ShowModal() == wxID_OK)
+    {
+        boxDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
+        return true;
+    }
+    else
+        return false;
+}
+
+/*
+ * Module to initialise and clean up handlers
+ */
+
+class wxRichTextModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxRichTextModule)
+public:
+    wxRichTextModule() {}
+    bool OnInit()
+    {
+        wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer);
+        wxRichTextBuffer::InitStandardHandlers();
+        wxRichTextParagraph::InitDefaultTabs();
+
+        wxRichTextXMLHandler::RegisterNodeName(wxT("text"), wxT("wxRichTextPlainText"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("symbol"), wxT("wxRichTextPlainText"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("image"), wxT("wxRichTextImage"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("paragraph"), wxT("wxRichTextParagraph"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("paragraphlayout"), wxT("wxRichTextParagraphLayoutBox"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("textbox"), wxT("wxRichTextBox"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("cell"), wxT("wxRichTextCell"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("table"), wxT("wxRichTextTable"));
+        wxRichTextXMLHandler::RegisterNodeName(wxT("field"), wxT("wxRichTextField"));
+
+        return true;
+    }
+    void OnExit()
+    {
+        wxRichTextBuffer::CleanUpHandlers();
+        wxRichTextBuffer::CleanUpDrawingHandlers();
+        wxRichTextBuffer::CleanUpFieldTypes();
+        wxRichTextXMLHandler::ClearNodeToClassMap();
+        wxRichTextDecimalToRoman(-1);
+        wxRichTextParagraph::ClearDefaultTabs();
+        wxRichTextCtrl::ClearAvailableFontNames();
+        wxRichTextBuffer::SetRenderer(NULL);
+    }
+};
+
+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,
+                                     wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name)
+{
+    /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, container, ctrl, ignoreFirstTime);
+}
+
+wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(true, name)
+{
+}
+
+wxRichTextCommand::~wxRichTextCommand()
+{
+    ClearActions();
+}
+
+void wxRichTextCommand::AddAction(wxRichTextAction* action)
+{
+    if (!m_actions.Member(action))
+        m_actions.Append(action);
+}
+
+bool wxRichTextCommand::Do()
+{
+    for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext())
+    {
+        wxRichTextAction* action = (wxRichTextAction*) node->GetData();
+        action->Do();
+    }
+
+    return true;
+}
+
+bool wxRichTextCommand::Undo()
+{
+    for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious())
+    {
+        wxRichTextAction* action = (wxRichTextAction*) node->GetData();
+        action->Undo();
+    }
+
+    return true;
+}
+
+void wxRichTextCommand::ClearActions()
+{
+    WX_CLEAR_LIST(wxList, m_actions);
+}
+
+/*!
+ * Individual action
+ *
+ */
+
+wxRichTextAction::wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id,
+                                   wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container,
+                                   wxRichTextCtrl* ctrl, bool ignoreFirstTime)
+{
+    m_buffer = buffer;
+    m_object = NULL;
+    m_containerAddress.Create(buffer, container);
+    m_ignoreThis = ignoreFirstTime;
+    m_cmdId = id;
+    m_position = -1;
+    m_ctrl = ctrl;
+    m_name = name;
+    m_newParagraphs.SetDefaultStyle(buffer->GetDefaultStyle());
+    m_newParagraphs.SetBasicStyle(buffer->GetBasicStyle());
+    if (cmd)
+        cmd->AddAction(this);
+}
+
+wxRichTextAction::~wxRichTextAction()
+{
+    if (m_object)
+        delete m_object;
+}
+
+// Returns the container that this action refers to, using the container address and top-level buffer.
+wxRichTextParagraphLayoutBox* wxRichTextAction::GetContainer() const
+{
+    wxRichTextParagraphLayoutBox* container = wxDynamicCast(GetContainerAddress().GetObject(m_buffer), wxRichTextParagraphLayoutBox);
+    return container;
+}
+
+
+void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions)
+{
+    // Store a list of line start character and y positions so we can figure out which area
+    // we need to refresh
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+    wxRichTextParagraphLayoutBox* container = GetContainer();
+    wxASSERT(container != NULL);
+    if (!container)
+        return;
+
+    // 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->IsDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly
+    {
+        wxSize clientSize = m_ctrl->GetUnscaledSize(m_ctrl->GetClientSize());
+        wxPoint firstVisiblePt = m_ctrl->GetUnscaledPoint(m_ctrl->GetFirstVisiblePoint());
+        int lastY = firstVisiblePt.y + clientSize.y;
+
+        wxRichTextParagraph* para = container->GetParagraphAtPosition(GetRange().GetStart());
+        wxRichTextObjectList::compatibility_iterator node = container->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
+}
+
+bool wxRichTextAction::Do()
+{
+    m_buffer->Modify(true);
+
+    wxRichTextParagraphLayoutBox* container = GetContainer();
+    wxASSERT(container != NULL);
+    if (!container)
+        return false;
+
+    switch (m_cmdId)
+    {
+    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
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
+            container->InsertFragment(GetRange().GetStart(), m_newParagraphs);
+            container->UpdateRanges();
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd()));
+
+            long newCaretPosition = GetPosition() + m_newParagraphs.GetOwnRange().GetLength();
+
+            // Character position to caret position
+            newCaretPosition --;
+
+            // Don't take into account the last newline
+            if (m_newParagraphs.GetPartialParagraph())
+                newCaretPosition --;
+            else
+                if (m_newParagraphs.GetChildren().GetCount() > 1)
+                {
+                    wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData();
+                    if (p->GetRange().GetLength() == 1)
+                        newCaretPosition --;
+                }
+
+            newCaretPosition = wxMin(newCaretPosition, (container->GetOwnRange().GetEnd()-1));
+
+            UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
+
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
+
+            m_buffer->SendEvent(cmdEvent);
+
+            break;
+        }
+    case wxRICHTEXT_DELETE:
+        {
+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
+            container->DeleteRange(GetRange());
+            container->UpdateRanges();
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+
+            long caretPos = GetRange().GetStart()-1;
+            if (caretPos >= container->GetOwnRange().GetEnd())
+                caretPos --;
+
+            UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
+
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
+
+            m_buffer->SendEvent(cmdEvent);
+
+            break;
+        }
+    case wxRICHTEXT_CHANGE_STYLE:
+    case wxRICHTEXT_CHANGE_PROPERTIES:
+        {
+            ApplyParagraphs(GetNewParagraphs());
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(GetRange());
+
+            UpdateAppearance(GetPosition());
+
+            wxRichTextEvent cmdEvent(
+                m_cmdId == wxRICHTEXT_CHANGE_STYLE ? wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED : wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
+
+            m_buffer->SendEvent(cmdEvent);
+
+            break;
+        }
+    case wxRICHTEXT_CHANGE_ATTRIBUTES:
+        {
+            wxRichTextObject* obj = m_objectAddress.GetObject(m_buffer); // container->GetChildAtPosition(GetRange().GetStart());
+            if (obj)
+            {
+                wxRichTextAttr oldAttr = obj->GetAttributes();
+                obj->GetAttributes() = m_attributes;
+                m_attributes = oldAttr;
+            }
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(GetRange());
+
+            UpdateAppearance(GetPosition());
+
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
+
+            m_buffer->SendEvent(cmdEvent);
+
+            break;
+        }
+    case wxRICHTEXT_CHANGE_OBJECT:
+        {
+            wxRichTextObject* obj = m_objectAddress.GetObject(m_buffer);
+            // wxRichTextObject* obj = container->GetChildAtPosition(GetRange().GetStart());
+            if (obj && m_object)
+            {
+                wxRichTextObjectList::compatibility_iterator node = container->GetChildren().Find(obj);
+                if (node)
+                {
+                    wxRichTextObject* obj = node->GetData();
+                    node->SetData(m_object);
+                    m_object = obj;
+                }
+            }
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(GetRange());
+
+            UpdateAppearance(GetPosition());
+
+            // TODO: send new kind of modification event
+
+            break;
+        }
+    default:
+        break;
+    }
+
+    return true;
+}
+
+bool wxRichTextAction::Undo()
+{
+    m_buffer->Modify(true);
+
+    wxRichTextParagraphLayoutBox* container = GetContainer();
+    wxASSERT(container != NULL);
+    if (!container)
+        return false;
+
+    switch (m_cmdId)
+    {
+    case wxRICHTEXT_INSERT:
+        {
+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
+            container->DeleteRange(GetRange());
+            container->UpdateRanges();
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+
+            long newCaretPosition = GetPosition() - 1;
+
+            UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);
+
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
+
+            m_buffer->SendEvent(cmdEvent);
+
+            break;
+        }
+    case wxRICHTEXT_DELETE:
+        {
+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
+            container->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
+            container->UpdateRanges();
+
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(GetRange());
 
-    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
-    {
-        wxTheClipboard->Clear();
+            UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);
 
-        // Add composite object
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
 
-        wxDataObjectComposite* compositeObject = new wxDataObjectComposite();
+            m_buffer->SendEvent(cmdEvent);
 
+            break;
+        }
+    case wxRICHTEXT_CHANGE_STYLE:
+    case wxRICHTEXT_CHANGE_PROPERTIES:
         {
-            wxString text = GetTextForRange(range);
+            ApplyParagraphs(GetOldParagraphs());
+            // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
+            // Layout() would stop prematurely at the top level.
+            container->InvalidateHierarchy(GetRange());
 
-#ifdef __WXMSW__
-            text = wxTextFile::Translate(text, wxTextFileType_Dos);
-#endif
+            UpdateAppearance(GetPosition());
 
-            compositeObject->Add(new wxTextDataObject(text), false /* not preferred */);
-        }
+            wxRichTextEvent cmdEvent(
+                m_cmdId == wxRICHTEXT_CHANGE_STYLE ? wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED : wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            cmdEvent.SetContainer(container);
 
-        // Add rich text buffer data object. This needs the XML handler to be present.
+            m_buffer->SendEvent(cmdEvent);
 
-        if (FindHandler(wxRICHTEXT_TYPE_XML))
+            break;
+        }
+    case wxRICHTEXT_CHANGE_ATTRIBUTES:
+    case wxRICHTEXT_CHANGE_OBJECT:
         {
-            wxRichTextBuffer* richTextBuf = new wxRichTextBuffer;
-            CopyFragment(range, *richTextBuf);
-
-            compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */);
+            return Do();
         }
-
-        if (wxTheClipboard->SetData(compositeObject))
-            success = true;
-
-        wxTheClipboard->Close();
+    default:
+        break;
     }
 
-#else
-    wxUnusedVar(range);
-#endif
-    return success;
+    return true;
 }
 
-/// Paste the clipboard content to the buffer
-bool wxRichTextBuffer::PasteFromClipboard(long position)
+/// Update the control appearance
+void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions, bool isDoCmd)
 {
-    bool success = false;
-#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
-    if (CanPasteFromClipboard())
+    wxRichTextParagraphLayoutBox* container = GetContainer();
+    wxASSERT(container != NULL);
+    if (!container)
+        return;
+
+    if (m_ctrl)
     {
-        if (wxTheClipboard->Open())
+        m_ctrl->SetFocusObject(container);
+        m_ctrl->SetCaretPosition(caretPosition);
+
+        if (!m_ctrl->IsFrozen())
         {
-            if (wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())))
+            wxRect containerRect = container->GetRect();
+
+            m_ctrl->LayoutContent();
+
+            // Refresh everything if there were floating objects or the container changed size
+            // (we can't yet optimize in these cases, since more complex interaction with other content occurs)
+            if (container->GetFloatingObjectCount() > 0 || (container->GetParent() && containerRect != container->GetRect()))
             {
-                wxRichTextBufferDataObject data;
-                wxTheClipboard->GetData(data);
-                wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
-                if (richTextBuffer)
-                {
-                    InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
-                    delete richTextBuffer;
-                }
+                m_ctrl->Refresh(false);
             }
-            else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT))
+            else
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            // Find refresh rectangle if we are in a position to optimise refresh
+            if ((m_cmdId == wxRICHTEXT_INSERT || m_cmdId == wxRICHTEXT_DELETE) && optimizationLineCharPositions)
             {
-                wxTextDataObject data;
-                wxTheClipboard->GetData(data);
-                wxString text(data.GetText());
-                text.Replace(_T("\r\n"), _T("\n"));
+                size_t i;
 
-                InsertTextWithUndo(position+1, text, GetRichTextCtrl());
+                wxSize clientSize = m_ctrl->GetUnscaledSize(m_ctrl->GetClientSize());
+                wxPoint firstVisiblePt = m_ctrl->GetUnscaledPoint(m_ctrl->GetFirstVisiblePoint());
 
-                success = true;
-            }
-            else if (wxTheClipboard->IsSupported(wxDF_BITMAP))
-            {
-                wxBitmapDataObject data;
-                wxTheClipboard->GetData(data);
-                wxBitmap bitmap(data.GetBitmap());
-                wxImage image(bitmap.ConvertToImage());
+                // Start/end positions
+                int firstY = 0;
+                int lastY = firstVisiblePt.y + clientSize.y;
 
-                wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, GetRichTextCtrl(), false);
+                bool foundEnd = false;
 
-                action->GetNewParagraphs().AddImage(image);
+                // position offset - how many characters were inserted
+                int positionOffset = GetRange().GetLength();
 
-                if (action->GetNewParagraphs().GetChildCount() == 1)
-                    action->GetNewParagraphs().SetPartialParagraph(true);
+                // Determine whether this is Do or Undo, and adjust positionOffset accordingly
+                if ((m_cmdId == wxRICHTEXT_DELETE && isDoCmd) || (m_cmdId == wxRICHTEXT_INSERT && !isDoCmd))
+                    positionOffset = - positionOffset;
 
-                action->SetPosition(position);
+                // 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.
 
-                // Set the range we'll need to delete in Undo
-                action->SetRange(wxRichTextRange(position, position));
+                wxRichTextParagraph* para = container->GetParagraphAtPosition(GetPosition());
+                // Since we support floating layout, we should redraw the whole para instead of just
+                // the first line touching the invalid range.
+                if (para)
+                {
+                    firstY = para->GetPosition().y;
+                }
 
-                SubmitAction(action);
+                wxRichTextObjectList::compatibility_iterator node = container->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();
 
-                success = true;
+                        // 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();
+                        }
+                        // Detect last line in the buffer
+                        else if (!node2->GetNext() && para->GetRange().Contains(container->GetOwnRange().GetEnd()))
+                        {
+                            // If deleting text, make sure we refresh below as well as above
+                            if (positionOffset >= 0)
+                            {
+                                foundEnd = true;
+                                lastY = pt.y + line->GetSize().y;
+                            }
+
+                            node2 = wxRichTextLineList::compatibility_iterator();
+                            node = wxRichTextObjectList::compatibility_iterator();
+
+                            break;
+                        }
+                        else
+                        {
+                            // 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;
+
+                                    node2 = wxRichTextLineList::compatibility_iterator();
+                                    node = wxRichTextObjectList::compatibility_iterator();
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (node2)
+                            node2 = node2->GetNext();
+                    }
+
+                    if (node)
+                        node = node->GetNext();
+                }
+
+                firstY = wxMax(firstVisiblePt.y, firstY);
+                if (!foundEnd)
+                    lastY = firstVisiblePt.y + clientSize.y;
+
+                // Convert to device coordinates
+                wxRect rect(m_ctrl->GetPhysicalPoint(m_ctrl->GetScaledPoint(wxPoint(firstVisiblePt.x, firstY))), m_ctrl->GetScaledSize(wxSize(clientSize.x, lastY - firstY)));
+                m_ctrl->RefreshRect(rect);
             }
-            wxTheClipboard->Close();
+            else
+#endif
+                m_ctrl->Refresh(false);
+
+            m_ctrl->PositionCaret();
+
+            // This causes styles to persist when doing programmatic
+            // content creation except when Freeze/Thaw is used, so
+            // disable this and check for the consequences.
+            // m_ctrl->SetDefaultStyleToCursorStyle();
+
+            if (sendUpdateEvent)
+                wxTextCtrl::SendTextUpdatedEvent(m_ctrl);
         }
     }
-#else
-    wxUnusedVar(position);
-#endif
-    return success;
 }
 
-/// Can we paste from the clipboard?
-bool wxRichTextBuffer::CanPasteFromClipboard() const
+/// Replace the buffer paragraphs with the new ones.
+void wxRichTextAction::ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment)
 {
-    bool canPaste = false;
-#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
-    if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
+    wxRichTextParagraphLayoutBox* container = GetContainer();
+    wxASSERT(container != NULL);
+    if (!container)
+        return;
+
+    wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst();
+    while (node)
     {
-        if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT) ||
-            wxTheClipboard->IsSupported(wxDataFormat(wxRichTextBufferDataObject::GetRichTextBufferFormatId())) ||
-            wxTheClipboard->IsSupported(wxDF_BITMAP))
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        // We'll replace the existing paragraph by finding the paragraph at this position,
+        // delete its node data, and setting a copy as the new node data.
+        // TODO: make more efficient by simply swapping old and new paragraph objects.
+
+        wxRichTextParagraph* existingPara = container->GetParagraphAtPosition(para->GetRange().GetStart());
+        if (existingPara)
         {
-            canPaste = true;
+            wxRichTextObjectList::compatibility_iterator bufferParaNode = container->GetChildren().Find(existingPara);
+            if (bufferParaNode)
+            {
+                wxRichTextParagraph* newPara = new wxRichTextParagraph(*para);
+                newPara->SetParent(container);
+
+                bufferParaNode->SetData(newPara);
+
+                delete existingPara;
+            }
         }
-        wxTheClipboard->Close();
+
+        node = node->GetNext();
     }
-#endif
-    return canPaste;
 }
 
-/// Dumps contents of buffer for debugging purposes
-void wxRichTextBuffer::Dump()
+
+/*!
+ * wxRichTextRange
+ * This stores beginning and end positions for a range of data.
+ */
+
+WX_DEFINE_OBJARRAY(wxRichTextRangeArray);
+
+/// Limit this range to be within 'range'
+bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
 {
-    wxString text;
-    {
-        wxStringOutputStream stream(& text);
-        wxTextOutputStream textStream(stream);
-        Dump(textStream);
-    }
+    if (m_start < range.m_start)
+        m_start = range.m_start;
 
-    wxLogDebug(text);
+    if (m_end > range.m_end)
+        m_end = range.m_end;
+
+    return true;
+}
+
+/*!
+ * wxRichTextImage implementation
+ * This object represents an image.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
+
+wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxRichTextAttr* charStyle):
+    wxRichTextObject(parent)
+{
+    Init();
+    m_imageBlock.MakeImageBlockDefaultQuality(image, wxBITMAP_TYPE_PNG);
+    if (charStyle)
+        SetAttributes(*charStyle);
+}
+
+wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxRichTextAttr* charStyle):
+    wxRichTextObject(parent)
+{
+    Init();
+    m_imageBlock = imageBlock;
+    if (charStyle)
+        SetAttributes(*charStyle);
 }
 
-/// Add an event handler
-bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler)
+void wxRichTextImage::Init()
 {
-    m_eventHandlers.Append(handler);
-    return true;
+    m_originalImageSize = wxSize(-1, -1);
 }
 
-/// Remove an event handler
-bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler)
+/// Create a cached image at the required size
+bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache)
 {
-    wxList::compatibility_iterator node = m_eventHandlers.Find(handler);
-    if (node)
+    if (!m_imageBlock.IsOk())
+        return false;
+
+    // If we have an original image size, use that to compute the cached bitmap size
+    // instead of loading the image each time. This way we can avoid loading
+    // the image so long as the new cached bitmap size hasn't changed.
+
+    wxImage image;
+    if (resetCache || m_originalImageSize == wxSize(-1, -1))
     {
-        m_eventHandlers.Erase(node);
-        if (deleteHandler)
-            delete handler;
-        
-        return true;
+        m_imageCache = wxNullBitmap;
+
+        m_imageBlock.Load(image);
+        if (!image.IsOk())
+            return false;
+
+        m_originalImageSize = wxSize(image.GetWidth(), image.GetHeight());
     }
-    else
-        return false;
-}
 
-/// Clear event handlers
-void wxRichTextBuffer::ClearEventHandlers()
-{
-    m_eventHandlers.Clear();
-}
+    int width = m_originalImageSize.GetWidth();
+    int height = m_originalImageSize.GetHeight();
 
-/// 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())
+    int parentWidth = 0;
+    int parentHeight = 0;
+
+    int maxWidth = -1;
+    int maxHeight = -1;
+
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer)
     {
-        wxEvtHandler* handler = (wxEvtHandler*) node->GetData();
-        if (handler->ProcessEvent(event))
+        wxSize sz;
+        if (buffer->GetRichTextCtrl())
         {
-            success = true;
-            if (!sendToAll)
-                return true;
+            // Subtract borders
+            sz = buffer->GetRichTextCtrl()->GetClientSize();
+
+            wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+            marginRect = wxRect(0, 0, sz.x, sz.y);
+            buffer->GetBoxRects(dc, buffer, buffer->GetAttributes(), marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+            sz = contentRect.GetSize();
+
+            // Start with a maximum width of the control size, even if not specified by the content,
+            // to minimize the amount of picture overlapping the right-hand side
+            maxWidth = sz.x;
         }
+        else
+            sz = buffer->GetCachedSize();
+        parentWidth = sz.GetWidth();
+        parentHeight = sz.GetHeight();
     }
-    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 (GetAttributes().GetTextBoxAttr().GetWidth().IsValid() && GetAttributes().GetTextBoxAttr().GetWidth().GetValue() > 0)
     {
-        if (sheet != oldSheet)
-            delete sheet;
-
-        return false;
+        if (parentWidth > 0 && GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+            width = (int) ((GetAttributes().GetTextBoxAttr().GetWidth().GetValue() * parentWidth)/100.0);
+        else if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+            width = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetWidth().GetValue());
+        else if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+            width = GetAttributes().GetTextBoxAttr().GetWidth().GetValue();
     }
 
-    if (oldSheet && oldSheet != sheet)
-        delete oldSheet;
+    // Limit to max width
 
-    SetStyleSheet(sheet);
+    if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().IsValid() && GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue() > 0)
+    {
+        int mw = -1;
 
-    event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED);
-    event.SetOldStyleSheet(NULL);
-    event.Allow();
+        if (parentWidth > 0 && GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+            mw = (int) ((GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue() * parentWidth)/100.0);
+        else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+            mw = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue());
+        else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+            mw = GetAttributes().GetTextBoxAttr().GetMaxSize().GetWidth().GetValue();
 
-    return SendEvent(event);
-}
+        // If we already have a smaller max width due to the constraints of the control size,
+        // don't use the larger max width.
+        if (mw != -1 && ((maxWidth == -1) || (mw < maxWidth)))
+            maxWidth = mw;
+    }
 
-/// Set renderer, deleting old one
-void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer)
-{
-    if (sm_renderer)
-        delete sm_renderer;
-    sm_renderer = renderer;
-}
+    if (maxWidth > 0 && width > maxWidth)
+        width = maxWidth;
 
-bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect)
-{
-    if (bulletAttr.GetTextColour().Ok())
+    // Preserve the aspect ratio
+    if (width != m_originalImageSize.GetWidth())
+        height = (int) (float(m_originalImageSize.GetHeight()) * (float(width)/float(m_originalImageSize.GetWidth())));
+
+    if (GetAttributes().GetTextBoxAttr().GetHeight().IsValid() && GetAttributes().GetTextBoxAttr().GetHeight().GetValue() > 0)
     {
-        dc.SetPen(wxPen(bulletAttr.GetTextColour()));
-        dc.SetBrush(wxBrush(bulletAttr.GetTextColour()));
+        if (parentHeight > 0 && GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+            height = (int) ((GetAttributes().GetTextBoxAttr().GetHeight().GetValue() * parentHeight)/100.0);
+        else if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+            height = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetHeight().GetValue());
+        else if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+            height = GetAttributes().GetTextBoxAttr().GetHeight().GetValue();
+
+        // Preserve the aspect ratio
+        if (height != m_originalImageSize.GetHeight())
+            width = (int) (float(m_originalImageSize.GetWidth()) * (float(height)/float(m_originalImageSize.GetHeight())));
     }
-    else
+
+    // Limit to max height
+
+    if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().IsValid() && GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue() > 0)
     {
-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetBrush(*wxBLACK_BRUSH);
+        if (parentHeight > 0 && GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+            maxHeight = (int) ((GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue() * parentHeight)/100.0);
+        else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+            maxHeight = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue());
+        else if (GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+            maxHeight = GetAttributes().GetTextBoxAttr().GetMaxSize().GetHeight().GetValue();
     }
 
-    wxFont font;
-    if (bulletAttr.GetFont().Ok())
-        font = bulletAttr.GetFont();
-    else
-        font = (*wxNORMAL_FONT);
-
-    dc.SetFont(font);
+    if (maxHeight > 0 && height > maxHeight)
+    {
+        height = maxHeight;
 
-    int charHeight = dc.GetCharHeight();
-                
-    int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion());
-    int bulletHeight = bulletWidth;
+        // Preserve the aspect ratio
+        if (height != m_originalImageSize.GetHeight())
+            width = (int) (float(m_originalImageSize.GetWidth()) * (float(height)/float(m_originalImageSize.GetHeight())));
+    }
 
-    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"))
+    if (m_imageCache.IsOk() && m_imageCache.GetWidth() == width && m_imageCache.GetHeight() == height)
     {
-        dc.DrawRectangle(x, y, bulletWidth, bulletHeight);
+        // Do nothing, we didn't need to change the image cache
     }
-    else if (bulletAttr.GetBulletName() == wxT("standard/diamond"))
+    else
     {
-        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);
+        if (!image.IsOk())
+        {
+            m_imageBlock.Load(image);
+            if (!image.IsOk())
+                return false;
+        }
+
+        if (image.GetWidth() == width && image.GetHeight() == height)
+            m_imageCache = wxBitmap(image);
+        else
+        {
+            // If the original width and height is small, e.g. 400 or below,
+            // scale up and then down to improve image quality. This can make
+            // a big difference, with not much performance hit.
+            int upscaleThreshold = 400;
+            wxImage img;
+            if (image.GetWidth() <= upscaleThreshold || image.GetHeight() <= upscaleThreshold)
+            {
+                img = image.Scale(image.GetWidth()*2, image.GetHeight()*2);
+                img.Rescale(width, height, wxIMAGE_QUALITY_HIGH);
+            }
+            else
+                img = image.Scale(width, height, wxIMAGE_QUALITY_HIGH);
+            m_imageCache = wxBitmap(img);
+        }
     }
-    else if (bulletAttr.GetBulletName() == wxT("standard/triangle"))
+
+    return m_imageCache.IsOk();
+}
+
+/// Draw the item
+bool wxRichTextImage::Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& WXUNUSED(range), const wxRichTextSelection& selection, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style))
+{
+    if (!IsShown())
+        return true;
+
+    // Don't need cached size AFAIK
+    // wxSize size = GetCachedSize();
+    if (!LoadImageCache(dc))
+        return false;
+
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, this);
+
+    DrawBoxAttributes(dc, GetBuffer(), attr, wxRect(rect.GetPosition(), GetCachedSize()));
+
+    wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+    wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+    marginRect = rect; // outer rectangle, will calculate contentRect
+    GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+    dc.DrawBitmap(m_imageCache, contentRect.x, contentRect.y, true);
+
+    if (selection.WithinSelection(GetRange().GetStart(), this))
     {
-        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);
+        wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+        wxCheckSetPen(dc, *wxBLACK_PEN);
+        dc.SetLogicalFunction(wxINVERT);
+        dc.DrawRectangle(contentRect);
+        dc.SetLogicalFunction(wxCOPY);
     }
-    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)
+/// Lay the item out
+bool wxRichTextImage::Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& WXUNUSED(parentRect), int WXUNUSED(style))
 {
-    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);
+    if (!LoadImageCache(dc))
+        return false;
 
-        dc.SetFont(font);
+    wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+    wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+    contentRect = wxRect(wxPoint(0,0), imageSize);
 
-        if (attr.GetTextColour().Ok())
-            dc.SetTextForeground(attr.GetTextColour());
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, this);
 
-        dc.SetBackgroundMode(wxTRANSPARENT);
+    GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
 
-        int charHeight = dc.GetCharHeight();
-        wxCoord tw, th;
-        dc.GetTextExtent(text, & tw, & th);
+    wxSize overallSize = marginRect.GetSize();
 
-        int x = rect.x;
+    SetCachedSize(overallSize);
+    SetMaxSize(overallSize);
+    SetMinSize(overallSize);
+    SetPosition(rect.GetPosition());
 
-        // Calculate the top position of the character (as opposed to the whole line height)
-        int y = rect.y + (rect.height - charHeight);    
+    return true;
+}
 
-        // 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;
+/// 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& dc, wxRichTextDrawingContext& context, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const
+{
+    if (!range.IsWithin(GetRange()))
+        return false;
 
-        dc.DrawText(text, x, y);
-        
-        return true;
-    }
-    else
+    if (!((wxRichTextImage*)this)->LoadImageCache(dc))
+    {
+        size.x = 0; size.y = 0;
+        if (partialExtents)
+            partialExtents->Add(0);
         return false;
+    }
+
+    wxRichTextAttr attr(GetAttributes());
+    context.ApplyVirtualAttributes(attr, (wxRichTextObject*) this);
+
+    wxSize imageSize(m_imageCache.GetWidth(), m_imageCache.GetHeight());
+    wxRect marginRect, borderRect, contentRect, paddingRect, outlineRect;
+    contentRect = wxRect(wxPoint(0,0), imageSize);
+    GetBoxRects(dc, GetBuffer(), attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+    wxSize overallSize = marginRect.GetSize();
+
+    if (partialExtents)
+        partialExtents->Add(overallSize.x);
+
+    size = overallSize;
+
+    return true;
 }
 
-bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect))
+// Get the 'natural' size for an object. For an image, it would be the
+// image size.
+wxTextAttrSize wxRichTextImage::GetNaturalSize() const
 {
-    // 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;
+    wxTextAttrSize size;
+    if (GetImageCache().IsOk())
+    {
+        size.SetWidth(GetImageCache().GetWidth(), wxTEXT_ATTR_UNITS_PIXELS);
+        size.SetHeight(GetImageCache().GetHeight(), wxTEXT_ATTR_UNITS_PIXELS);
+    }
+    return size;
 }
 
-/// Enumerate the standard bullet names currently supported
-bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)
+
+/// Copy
+void wxRichTextImage::Copy(const wxRichTextImage& obj)
 {
-    bulletNames.Add(wxT("standard/circle"));
-    bulletNames.Add(wxT("standard/square"));
-    bulletNames.Add(wxT("standard/diamond"));
-    bulletNames.Add(wxT("standard/triangle"));
+    wxRichTextObject::Copy(obj);
 
-    return true;
+    m_imageBlock = obj.m_imageBlock;
+    m_originalImageSize = obj.m_originalImageSize;
 }
 
-/*
- * Module to initialise and clean up handlers
- */
-
-class wxRichTextModule: public wxModule
+/// Edit properties via a GUI
+bool wxRichTextImage::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
 {
-DECLARE_DYNAMIC_CLASS(wxRichTextModule)
-public:
-    wxRichTextModule() {}
-    bool OnInit()
+    wxRichTextObjectPropertiesDialog imageDlg(this, wxGetTopLevelParent(parent), wxID_ANY, _("Picture Properties"));
+    imageDlg.SetAttributes(GetAttributes());
+
+    if (imageDlg.ShowModal() == wxID_OK)
     {
-        wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer);
-        wxRichTextBuffer::InitStandardHandlers();
-        wxRichTextParagraph::InitDefaultTabs();
+        // By passing wxRICHTEXT_SETSTYLE_RESET, indeterminate attributes set by the user will be set as
+        // indeterminate in the object.
+        imageDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
         return true;
-    };
-    void OnExit()
-    {
-        wxRichTextBuffer::CleanUpHandlers();
-        wxRichTextDecimalToRoman(-1);
-        wxRichTextParagraph::ClearDefaultTabs();
-        wxRichTextCtrl::ClearAvailableFontNames();
-        wxRichTextBuffer::SetRenderer(NULL);
-    };
-};
+    }
+    else
+        return false;
+}
 
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
+/*!
+ * Utilities
+ *
+ */
 
+/// Compare two attribute objects
+bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2)
+{
+    return (attr1 == attr2);
+}
+
+/// 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;
+}
 
-// 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()
+bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
 {
-    wxModule* module = new wxRichTextModule;
-    module->Init();
-    wxModule::RegisterModule(module);
+    return destStyle.Apply(style, compareWith);
 }
 
-
-/*!
- * Commands for undo/redo
- *
- */
-
-wxRichTextCommand::wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
-                                     wxRichTextCtrl* ctrl, bool ignoreFirstTime): wxCommand(true, name)
+// Remove attributes
+bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style)
 {
-    /* wxRichTextAction* action = */ new wxRichTextAction(this, name, id, buffer, ctrl, ignoreFirstTime);
+    return destStyle.RemoveStyle(style);
 }
 
-wxRichTextCommand::wxRichTextCommand(const wxString& name): wxCommand(true, name)
+/// Combine two bitlists, specifying the bits of interest with separate flags.
+bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
 {
+    return wxRichTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB);
 }
 
-wxRichTextCommand::~wxRichTextCommand()
+/// Compare two bitlists
+bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
 {
-    ClearActions();
+    return wxRichTextAttr::BitlistsEqPartial(valueA, valueB, flags);
 }
 
-void wxRichTextCommand::AddAction(wxRichTextAction* action)
+/// Split into paragraph and character styles
+bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle)
 {
-    if (!m_actions.Member(action))
-        m_actions.Append(action);
+    return wxRichTextAttr::SplitParaCharStyles(style, parStyle, charStyle);
 }
 
-bool wxRichTextCommand::Do()
+/// Convert a decimal to Roman numerals
+wxString wxRichTextDecimalToRoman(long n)
 {
-    for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext())
+    static wxArrayInt decimalNumbers;
+    static wxArrayString romanNumbers;
+
+    // Clean up arrays
+    if (n == -1)
     {
-        wxRichTextAction* action = (wxRichTextAction*) node->GetData();
-        action->Do();
+        decimalNumbers.Clear();
+        romanNumbers.Clear();
+        return wxEmptyString;
     }
 
-    return true;
-}
-
-bool wxRichTextCommand::Undo()
-{
-    for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious())
+    if (decimalNumbers.GetCount() == 0)
     {
-        wxRichTextAction* action = (wxRichTextAction*) node->GetData();
-        action->Undo();
+        #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"));
     }
 
-    return true;
-}
+    int i = 0;
+    wxString roman;
 
-void wxRichTextCommand::ClearActions()
-{
-    WX_CLEAR_LIST(wxList, m_actions);
+    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;
 }
 
 /*!
- * Individual action
- *
+ * wxRichTextFileHandler
+ * Base class for file handlers
  */
 
-wxRichTextAction::wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
-                                     wxRichTextCtrl* ctrl, bool ignoreFirstTime)
+IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
+
+#if wxUSE_FFILE && wxUSE_STREAMS
+bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
 {
-    m_buffer = buffer;
-    m_ignoreThis = ignoreFirstTime;
-    m_cmdId = id;
-    m_position = -1;
-    m_ctrl = ctrl;
-    m_name = name;
-    m_newParagraphs.SetDefaultStyle(buffer->GetDefaultStyle());
-    m_newParagraphs.SetBasicStyle(buffer->GetBasicStyle());
-    if (cmd)
-        cmd->AddAction(this);
+    wxFFileInputStream stream(filename);
+    if (stream.IsOk())
+        return LoadFile(buffer, stream);
+
+    return false;
 }
 
-wxRichTextAction::~wxRichTextAction()
+bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
 {
+    wxFFileOutputStream stream(filename);
+    if (stream.IsOk())
+        return SaveFile(buffer, stream);
+
+    return false;
 }
+#endif // wxUSE_FFILE && wxUSE_STREAMS
 
-bool wxRichTextAction::Do()
+/// Can we handle this filename (if using files)? By default, checks the extension.
+bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
 {
-    m_buffer->Modify(true);
-
-    switch (m_cmdId)
-    {
-    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;
+    wxString path, file, ext;
+    wxFileName::SplitPath(filename, & path, & file, & ext);
 
-#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);
-                        }
+    return (ext.Lower() == GetExtension());
+}
 
-                        if (node2)
-                            node2 = node2->GetNext();
-                    }
-                
-                    if (node)
-                        node = node->GetNext();
-                }
-            }            
-#endif
+/*!
+ * wxRichTextTextHandler
+ * Plain text handler
+ */
 
-            m_buffer->InsertFragment(GetPosition(), m_newParagraphs);
-            m_buffer->UpdateRanges();
-            m_buffer->Invalidate(GetRange());
+IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
 
-            long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();
+#if wxUSE_STREAMS
+bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+{
+    if (!stream.IsOk())
+        return false;
 
-            // Character position to caret position
-            newCaretPosition --;
+    wxString str;
+    int lastCh = 0;
 
-            // Don't take into account the last newline
-            if (m_newParagraphs.GetPartialParagraph())
-                newCaretPosition --;
-            else
-                if (m_newParagraphs.GetChildren().GetCount() > 1)
-                {
-                    wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData();
-                    if (p->GetRange().GetLength() == 1)
-                        newCaretPosition --;
-                }
+    while (!stream.Eof())
+    {
+        int ch = stream.GetC();
 
-            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));            
+        if (!stream.Eof())
+        {
+            if (ch == 10 && lastCh != 13)
+                str += wxT('\n');
 
-            if (optimizationLineCharPositions.GetCount() > 0)
-                UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
-            else
-                UpdateAppearance(newCaretPosition, true /* send update event */);
-            
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+            if (ch > 0 && ch != 10)
+                str += wxChar(ch);
 
-            break;
+            lastCh = ch;
         }
-    case wxRICHTEXT_DELETE:
-        {
-            m_buffer->DeleteRange(GetRange());
-            m_buffer->UpdateRanges();
-            m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+    }
 
-            UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
+    buffer->ResetAndClearCommands();
+    buffer->Clear();
+    buffer->AddParagraphs(str);
+    buffer->UpdateRanges();
 
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+    return true;
+}
 
-            break;
-        }
-    case wxRICHTEXT_CHANGE_STYLE:
-        {
-            ApplyParagraphs(GetNewParagraphs());
-            m_buffer->Invalidate(GetRange());
+bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
+{
+    if (!stream.IsOk())
+        return false;
 
-            UpdateAppearance(GetPosition());
+    wxString text = buffer->GetText();
 
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+    wxString newLine = wxRichTextLineBreakChar;
+    text.Replace(newLine, wxT("\n"));
 
-            break;
-        }
-    default:
-        break;
-    }
+    wxCharBuffer buf = text.ToAscii();
+
+    stream.Write((const char*) buf, text.length());
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+/*
+ * Stores information about an image, in binary in-memory form
+ */
+
+wxRichTextImageBlock::wxRichTextImageBlock()
+{
+    Init();
+}
+
+wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject()
+{
+    Init();
+    Copy(block);
+}
 
-    return true;
+wxRichTextImageBlock::~wxRichTextImageBlock()
+{
+    wxDELETEA(m_data);
 }
 
-bool wxRichTextAction::Undo()
+void wxRichTextImageBlock::Init()
 {
-    m_buffer->Modify(true);
+    m_data = NULL;
+    m_dataSize = 0;
+    m_imageType = wxBITMAP_TYPE_INVALID;
+}
 
-    switch (m_cmdId)
-    {
-    case wxRICHTEXT_INSERT:
-        {
-            m_buffer->DeleteRange(GetRange());
-            m_buffer->UpdateRanges();
-            m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
+void wxRichTextImageBlock::Clear()
+{
+    wxDELETEA(m_data);
+    m_dataSize = 0;
+    m_imageType = wxBITMAP_TYPE_INVALID;
+}
 
-            long newCaretPosition = GetPosition() - 1;
-            
-            UpdateAppearance(newCaretPosition, true /* send update event */);
 
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+// Load the original image into a memory block.
+// If the image is not a JPEG, we must convert it into a JPEG
+// to conserve space.
+// If it's not a JPEG we can make use of 'image', already scaled, so we don't have to
+// load the image a 2nd time.
 
-            break;
-        }
-    case wxRICHTEXT_DELETE:
-        {
-            m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
-            m_buffer->UpdateRanges();
-            m_buffer->Invalidate(GetRange());
+bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType,
+                                          wxImage& image, bool convertToJPEG)
+{
+    m_imageType = imageType;
 
-            UpdateAppearance(GetPosition(), true /* send update event */);
+    wxString filenameToRead(filename);
+    bool removeFile = false;
 
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+    if (imageType == wxBITMAP_TYPE_INVALID)
+        return false; // Could not determine image type
 
-            break;
-        }
-    case wxRICHTEXT_CHANGE_STYLE:
-        {
-            ApplyParagraphs(GetOldParagraphs());
-            m_buffer->Invalidate(GetRange());
+    if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
+    {
+        wxString tempFile =
+            wxFileName::CreateTempFileName(_("image"));
 
-            UpdateAppearance(GetPosition());
+        wxASSERT(!tempFile.IsEmpty());
 
-            wxRichTextEvent cmdEvent(
-                wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
-                m_ctrl ? m_ctrl->GetId() : -1);
-            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
-            cmdEvent.SetRange(GetRange());
-            cmdEvent.SetPosition(GetRange().GetStart());
-            
-            m_buffer->SendEvent(cmdEvent);
+        image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
+        filenameToRead = tempFile;
+        removeFile = true;
 
-            break;
-        }
-    default:
-        break;
+        m_imageType = wxBITMAP_TYPE_JPEG;
     }
+    wxFile file;
+    if (!file.Open(filenameToRead))
+        return false;
 
-    return true;
-}
+    m_dataSize = (size_t) file.Length();
+    file.Close();
 
-/// Update the control appearance
-void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions)
-{
-    if (m_ctrl)
-    {
-        m_ctrl->SetCaretPosition(caretPosition);
-        if (!m_ctrl->IsFrozen())
-        {
-            m_ctrl->LayoutContent();
-            m_ctrl->PositionCaret();
-            
-#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();
+    if (m_data)
+        delete[] m_data;
+    m_data = ReadBlock(filenameToRead, m_dataSize);
 
-                // 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;
-                            }
+    if (removeFile)
+        wxRemoveFile(filenameToRead);
 
-                            // 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;
+    return (m_data != NULL);
+}
 
-                                    node2 = wxRichTextLineList::compatibility_iterator();
-                                    node = wxRichTextObjectList::compatibility_iterator();
+// Make an image block from the wxImage in the given
+// format.
+bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality)
+{
+    image.SetOption(wxT("quality"), quality);
 
-                                    break;
-                                }                    
-                            }
-                        }
+    if (imageType == wxBITMAP_TYPE_INVALID)
+        return false; // Could not determine image type
 
-                        if (node2)
-                            node2 = node2->GetNext();
-                    }
-                
-                    if (node)
-                        node = node->GetNext();
-                }
-                
-                if (!foundStart)
-                    firstY = firstVisiblePt.y;
-                if (!foundEnd)
-                    lastY = firstVisiblePt.y + clientSize.y;
+    return DoMakeImageBlock(image, imageType);
+}
 
-                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);
+// Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG)
+bool wxRichTextImageBlock::MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType)
+{
+    if (imageType == wxBITMAP_TYPE_INVALID)
+        return false; // Could not determine image type
 
-            if (sendUpdateEvent)
-                m_ctrl->SendTextUpdatedEvent();
-        }
-    }
+    return DoMakeImageBlock(image, imageType);
 }
 
-/// Replace the buffer paragraphs with the new ones.
-void wxRichTextAction::ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment)
+// Makes the image block
+bool wxRichTextImageBlock::DoMakeImageBlock(const wxImage& image, wxBitmapType imageType)
 {
-    wxRichTextObjectList::compatibility_iterator node = fragment.GetChildren().GetFirst();
-    while (node)
+    wxMemoryOutputStream memStream;
+    if (!image.SaveFile(memStream, imageType))
     {
-        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (para != NULL);
-
-        // We'll replace the existing paragraph by finding the paragraph at this position,
-        // delete its node data, and setting a copy as the new node data.
-        // TODO: make more efficient by simply swapping old and new paragraph objects.
-
-        wxRichTextParagraph* existingPara = m_buffer->GetParagraphAtPosition(para->GetRange().GetStart());
-        if (existingPara)
-        {
-            wxRichTextObjectList::compatibility_iterator bufferParaNode = m_buffer->GetChildren().Find(existingPara);
-            if (bufferParaNode)
-            {
-                wxRichTextParagraph* newPara = new wxRichTextParagraph(*para);
-                newPara->SetParent(m_buffer);
-
-                bufferParaNode->SetData(newPara);
-
-                delete existingPara;
-            }
-        }
-
-        node = node->GetNext();
+        return false;
     }
-}
 
+    unsigned char* block = new unsigned char[memStream.GetSize()];
+    if (!block)
+        return false;
 
-/*!
- * wxRichTextRange
- * This stores beginning and end positions for a range of data.
- */
+    if (m_data)
+        delete[] m_data;
+    m_data = block;
 
-/// Limit this range to be within 'range'
-bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
-{
-    if (m_start < range.m_start)
-        m_start = range.m_start;
+    m_imageType = imageType;
+    m_dataSize = memStream.GetSize();
 
-    if (m_end > range.m_end)
-        m_end = range.m_end;
+    memStream.CopyTo(m_data, m_dataSize);
 
-    return true;
+    return (m_data != NULL);
 }
 
-/*!
- * wxRichTextImage implementation
- * This object represents an image.
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
-
-wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttrEx* charStyle):
-    wxRichTextObject(parent)
+// Write to a file
+bool wxRichTextImageBlock::Write(const wxString& filename)
 {
-    m_image = image;
-    if (charStyle)
-        SetAttributes(*charStyle);
+    return WriteBlock(filename, m_data, m_dataSize);
 }
 
-wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttrEx* charStyle):
-    wxRichTextObject(parent)
+void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block)
 {
-    m_imageBlock = imageBlock;
-    m_imageBlock.Load(m_image);
-    if (charStyle)
-        SetAttributes(*charStyle);
+    m_imageType = block.m_imageType;
+    wxDELETEA(m_data);
+    m_dataSize = block.m_dataSize;
+    if (m_dataSize == 0)
+        return;
+
+    m_data = new unsigned char[m_dataSize];
+    unsigned int i;
+    for (i = 0; i < m_dataSize; i++)
+        m_data[i] = block.m_data[i];
 }
 
-/// Load wxImage from the block
-bool wxRichTextImage::LoadFromBlock()
+//// Operators
+void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block)
 {
-    m_imageBlock.Load(m_image);
-    return m_imageBlock.Ok();
+    Copy(block);
 }
 
-/// Make block from the wxImage
-bool wxRichTextImage::MakeBlock()
+// Load a wxImage from the block
+bool wxRichTextImageBlock::Load(wxImage& image)
 {
-    if (m_imageBlock.GetImageType() == wxBITMAP_TYPE_ANY || m_imageBlock.GetImageType() == -1)
-        m_imageBlock.SetImageType(wxBITMAP_TYPE_PNG);
+    if (!m_data)
+        return false;
+
+    // Read in the image.
+#if wxUSE_STREAMS
+    wxMemoryInputStream mstream(m_data, m_dataSize);
+    bool success = image.LoadFile(mstream, GetImageType());
+#else
+    wxString tempFile = wxFileName::CreateTempFileName(_("image"));
+    wxASSERT(!tempFile.IsEmpty());
+
+    if (!WriteBlock(tempFile, m_data, m_dataSize))
+    {
+        return false;
+    }
+    success = image.LoadFile(tempFile, GetImageType());
+    wxRemoveFile(tempFile);
+#endif
 
-    m_imageBlock.MakeImageBlock(m_image, m_imageBlock.GetImageType());
-    return m_imageBlock.Ok();
+    return success;
 }
 
-
-/// Draw the item
-bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int WXUNUSED(descent), int WXUNUSED(style))
+// Write data in hex to a stream
+bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
 {
-    if (!m_image.Ok() && m_imageBlock.Ok())
-        LoadFromBlock();
-
-    if (!m_image.Ok())
-        return false;
+    if (m_dataSize == 0)
+        return true;
 
-    if (m_image.Ok() && !m_bitmap.Ok())
-        m_bitmap = wxBitmap(m_image);
+    int bufSize = 100000;
+    if (int(2*m_dataSize) < bufSize)
+        bufSize = 2*m_dataSize;
+    char* buf = new char[bufSize+1];
 
-    int y = rect.y + (rect.height - m_image.GetHeight());
+    int left = m_dataSize;
+    int n, i, j;
+    j = 0;
+    while (left > 0)
+    {
+        if (left*2 > bufSize)
+        {
+            n = bufSize; left -= (bufSize/2);
+        }
+        else
+        {
+            n = left*2; left = 0;
+        }
 
-    if (m_bitmap.Ok())
-        dc.DrawBitmap(m_bitmap, rect.x, y, true);
+        char* b = buf;
+        for (i = 0; i < (n/2); i++)
+        {
+            wxDecToHex(m_data[j], b, b+1);
+            b += 2; j ++;
+        }
 
-    if (selectionRange.Contains(range.GetStart()))
-    {
-        dc.SetBrush(*wxBLACK_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetLogicalFunction(wxINVERT);
-        dc.DrawRectangle(rect);
-        dc.SetLogicalFunction(wxCOPY);
+        buf[n] = 0;
+        stream.Write((const char*) buf, n);
     }
-
+    delete[] buf;
     return true;
 }
 
-/// Lay the item out
-bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style))
+// Read data in hex from a stream
+bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType)
 {
-    if (!m_image.Ok())
-        LoadFromBlock();
+    int dataSize = length/2;
 
-    if (m_image.Ok())
+    if (m_data)
+        delete[] m_data;
+
+    // create a null terminated temporary string:
+    char str[3];
+    str[2] = '\0';
+
+    m_data = new unsigned char[dataSize];
+    int i;
+    for (i = 0; i < dataSize; i ++)
     {
-        SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight()));
-        SetPosition(rect.GetPosition());
+        str[0] = (char)stream.GetC();
+        str[1] = (char)stream.GetC();
+
+        m_data[i] = (unsigned char)wxHexToDec(str);
     }
 
+    m_dataSize = dataSize;
+    m_imageType = imageType;
+
     return true;
 }
 
-/// 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), wxPoint WXUNUSED(position)) const
+// Allocate and read from stream as a block of memory
+unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)
 {
-    if (!range.IsWithin(GetRange()))
-        return false;
-
-    if (!m_image.Ok())
-        return false;
+    unsigned char* block = new unsigned char[size];
+    if (!block)
+        return NULL;
 
-    size.x = m_image.GetWidth();
-    size.y = m_image.GetHeight();
+    stream.Read(block, size);
 
-    return true;
+    return block;
 }
 
-/// Copy
-void wxRichTextImage::Copy(const wxRichTextImage& obj)
+unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size)
 {
-    wxRichTextObject::Copy(obj);
+    wxFileInputStream stream(filename);
+    if (!stream.IsOk())
+        return NULL;
 
-    m_image = obj.m_image;
-    m_imageBlock = obj.m_imageBlock;
+    return ReadBlock(stream, size);
 }
 
-/*!
- * Utilities
- *
- */
-
-/// Compare two attribute objects
-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
+// Write memory block to stream
+bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size)
 {
-    return (attr1 == attr2);
+    stream.Write((void*) block, size);
+    return stream.IsOk();
+
 }
 
-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
+// Write memory block to file
+bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size)
 {
-    return (
-        attr1.GetTextColour() == attr2.GetTextColour() &&
-        attr1.GetBackgroundColour() == attr2.GetBackgroundColour() &&
-        attr1.GetFont().GetPointSize() == attr2.GetFontSize() &&
-        attr1.GetFont().GetStyle() == attr2.GetFontStyle() &&
-        attr1.GetFont().GetWeight() == attr2.GetFontWeight() &&
-        attr1.GetFont().GetFaceName() == attr2.GetFontFaceName() &&
-        attr1.GetFont().GetUnderlined() == attr2.GetFontUnderlined() &&
-        attr1.GetTextEffects() == attr2.GetTextEffects() &&
-        attr1.GetTextEffectFlags() == attr2.GetTextEffectFlags() &&
-        attr1.GetAlignment() == attr2.GetAlignment() &&
-        attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
-        attr1.GetRightIndent() == attr2.GetRightIndent() &&
-        attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&
-        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.GetBulletText() == attr2.GetBulletText() &&
-        attr1.GetBulletName() == attr2.GetBulletName() &&
-        attr1.GetBulletFont() == attr2.GetBulletFont() &&
-        attr1.GetOutlineLevel() == attr2.GetOutlineLevel() &&
-        attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
-        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() &&
-        attr1.GetListStyleName() == attr2.GetListStyleName() &&
-        attr1.HasPageBreak() == attr2.HasPageBreak());
-}
-
-/// Compare two attribute objects, but take into account the flags
-/// specifying attributes of interest.
-bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, int flags)
-{
-    if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetFaceName() != attr2.GetFont().GetFaceName())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetPointSize() != attr2.GetFont().GetPointSize())
+    wxFileOutputStream outStream(filename);
+    if (!outStream.IsOk())
         return false;
 
-    if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetWeight() != attr2.GetFont().GetWeight())
-        return false;
+    return WriteBlock(outStream, block, size);
+}
 
-    if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetStyle() != attr2.GetFont().GetStyle())
-        return false;
+// 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 ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined())
-        return false;
+#if wxUSE_DATAOBJ
 
-    if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
-        return false;
+/*!
+ * The data object for a wxRichTextBuffer
+ */
 
-    if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
-        ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
-        return false;
+const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape");
 
-    if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
-        (attr1.GetRightIndent() != attr2.GetRightIndent()))
-        return false;
+wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer)
+{
+    m_richTextBuffer = richTextBuffer;
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
-        (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
-        return false;
+    // this string should uniquely identify our format, but is otherwise
+    // arbitrary
+    m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId());
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
-        (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
-        return false;
+    SetFormat(m_formatRichTextBuffer);
+}
 
-    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
-        (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
-        return false;
+wxRichTextBufferDataObject::~wxRichTextBufferDataObject()
+{
+    delete m_richTextBuffer;
+}
 
-    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
-        (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
-        return false;
+// 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;
 
-    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
-        (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
-        return false;
+    return richTextBuffer;
+}
 
-    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
-        (attr1.GetListStyleName() != attr2.GetListStyleName()))
-        return false;
+wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
+{
+    return m_formatRichTextBuffer;
+}
 
-    if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
-        (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
-         return false;
+size_t wxRichTextBufferDataObject::GetDataSize() const
+{
+    if (!m_richTextBuffer)
+        return 0;
 
-    if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
-        (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
-         return false;
+    wxString bufXML;
 
-    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
-        (attr1.GetBulletText() != attr2.GetBulletText()) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
-         return false;
+    {
+        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 ((flags & wxTEXT_ATTR_BULLET_NAME) &&
-        (attr1.GetBulletName() != attr2.GetBulletName()))
-         return false;
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
+    return strlen(buffer) + 1;
+#else
+    return bufXML.Length()+1;
+#endif
+}
 
-    if ((flags & wxTEXT_ATTR_TABS) &&
-        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))
+bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const
+{
+    if (!pBuf || !m_richTextBuffer)
         return false;
 
-    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
-        (attr1.HasPageBreak() != attr2.HasPageBreak()))
-         return false;
+    wxString bufXML;
 
-    if (flags & wxTEXT_ATTR_EFFECTS)
     {
-        if (attr1.HasTextEffects() != attr2.HasTextEffects())
-            return false;
-        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
-            return false;
+        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 ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
-        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
-         return false;
+#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 wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, int flags)
+bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
-    if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour())
-        return false;
+    wxDELETE(m_richTextBuffer);
 
-    if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour())
-        return false;
+    wxString bufXML((const char*) buf, wxConvUTF8);
 
-    if ((flags & (wxTEXT_ATTR_FONT)) && !attr1.GetFont().Ok())
-        return false;
+    m_richTextBuffer = new wxRichTextBuffer;
 
-    if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetFaceName() != attr2.GetFontFaceName())
-        return false;
+    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."));
 
-    if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetPointSize() != attr2.GetFontSize())
-        return false;
+        wxDELETE(m_richTextBuffer);
 
-    if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetWeight() != attr2.GetFontWeight())
         return false;
+    }
+    return true;
+}
 
-    if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetStyle() != attr2.GetFontStyle())
-        return false;
+#endif
+    // wxUSE_DATAOBJ
 
-    if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined())
-        return false;
 
-    if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
-        return false;
+/*
+ * wxRichTextFontTable
+ * Manages quick access to a pool of fonts for rendering rich text
+ */
 
-    if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
-        ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
-        return false;
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxFont, wxRichTextFontTableHashMap, class WXDLLIMPEXP_RICHTEXT);
 
-    if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
-        (attr1.GetRightIndent() != attr2.GetRightIndent()))
-        return false;
+class wxRichTextFontTableData: public wxObjectRefData
+{
+public:
+    wxRichTextFontTableData() {}
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
-        (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
-        return false;
+    wxFont FindFont(const wxRichTextAttr& fontSpec, double fontScale);
 
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
-        (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
-        return false;
+    wxRichTextFontTableHashMap  m_hashMap;
+};
 
-    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
-        (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
-        return false;
+wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec, double fontScale)
+{
+    wxString facename(fontSpec.GetFontFaceName());
 
-    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
-        (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
-        return false;
+    int fontSize = fontSpec.GetFontSize();
+    if (fontScale != 1.0)
+        fontSize = (int) ((double(fontSize) * fontScale) + 0.5);
 
-    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
-        (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
-        return false;
+    wxString units;
+    if (fontSpec.HasFontPixelSize() && !fontSpec.HasFontPointSize())
+        units = wxT("px");
+    else
+        units = wxT("pt");
+    wxString spec = wxString::Format(wxT("%d-%s-%d-%d-%d-%d-%s-%d"),
+        fontSize, units.c_str(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), (int) fontSpec.GetFontStrikethrough(),
+        facename.c_str(), (int) fontSpec.GetFontEncoding());
 
-    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
-        (attr1.GetListStyleName() != attr2.GetListStyleName()))
-        return false;
+    wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec);
+    if ( entry == m_hashMap.end() )
+    {
+        if (fontSpec.HasFontPixelSize() && !fontSpec.HasFontPointSize())
+        {
+            wxFont font(wxSize(0, fontSize), wxFONTFAMILY_DEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename);
+            if (fontSpec.HasFontStrikethrough() && fontSpec.GetFontStrikethrough())
+                font.SetStrikethrough(true);
+            m_hashMap[spec] = font;
+            return font;
+        }
+        else
+        {
+            wxFont font(fontSize, wxFONTFAMILY_DEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str());
+            if (fontSpec.HasFontStrikethrough() && fontSpec.GetFontStrikethrough())
+                font.SetStrikethrough(true);
 
-    if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
-        (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
-         return false;
+            m_hashMap[spec] = font;
+            return font;
+        }
+    }
+    else
+    {
+        return entry->second;
+    }
+}
 
-    if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
-        (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
-         return false;
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject)
 
-    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
-        (attr1.GetBulletText() != attr2.GetBulletText()) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
-         return false;
+wxRichTextFontTable::wxRichTextFontTable()
+{
+    m_refData = new wxRichTextFontTableData;
+    m_fontScale = 1.0;
+}
 
-    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
-        (attr1.GetBulletName() != attr2.GetBulletName()))
-         return false;
+wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table)
+    : wxObject()
+{
+    (*this) = table;
+}
 
-    if ((flags & wxTEXT_ATTR_TABS) &&
-        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))
-        return false;
+wxRichTextFontTable::~wxRichTextFontTable()
+{
+    UnRef();
+}
 
-    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
-        (attr1.HasPageBreak() != attr2.HasPageBreak()))
-         return false;
+bool wxRichTextFontTable::operator == (const wxRichTextFontTable& table) const
+{
+    return (m_refData == table.m_refData);
+}
 
-    if (flags & wxTEXT_ATTR_EFFECTS)
-    {
-        if (attr1.HasTextEffects() != attr2.HasTextEffects())
-            return false;
-        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
-            return false;
-    }
+void wxRichTextFontTable::operator= (const wxRichTextFontTable& table)
+{
+    Ref(table);
+    m_fontScale = table.m_fontScale;
+}
 
-    if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
-        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
-         return false;
+wxFont wxRichTextFontTable::FindFont(const wxRichTextAttr& fontSpec)
+{
+    wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+    if (data)
+        return data->FindFont(fontSpec, m_fontScale);
+    else
+        return wxFont();
+}
 
-    return true;
+void wxRichTextFontTable::Clear()
+{
+    wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+    if (data)
+        data->m_hashMap.clear();
 }
 
-/// Compare tabs
-bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
+void wxRichTextFontTable::SetFontScale(double fontScale)
 {
-    if (tabs1.GetCount() != tabs2.GetCount())
-        return false;
+    if (fontScale != m_fontScale)
+        Clear();
+    m_fontScale = fontScale;
+}
 
-    size_t i;
-    for (i = 0; i < tabs1.GetCount(); i++)
-    {
-        if (tabs1[i] != tabs2[i])
-            return false;
-    }
-    return true;
+// wxTextBoxAttr
+
+void wxTextBoxAttr::Reset()
+{
+    m_flags = 0;
+    m_floatMode = wxTEXT_BOX_ATTR_FLOAT_NONE;
+    m_clearMode = wxTEXT_BOX_ATTR_CLEAR_NONE;
+    m_collapseMode = wxTEXT_BOX_ATTR_COLLAPSE_NONE;
+    m_verticalAlignment = wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE;
+    m_boxStyleName = wxEmptyString;
+
+    m_margins.Reset();
+    m_padding.Reset();
+    m_position.Reset();
+
+    m_size.Reset();
+    m_minSize.Reset();
+    m_maxSize.Reset();
+
+    m_border.Reset();
+    m_outline.Reset();
 }
 
-/// Apply one style to another
-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
+// Equality test
+bool wxTextBoxAttr::operator== (const wxTextBoxAttr& attr) const
 {
-    // Whole font
-    if (style.GetFont().Ok() && ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)))
-        destStyle.SetFont(style.GetFont());
-    else if (style.GetFont().Ok())
-    {
-        wxFont font = destStyle.GetFont();
+    return (
+        m_flags == attr.m_flags &&
+        m_floatMode == attr.m_floatMode &&
+        m_clearMode == attr.m_clearMode &&
+        m_collapseMode == attr.m_collapseMode &&
+        m_verticalAlignment == attr.m_verticalAlignment &&
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
-            font.SetFaceName(style.GetFont().GetFaceName());
-        }
+        m_margins == attr.m_margins &&
+        m_padding == attr.m_padding &&
+        m_position == attr.m_position &&
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-            font.SetPointSize(style.GetFont().GetPointSize());
-        }
+        m_size == attr.m_size &&
+        m_minSize == attr.m_minSize &&
+        m_maxSize == attr.m_maxSize &&
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
-            font.SetStyle(style.GetFont().GetStyle());
-        }
+        m_border == attr.m_border &&
+        m_outline == attr.m_outline &&
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
-            font.SetWeight(style.GetFont().GetWeight());
-        }
+        m_boxStyleName == attr.m_boxStyleName
+        );
+}
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
-            font.SetUnderlined(style.GetFont().GetUnderlined());
-        }
+// Partial equality test
+bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr, bool weakTest) const
+{
+    if (!weakTest &&
+            ((!HasFloatMode() && attr.HasFloatMode()) ||
+             (!HasClearMode() && attr.HasClearMode()) ||
+             (!HasCollapseBorders() && attr.HasCollapseBorders()) ||
+             (!HasVerticalAlignment() && attr.HasVerticalAlignment()) ||
+             (!HasBoxStyleName() && attr.HasBoxStyleName())))
+    {
+        return false;
+    }
+    if (attr.HasFloatMode() && HasFloatMode() && (GetFloatMode() != attr.GetFloatMode()))
+        return false;
 
-        if (font != destStyle.GetFont())
-        {
-            int oldFlags = destStyle.GetFlags();
+    if (attr.HasClearMode() && HasClearMode() && (GetClearMode() != attr.GetClearMode()))
+        return false;
 
-            destStyle.SetFont(font);
+    if (attr.HasCollapseBorders() && HasCollapseBorders() && (attr.GetCollapseBorders() != GetCollapseBorders()))
+        return false;
 
-            destStyle.SetFlags(oldFlags);
-        }
-    }
+    if (attr.HasVerticalAlignment() && HasVerticalAlignment() && (attr.GetVerticalAlignment() != GetVerticalAlignment()))
+        return false;
 
-    if ( style.GetTextColour().Ok() && style.HasTextColour())
-        destStyle.SetTextColour(style.GetTextColour());
+    if (attr.HasBoxStyleName() && HasBoxStyleName() && (attr.GetBoxStyleName() != GetBoxStyleName()))
+        return false;
+
+    // Position
 
-    if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-        destStyle.SetBackgroundColour(style.GetBackgroundColour());
+    if (!m_position.EqPartial(attr.m_position, weakTest))
+        return false;
 
-    if (style.HasAlignment())
-        destStyle.SetAlignment(style.GetAlignment());
+    // Size
 
-    if (style.HasTabs())
-        destStyle.SetTabs(style.GetTabs());
+    if (!m_size.EqPartial(attr.m_size, weakTest))
+        return false;
+    if (!m_minSize.EqPartial(attr.m_minSize, weakTest))
+        return false;
+    if (!m_maxSize.EqPartial(attr.m_maxSize, weakTest))
+        return false;
 
-    if (style.HasLeftIndent())
-        destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    // Margins
 
-    if (style.HasRightIndent())
-        destStyle.SetRightIndent(style.GetRightIndent());
+    if (!m_margins.EqPartial(attr.m_margins, weakTest))
+        return false;
 
-    if (style.HasParagraphSpacingAfter())
-        destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    // Padding
 
-    if (style.HasParagraphSpacingBefore())
-        destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    if (!m_padding.EqPartial(attr.m_padding, weakTest))
+        return false;
 
-    if (style.HasLineSpacing())
-        destStyle.SetLineSpacing(style.GetLineSpacing());
+    // Border
 
-    if (style.HasCharacterStyleName())
-        destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+    if (!GetBorder().EqPartial(attr.GetBorder(), weakTest))
+        return false;
 
-    if (style.HasParagraphStyleName())
-        destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    // Outline
 
-    if (style.HasListStyleName())
-        destStyle.SetListStyleName(style.GetListStyleName());
+    if (!GetOutline().EqPartial(attr.GetOutline(), weakTest))
+        return false;
 
-    if (style.HasBulletStyle())
-        destStyle.SetBulletStyle(style.GetBulletStyle());
+    return true;
+}
 
-    if (style.HasBulletText())
+// Merges the given attributes. If compareWith
+// is non-NULL, then it will be used to mask out those attributes that are the same in style
+// and compareWith, for situations where we don't want to explicitly set inherited attributes.
+bool wxTextBoxAttr::Apply(const wxTextBoxAttr& attr, const wxTextBoxAttr* compareWith)
+{
+    if (attr.HasFloatMode())
     {
-        destStyle.SetBulletText(style.GetBulletText());
-        destStyle.SetBulletFont(style.GetBulletFont());
+        if (!(compareWith && compareWith->HasFloatMode() && compareWith->GetFloatMode() == attr.GetFloatMode()))
+            SetFloatMode(attr.GetFloatMode());
     }
 
-    if (style.HasBulletName())
-        destStyle.SetBulletName(style.GetBulletName());
-
-    if (style.HasBulletNumber())
-        destStyle.SetBulletNumber(style.GetBulletNumber());
-
-    if (style.HasURL())
-        destStyle.SetURL(style.GetURL());
+    if (attr.HasClearMode())
+    {
+        if (!(compareWith && compareWith->HasClearMode() && compareWith->GetClearMode() == attr.GetClearMode()))
+            SetClearMode(attr.GetClearMode());
+    }
 
-    if (style.HasPageBreak())
-        destStyle.SetPageBreak();
+    if (attr.HasCollapseBorders())
+    {
+        if (!(compareWith && compareWith->HasCollapseBorders() && compareWith->GetCollapseBorders() == attr.GetCollapseBorders()))
+            SetCollapseBorders(attr.GetCollapseBorders());
+    }
 
-    if (style.HasTextEffects())
+    if (attr.HasVerticalAlignment())
     {
-        int destBits = destStyle.GetTextEffects();
-        int destFlags = destStyle.GetTextEffectFlags();
+        if (!(compareWith && compareWith->HasVerticalAlignment() && compareWith->GetVerticalAlignment() == attr.GetVerticalAlignment()))
+            SetVerticalAlignment(attr.GetVerticalAlignment());
+    }
 
-        int srcBits = style.GetTextEffects();
-        int srcFlags = style.GetTextEffectFlags();
-            
-        wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
-        destStyle.SetTextEffects(destBits);
-        destStyle.SetTextEffectFlags(destFlags);
+    if (attr.HasBoxStyleName())
+    {
+        if (!(compareWith && compareWith->HasBoxStyleName() && compareWith->GetBoxStyleName() == attr.GetBoxStyleName()))
+            SetBoxStyleName(attr.GetBoxStyleName());
     }
 
-    if (style.HasOutlineLevel())
-        destStyle.SetOutlineLevel(style.GetOutlineLevel());
+    m_margins.Apply(attr.m_margins, compareWith ? (& attr.m_margins) : (const wxTextAttrDimensions*) NULL);
+    m_padding.Apply(attr.m_padding, compareWith ? (& attr.m_padding) : (const wxTextAttrDimensions*) NULL);
+    m_position.Apply(attr.m_position, compareWith ? (& attr.m_position) : (const wxTextAttrDimensions*) NULL);
 
-    return true;
-}
+    m_size.Apply(attr.m_size, compareWith ? (& attr.m_size) : (const wxTextAttrSize*) NULL);
+    m_minSize.Apply(attr.m_minSize, compareWith ? (& attr.m_minSize) : (const wxTextAttrSize*) NULL);
+    m_maxSize.Apply(attr.m_maxSize, compareWith ? (& attr.m_maxSize) : (const wxTextAttrSize*) NULL);
+
+    m_border.Apply(attr.m_border, compareWith ? (& attr.m_border) : (const wxTextAttrBorders*) NULL);
+    m_outline.Apply(attr.m_outline, compareWith ? (& attr.m_outline) : (const wxTextAttrBorders*) NULL);
 
-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
-{
-    wxTextAttrEx destStyle2 = destStyle;
-    wxRichTextApplyStyle(destStyle2, style);
-    destStyle = destStyle2;
     return true;
 }
 
-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+// Remove specified attributes from this object
+bool wxTextBoxAttr::RemoveStyle(const wxTextBoxAttr& attr)
 {
-    destStyle = destStyle.Combine(style, compareWith);
+    if (attr.HasFloatMode())
+        RemoveFlag(wxTEXT_BOX_ATTR_FLOAT);
+
+    if (attr.HasClearMode())
+        RemoveFlag(wxTEXT_BOX_ATTR_CLEAR);
+
+    if (attr.HasCollapseBorders())
+        RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+
+    if (attr.HasVerticalAlignment())
+        RemoveFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+
+    if (attr.HasBoxStyleName())
+    {
+        SetBoxStyleName(wxEmptyString);
+        RemoveFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+    }
+
+    m_margins.RemoveStyle(attr.m_margins);
+    m_padding.RemoveStyle(attr.m_padding);
+    m_position.RemoveStyle(attr.m_position);
+
+    m_size.RemoveStyle(attr.m_size);
+    m_minSize.RemoveStyle(attr.m_minSize);
+    m_maxSize.RemoveStyle(attr.m_maxSize);
+
+    m_border.RemoveStyle(attr.m_border);
+    m_outline.RemoveStyle(attr.m_outline);
+
     return true;
 }
 
-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextBoxAttr::CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBoxAttr& clashingAttr, wxTextBoxAttr& absentAttr)
 {
-    // Whole font. Avoiding setting individual attributes if possible, since
-    // it recreates the font each time.
-    if (((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) && !compareWith)
+    if (attr.HasFloatMode())
     {
-        destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT,
-            style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName()));
-    }
-    else if (style.GetFlags() & (wxTEXT_ATTR_FONT))
-    {
-        wxFont font = destStyle.GetFont();
-
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
+        if (!clashingAttr.HasFloatMode() && !absentAttr.HasFloatMode())
         {
-            if (compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())
+            if (HasFloatMode())
             {
-                // The same as currently displayed, so don't set
+                if (GetFloatMode() != attr.GetFloatMode())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT);
+                    RemoveFlag(wxTEXT_BOX_ATTR_FLOAT);
+                }
             }
             else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
-                font.SetFaceName(style.GetFontFaceName());
-            }
+                SetFloatMode(attr.GetFloatMode());
         }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT);
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
+    if (attr.HasClearMode())
+    {
+        if (!clashingAttr.HasClearMode() && !absentAttr.HasClearMode())
         {
-            if (compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize())
+            if (HasClearMode())
             {
-                // The same as currently displayed, so don't set
+                if (GetClearMode() != attr.GetClearMode())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR);
+                    RemoveFlag(wxTEXT_BOX_ATTR_CLEAR);
+                }
             }
             else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-                font.SetPointSize(style.GetFontSize());
-            }
+                SetClearMode(attr.GetClearMode());
         }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR);
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
+    if (attr.HasCollapseBorders())
+    {
+        if (!clashingAttr.HasCollapseBorders() && !absentAttr.HasCollapseBorders())
         {
-            if (compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle())
+            if (HasCollapseBorders())
             {
-                // The same as currently displayed, so don't set
+                if (GetCollapseBorders() != attr.GetCollapseBorders())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+                    RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+                }
             }
             else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
-                font.SetStyle(style.GetFontStyle());
-            }
+                SetCollapseBorders(attr.GetCollapseBorders());
         }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
+    if (attr.HasVerticalAlignment())
+    {
+        if (!clashingAttr.HasVerticalAlignment() && !absentAttr.HasVerticalAlignment())
         {
-            if (compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight())
+            if (HasVerticalAlignment())
             {
-                // The same as currently displayed, so don't set
+                if (GetVerticalAlignment() != attr.GetVerticalAlignment())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+                    RemoveFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
+                }
             }
             else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
-                font.SetWeight(style.GetFontWeight());
-            }
+                SetVerticalAlignment(attr.GetVerticalAlignment());
         }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT);
 
-        if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
+    if (attr.HasBoxStyleName())
+    {
+        if (!clashingAttr.HasBoxStyleName() && !absentAttr.HasBoxStyleName())
         {
-            if (compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())
+            if (HasBoxStyleName())
             {
-                // The same as currently displayed, so don't set
+                if (GetBoxStyleName() != attr.GetBoxStyleName())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+                    RemoveFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
+                }
             }
             else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
-                font.SetUnderlined(style.GetFontUnderlined());
-            }
+                SetBoxStyleName(attr.GetBoxStyleName());
         }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME);
 
-        if (font != destStyle.GetFont())
-        {
-            int oldFlags = destStyle.GetFlags();
+    m_margins.CollectCommonAttributes(attr.m_margins, clashingAttr.m_margins, absentAttr.m_margins);
+    m_padding.CollectCommonAttributes(attr.m_padding, clashingAttr.m_padding, absentAttr.m_padding);
+    m_position.CollectCommonAttributes(attr.m_position, clashingAttr.m_position, absentAttr.m_position);
 
-            destStyle.SetFont(font);
+    m_size.CollectCommonAttributes(attr.m_size, clashingAttr.m_size, absentAttr.m_size);
+    m_minSize.CollectCommonAttributes(attr.m_minSize, clashingAttr.m_minSize, absentAttr.m_minSize);
+    m_maxSize.CollectCommonAttributes(attr.m_maxSize, clashingAttr.m_maxSize, absentAttr.m_maxSize);
 
-            destStyle.SetFlags(oldFlags);
-        }
-    }
+    m_border.CollectCommonAttributes(attr.m_border, clashingAttr.m_border, absentAttr.m_border);
+    m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline);
+}
 
-    if (style.GetTextColour().Ok() && style.HasTextColour())
-    {
-        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
-            destStyle.SetTextColour(style.GetTextColour());
-    }
+bool wxTextBoxAttr::IsDefault() const
+{
+    return GetFlags() == 0 && !m_border.IsValid() && !m_outline.IsValid() &&
+        !m_size.IsValid() && !m_minSize.IsValid() && !m_maxSize.IsValid() &&
+        !m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid();
+}
 
-    if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-    {
-        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
-            destStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
+// wxRichTextAttr
 
-    if (style.HasAlignment())
-    {
-        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
-            destStyle.SetAlignment(style.GetAlignment());
-    }
+void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
+{
+    wxTextAttr::Copy(attr);
 
-    if (style.HasTabs())
-    {
-        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
-            destStyle.SetTabs(style.GetTabs());
-    }
+    m_textBoxAttr = attr.m_textBoxAttr;
+}
 
-    if (style.HasLeftIndent())
-    {
-        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
-                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
-            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
+bool wxRichTextAttr::operator==(const wxRichTextAttr& attr) const
+{
+    if (!(wxTextAttr::operator==(attr)))
+        return false;
 
-    if (style.HasRightIndent())
-    {
-        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
-            destStyle.SetRightIndent(style.GetRightIndent());
-    }
+    return (m_textBoxAttr == attr.m_textBoxAttr);
+}
 
-    if (style.HasParagraphSpacingAfter())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
-            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
-    }
+// Partial equality test
+bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr, bool weakTest) const
+{
+    if (!(wxTextAttr::EqPartial(attr, weakTest)))
+        return false;
 
-    if (style.HasParagraphSpacingBefore())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
-            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
-    }
+    return m_textBoxAttr.EqPartial(attr.m_textBoxAttr, weakTest);
+}
 
-    if (style.HasLineSpacing())
-    {
-        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
-            destStyle.SetLineSpacing(style.GetLineSpacing());
-    }
+// Merges the given attributes. If compareWith
+// is non-NULL, then it will be used to mask out those attributes that are the same in style
+// and compareWith, for situations where we don't want to explicitly set inherited attributes.
+bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith)
+{
+    wxTextAttr::Apply(style, compareWith);
 
-    if (style.HasCharacterStyleName())
-    {
-        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
-            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
-    }
+    return m_textBoxAttr.Apply(style.m_textBoxAttr, compareWith ? (& compareWith->m_textBoxAttr) : (const wxTextBoxAttr*) NULL);
+}
 
-    if (style.HasParagraphStyleName())
-    {
-        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
-            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
-    }
+// Remove specified attributes from this object
+bool wxRichTextAttr::RemoveStyle(const wxRichTextAttr& attr)
+{
+    wxTextAttr::RemoveStyle(*this, attr);
 
-    if (style.HasListStyleName())
-    {
-        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
-            destStyle.SetListStyleName(style.GetListStyleName());
-    }
+    return m_textBoxAttr.RemoveStyle(attr.m_textBoxAttr);
+}
 
-    if (style.HasBulletStyle())
-    {
-        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
-            destStyle.SetBulletStyle(style.GetBulletStyle());
-    }
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxRichTextAttr::CollectCommonAttributes(const wxRichTextAttr& attr, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr)
+{
+    wxTextAttrCollectCommonAttributes(*this, attr, clashingAttr, absentAttr);
 
-    if (style.HasBulletText())
-    {
-        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
-        {
-            destStyle.SetBulletText(style.GetBulletText());
-            destStyle.SetBulletFont(style.GetBulletFont());
-        }
-    }
+    m_textBoxAttr.CollectCommonAttributes(attr.m_textBoxAttr, clashingAttr.m_textBoxAttr, absentAttr.m_textBoxAttr);
+}
 
-    if (style.HasBulletNumber())
+// Partial equality test
+bool wxTextAttrBorder::EqPartial(const wxTextAttrBorder& border, bool weakTest) const
+{
+    if (!weakTest &&
+        ((!HasStyle() && border.HasStyle()) ||
+         (!HasColour() && border.HasColour()) ||
+         (!HasWidth() && border.HasWidth())))
     {
-        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
-            destStyle.SetBulletNumber(style.GetBulletNumber());
+        return false;
     }
 
-    if (style.HasBulletName())
+    if (border.HasStyle() && HasStyle() && (border.GetStyle() != GetStyle()))
+        return false;
+
+    if (border.HasColour() && HasColour() && (border.GetColourLong() != GetColourLong()))
+        return false;
+
+    if (border.HasWidth() && HasWidth() && !(border.GetWidth() == GetWidth()))
+        return false;
+
+    return true;
+}
+
+// Apply border to 'this', but not if the same as compareWith
+bool wxTextAttrBorder::Apply(const wxTextAttrBorder& border, const wxTextAttrBorder* compareWith)
+{
+    if (border.HasStyle())
     {
-        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
-            destStyle.SetBulletName(style.GetBulletName());
+        if (!(compareWith && (border.GetStyle() == compareWith->GetStyle())))
+            SetStyle(border.GetStyle());
     }
-
-    if (style.HasURL())
+    if (border.HasColour())
     {
-        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
-            destStyle.SetURL(style.GetURL());
+        if (!(compareWith && (border.GetColourLong() == compareWith->GetColourLong())))
+            SetColour(border.GetColourLong());
     }
-
-    if (style.HasPageBreak())
+    if (border.HasWidth())
     {
-        if (!(compareWith && compareWith->HasPageBreak()))
-            destStyle.SetPageBreak();
+        if (!(compareWith && (border.GetWidth() == compareWith->GetWidth())))
+            SetWidth(border.GetWidth());
     }
 
-    if (style.HasTextEffects())
+    return true;
+}
+
+// Remove specified attributes from this object
+bool wxTextAttrBorder::RemoveStyle(const wxTextAttrBorder& attr)
+{
+    if (attr.HasStyle() && HasStyle())
+        SetFlags(GetFlags() & ~wxTEXT_BOX_ATTR_BORDER_STYLE);
+    if (attr.HasColour() && HasColour())
+        SetFlags(GetFlags() & ~wxTEXT_BOX_ATTR_BORDER_COLOUR);
+    if (attr.HasWidth() && HasWidth())
+        m_borderWidth.Reset();
+
+    return true;
+}
+
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrBorder::CollectCommonAttributes(const wxTextAttrBorder& attr, wxTextAttrBorder& clashingAttr, wxTextAttrBorder& absentAttr)
+{
+    if (attr.HasStyle())
     {
-        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
+        if (!clashingAttr.HasStyle() && !absentAttr.HasStyle())
         {
-            int destBits = destStyle.GetTextEffects();
-            int destFlags = destStyle.GetTextEffectFlags();
-
-            int srcBits = style.GetTextEffects();
-            int srcFlags = style.GetTextEffectFlags();
-            
-            wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
-            destStyle.SetTextEffects(destBits);
-            destStyle.SetTextEffectFlags(destFlags);
+            if (HasStyle())
+            {
+                if (GetStyle() != attr.GetStyle())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE);
+                    RemoveFlag(wxTEXT_BOX_ATTR_BORDER_STYLE);
+                }
+            }
+            else
+                SetStyle(attr.GetStyle());
         }
     }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_STYLE);
 
-    if (style.HasOutlineLevel())
+    if (attr.HasColour())
     {
-        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
-            destStyle.SetOutlineLevel(style.GetOutlineLevel());
+        if (!clashingAttr.HasColour() && !absentAttr.HasColour())
+        {
+            if (HasColour())
+            {
+                if (GetColour() != attr.GetColour())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR);
+                    RemoveFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR);
+                }
+            }
+            else
+                SetColour(attr.GetColourLong());
+        }
     }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR);
+
+    m_borderWidth.CollectCommonAttributes(attr.m_borderWidth, clashingAttr.m_borderWidth, absentAttr.m_borderWidth);
+}
+
+// Partial equality test
+bool wxTextAttrBorders::EqPartial(const wxTextAttrBorders& borders, bool weakTest) const
+{
+    return m_left.EqPartial(borders.m_left, weakTest) && m_right.EqPartial(borders.m_right, weakTest) &&
+            m_top.EqPartial(borders.m_top, weakTest) && m_bottom.EqPartial(borders.m_bottom, weakTest);
+}
 
+// Apply border to 'this', but not if the same as compareWith
+bool wxTextAttrBorders::Apply(const wxTextAttrBorders& borders, const wxTextAttrBorders* compareWith)
+{
+    m_left.Apply(borders.m_left, compareWith ? (& compareWith->m_left) : (const wxTextAttrBorder*) NULL);
+    m_right.Apply(borders.m_right, compareWith ? (& compareWith->m_right) : (const wxTextAttrBorder*) NULL);
+    m_top.Apply(borders.m_top, compareWith ? (& compareWith->m_top) : (const wxTextAttrBorder*) NULL);
+    m_bottom.Apply(borders.m_bottom, compareWith ? (& compareWith->m_bottom) : (const wxTextAttrBorder*) NULL);
     return true;
 }
 
-/// Combine two bitlists, specifying the bits of interest with separate flags.
-bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
+// Remove specified attributes from this object
+bool wxTextAttrBorders::RemoveStyle(const wxTextAttrBorders& attr)
 {
-    // We want to apply B's bits to A, taking into account each's flags which indicate which bits
-    // are to be taken into account. A zero in B's bits should reset that bit in A but only if B's flags
-    // indicate it.
-    
-    // First, reset the 0 bits from B. We make a mask so we're only dealing with B's zero
-    // bits at this point, ignoring any 1 bits in B or 0 bits in B that are not relevant.
-    int valueA2 = ~(~valueB & flagsB) & valueA;
-    
-    // Now combine the 1 bits.
-    int valueA3 = (valueB & flagsB) | valueA2;
-    
-    valueA = valueA3;
-    flagsA = (flagsA | flagsB);
-    
+    m_left.RemoveStyle(attr.m_left);
+    m_right.RemoveStyle(attr.m_right);
+    m_top.RemoveStyle(attr.m_top);
+    m_bottom.RemoveStyle(attr.m_bottom);
     return true;
 }
 
-/// Compare two bitlists
-bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrBorders::CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr)
 {
-    int relevantBitsA = valueA & flags;
-    int relevantBitsB = valueB & flags;
-    return (relevantBitsA != relevantBitsB);
+    m_left.CollectCommonAttributes(attr.m_left, clashingAttr.m_left, absentAttr.m_left);
+    m_right.CollectCommonAttributes(attr.m_right, clashingAttr.m_right, absentAttr.m_right);
+    m_top.CollectCommonAttributes(attr.m_top, clashingAttr.m_top, absentAttr.m_top);
+    m_bottom.CollectCommonAttributes(attr.m_bottom, clashingAttr.m_bottom, absentAttr.m_bottom);
 }
 
-/// Split into paragraph and character styles
-bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle)
+// Set style of all borders
+void wxTextAttrBorders::SetStyle(int style)
 {
-    wxTextAttrEx defaultCharStyle1(style);
-    wxTextAttrEx defaultParaStyle1(style);
-    defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER);
-    defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH);
+    m_left.SetStyle(style);
+    m_right.SetStyle(style);
+    m_top.SetStyle(style);
+    m_bottom.SetStyle(style);
+}
 
-    wxRichTextApplyStyle(charStyle, defaultCharStyle1);
-    wxRichTextApplyStyle(parStyle, defaultParaStyle1);
-    
-    return true;
+// Set colour of all borders
+void wxTextAttrBorders::SetColour(unsigned long colour)
+{
+    m_left.SetColour(colour);
+    m_right.SetColour(colour);
+    m_top.SetColour(colour);
+    m_bottom.SetColour(colour);
 }
 
-void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font)
+void wxTextAttrBorders::SetColour(const wxColour& colour)
 {
-    long flags = attr.GetFlags();
-    attr.SetFont(font);
-    attr.SetFlags(flags);
+    m_left.SetColour(colour);
+    m_right.SetColour(colour);
+    m_top.SetColour(colour);
+    m_bottom.SetColour(colour);
 }
 
-/// Convert a decimal to Roman numerals
-wxString wxRichTextDecimalToRoman(long n)
+// Set width of all borders
+void wxTextAttrBorders::SetWidth(const wxTextAttrDimension& width)
 {
-    static wxArrayInt decimalNumbers;
-    static wxArrayString romanNumbers;
+    m_left.SetWidth(width);
+    m_right.SetWidth(width);
+    m_top.SetWidth(width);
+    m_bottom.SetWidth(width);
+}
 
-    // Clean up arrays
-    if (n == -1)
-    {
-        decimalNumbers.Clear();
-        romanNumbers.Clear();
-        return wxEmptyString;
-    }
+// Partial equality test
+bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim, bool weakTest) const
+{
+    if (!weakTest && !IsValid() && dim.IsValid())
+        return false;
 
-    if (decimalNumbers.GetCount() == 0)
-    {
-        #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r);
+    if (dim.IsValid() && IsValid() && !((*this) == dim))
+        return false;
+    else
+        return true;
+}
 
-        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"));
+bool wxTextAttrDimension::Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith)
+{
+    if (dim.IsValid())
+    {
+        if (!(compareWith && dim == (*compareWith)))
+            (*this) = dim;
     }
 
-    int i = 0;
-    wxString roman;
-
-    while (n > 0 && i < 13)
-    {
-        if (n >= decimalNumbers[i])
-        {
-            n -= decimalNumbers[i];
-            roman += romanNumbers[i];
-        }
-        else
+    return true;
+}
+
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrDimension::CollectCommonAttributes(const wxTextAttrDimension& attr, wxTextAttrDimension& clashingAttr, wxTextAttrDimension& absentAttr)
+{
+    if (attr.IsValid())
+    {
+        if (!clashingAttr.IsValid() && !absentAttr.IsValid())
         {
-            i ++;
+            if (IsValid())
+            {
+                if (!((*this) == attr))
+                {
+                    clashingAttr.SetValid(true);
+                    SetValid(false);
+                }
+            }
+            else
+                (*this) = attr;
         }
     }
-    if (roman.IsEmpty())
-        roman = wxT("0");
-    return roman;
+    else
+        absentAttr.SetValid(true);
 }
 
-/*!
- * wxRichTextAttr stores attributes without a wxFont object, so is a much more
- * efficient way to query styles.
- */
-
-// ctors
-wxRichTextAttr::wxRichTextAttr(const wxColour& colText,
-               const wxColour& colBack,
-               wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack)
+wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize)
 {
-    Init();
-
-    if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
-    if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
-    if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
-        m_flags |= wxTEXT_ATTR_ALIGNMENT;
+    m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize;
 }
 
-wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr)
+wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(int ppi, double scale, const wxSize& parentSize)
 {
-    Init();
+    m_ppi = ppi; m_scale = scale; m_parentSize = parentSize;
+}
 
-    (*this) = attr;
+int wxTextAttrDimensionConverter::ConvertTenthsMMToPixels(int units) const
+{
+    return wxRichTextObject::ConvertTenthsMMToPixels(m_ppi, units, m_scale);
 }
 
-wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr)
+int wxTextAttrDimensionConverter::ConvertPixelsToTenthsMM(int pixels) const
 {
-    Copy(attr);
+    return wxRichTextObject::ConvertPixelsToTenthsMM(m_ppi, pixels, m_scale);
 }
 
-// operations
-void wxRichTextAttr::Init()
+int wxTextAttrDimensionConverter::GetPixels(const wxTextAttrDimension& dim, int direction) const
 {
-    m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
-    m_flags = 0;
-    m_leftIndent = 0;
-    m_leftSubIndent = 0;
-    m_rightIndent = 0;
-
-    m_fontSize = 12;
-    m_fontStyle = wxNORMAL;
-    m_fontWeight = wxNORMAL;
-    m_fontUnderlined = false;
-
-    m_paragraphSpacingAfter = 0;
-    m_paragraphSpacingBefore = 0;
-    m_lineSpacing = 0;
-    m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
-    m_textEffects = wxTEXT_ATTR_EFFECT_NONE;
-    m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE;
-    m_outlineLevel = 0;
-    m_bulletNumber = 0;
-}
-
-// Copy
-void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
+    if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+        return ConvertTenthsMMToPixels(dim.GetValue());
+    else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+        return dim.GetValue();
+    else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE)
+    {
+        wxASSERT(m_parentSize != wxDefaultSize);
+        if (direction == wxHORIZONTAL)
+            return (int) (double(m_parentSize.x) * double(dim.GetValue()) / 100.0);
+        else
+            return (int) (double(m_parentSize.y) * double(dim.GetValue()) / 100.0);
+    }
+    else
+    {
+        wxASSERT(false);
+        return 0;
+    }
+}
+
+int wxTextAttrDimensionConverter::GetTenthsMM(const wxTextAttrDimension& dim) const
 {
-    m_colText = attr.m_colText;
-    m_colBack = attr.m_colBack;
-    m_textAlignment = attr.m_textAlignment;
-    m_leftIndent = attr.m_leftIndent;
-    m_leftSubIndent = attr.m_leftSubIndent;
-    m_rightIndent = attr.m_rightIndent;
-    m_tabs = attr.m_tabs;
-    m_flags = attr.m_flags;
-
-    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_textEffects = attr.m_textEffects;
-    m_textEffectFlags = attr.m_textEffectFlags;
-
-    m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
-    m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
-    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_bulletText = attr.m_bulletText;
-    m_bulletFont = attr.m_bulletFont;
-    m_bulletName = attr.m_bulletName;
-    m_outlineLevel = attr.m_outlineLevel;
-
-    m_urlTarget = attr.m_urlTarget;
-}
-
-// operators
-void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
-{    
-    Copy(attr);
-}
-
-// operators
-void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
-{
-    m_flags = attr.GetFlags();
-
-    m_colText = attr.GetTextColour();
-    m_colBack = attr.GetBackgroundColour();
-    m_textAlignment = attr.GetAlignment();
-    m_leftIndent = attr.GetLeftIndent();
-    m_leftSubIndent = attr.GetLeftSubIndent();
-    m_rightIndent = attr.GetRightIndent();
-    m_tabs = attr.GetTabs();
-    m_textEffects = attr.GetTextEffects();
-    m_textEffectFlags = attr.GetTextEffectFlags();
-
-    m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter();
-    m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore();
-    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_outlineLevel = attr.GetOutlineLevel();
-
-    m_urlTarget = attr.GetURL();
-
-    if (attr.GetFont().Ok())
-        GetFontAttributes(attr.GetFont());
-}
-
-// Making a wxTextAttrEx object.
-wxRichTextAttr::operator wxTextAttrEx () const
-{
-    wxTextAttrEx attr;
-    attr.SetTextColour(GetTextColour());
-    attr.SetBackgroundColour(GetBackgroundColour());
-    attr.SetAlignment(GetAlignment());
-    attr.SetTabs(GetTabs());
-    attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent());
-    attr.SetRightIndent(GetRightIndent());
-    attr.SetFont(CreateFont());
-
-    attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter);
-    attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore);
-    attr.SetLineSpacing(m_lineSpacing);
-    attr.SetBulletStyle(m_bulletStyle);
-    attr.SetBulletNumber(m_bulletNumber);
-    attr.SetBulletText(m_bulletText);
-    attr.SetBulletName(m_bulletName);
-    attr.SetBulletFont(m_bulletFont);
-    attr.SetCharacterStyleName(m_characterStyleName);
-    attr.SetParagraphStyleName(m_paragraphStyleName);
-    attr.SetListStyleName(m_listStyleName);
-    attr.SetTextEffects(m_textEffects);
-    attr.SetTextEffectFlags(m_textEffectFlags);
-    attr.SetOutlineLevel(m_outlineLevel);
-
-    attr.SetURL(m_urlTarget);
-
-    attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags
-    return attr;
+    if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+        return dim.GetValue();
+    else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+        return ConvertPixelsToTenthsMM(dim.GetValue());
+    else
+    {
+        wxASSERT(false);
+        return 0;
+    }
 }
 
-// Equality test
-bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
+// Partial equality test
+bool wxTextAttrDimensions::EqPartial(const wxTextAttrDimensions& dims, bool weakTest) const
 {
-    return  GetFlags() == attr.GetFlags() &&
+    if (!m_left.EqPartial(dims.m_left, weakTest))
+        return false;
+
+    if (!m_right.EqPartial(dims.m_right, weakTest))
+        return false;
 
-            GetTextColour() == attr.GetTextColour() &&
-            GetBackgroundColour() == attr.GetBackgroundColour() &&
+    if (!m_top.EqPartial(dims.m_top, weakTest))
+        return false;
 
-            GetAlignment() == attr.GetAlignment() &&
-            GetLeftIndent() == attr.GetLeftIndent() &&
-            GetLeftSubIndent() == attr.GetLeftSubIndent() &&
-            GetRightIndent() == attr.GetRightIndent() &&
-            wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
+    if (!m_bottom.EqPartial(dims.m_bottom, weakTest))
+        return false;
 
-            GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
-            GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
-            GetLineSpacing() == attr.GetLineSpacing() &&
-            GetCharacterStyleName() == attr.GetCharacterStyleName() &&
-            GetParagraphStyleName() == attr.GetParagraphStyleName() &&
-            GetListStyleName() == attr.GetListStyleName() &&
+    return true;
+}
 
-            GetBulletStyle() == attr.GetBulletStyle() &&
-            GetBulletText() == attr.GetBulletText() &&
-            GetBulletNumber() == attr.GetBulletNumber() &&
-            GetBulletFont() == attr.GetBulletFont() &&
-            GetBulletName() == attr.GetBulletName() &&
+// Apply border to 'this', but not if the same as compareWith
+bool wxTextAttrDimensions::Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith)
+{
+    m_left.Apply(dims.m_left, compareWith ? (& compareWith->m_left) : (const wxTextAttrDimension*) NULL);
+    m_right.Apply(dims.m_right, compareWith ? (& compareWith->m_right): (const wxTextAttrDimension*) NULL);
+    m_top.Apply(dims.m_top, compareWith ? (& compareWith->m_top): (const wxTextAttrDimension*) NULL);
+    m_bottom.Apply(dims.m_bottom, compareWith ? (& compareWith->m_bottom): (const wxTextAttrDimension*) NULL);
 
-            GetTextEffects() == attr.GetTextEffects() &&
-            GetTextEffectFlags() == attr.GetTextEffectFlags() &&
+    return true;
+}
 
-            GetOutlineLevel() == attr.GetOutlineLevel() &&
+// Remove specified attributes from this object
+bool wxTextAttrDimensions::RemoveStyle(const wxTextAttrDimensions& attr)
+{
+    if (attr.m_left.IsValid())
+        m_left.Reset();
+    if (attr.m_right.IsValid())
+        m_right.Reset();
+    if (attr.m_top.IsValid())
+        m_top.Reset();
+    if (attr.m_bottom.IsValid())
+        m_bottom.Reset();
 
-            GetFontSize() == attr.GetFontSize() &&
-            GetFontStyle() == attr.GetFontStyle() &&
-            GetFontWeight() == attr.GetFontWeight() &&
-            GetFontUnderlined() == attr.GetFontUnderlined() &&
-            GetFontFaceName() == attr.GetFontFaceName() &&
-            
-            GetURL() == attr.GetURL();
+    return true;
 }
 
-// Create font from font attributes.
-wxFont wxRichTextAttr::CreateFont() const
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrDimensions::CollectCommonAttributes(const wxTextAttrDimensions& attr, wxTextAttrDimensions& clashingAttr, wxTextAttrDimensions& absentAttr)
 {
-    wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName);
-#ifdef __WXMAC__
-    font.SetNoAntiAliasing(true);
-#endif
-    return font;
+    m_left.CollectCommonAttributes(attr.m_left, clashingAttr.m_left, absentAttr.m_left);
+    m_right.CollectCommonAttributes(attr.m_right, clashingAttr.m_right, absentAttr.m_right);
+    m_top.CollectCommonAttributes(attr.m_top, clashingAttr.m_top, absentAttr.m_top);
+    m_bottom.CollectCommonAttributes(attr.m_bottom, clashingAttr.m_bottom, absentAttr.m_bottom);
 }
 
-// Get attributes from font.
-bool wxRichTextAttr::GetFontAttributes(const wxFont& font)
+// Partial equality test
+bool wxTextAttrSize::EqPartial(const wxTextAttrSize& size, bool weakTest) const
 {
-    if (!font.Ok())
+    if (!m_width.EqPartial(size.m_width, weakTest))
         return false;
 
-    m_fontSize = font.GetPointSize();
-    m_fontStyle = font.GetStyle();
-    m_fontWeight = font.GetWeight();
-    m_fontUnderlined = font.GetUnderlined();
-    m_fontFaceName = font.GetFaceName();
+    if (!m_height.EqPartial(size.m_height, weakTest))
+        return false;
 
     return true;
 }
 
-wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& style, const wxRichTextAttr* compareWith) const
+// Apply border to 'this', but not if the same as compareWith
+bool wxTextAttrSize::Apply(const wxTextAttrSize& size, const wxTextAttrSize* compareWith)
 {
-    wxRichTextAttr destStyle = (*this);
-    destStyle.Apply(style, compareWith);
-    
-    return destStyle;
+    m_width.Apply(size.m_width, compareWith ? (& compareWith->m_width) : (const wxTextAttrDimension*) NULL);
+    m_height.Apply(size.m_height, compareWith ? (& compareWith->m_height): (const wxTextAttrDimension*) NULL);
+
+    return true;
 }
 
-bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith)
+// Remove specified attributes from this object
+bool wxTextAttrSize::RemoveStyle(const wxTextAttrSize& attr)
 {
-    wxRichTextAttr& destStyle = (*this);
-    
-    if (style.HasFontWeight())
-    {
-        if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight()))
-            destStyle.SetFontWeight(style.GetFontWeight());
-    }
+    if (attr.m_width.IsValid())
+        m_width.Reset();
+    if (attr.m_height.IsValid())
+        m_height.Reset();
 
-    if (style.HasFontSize())
-    {
-        if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
-            destStyle.SetFontSize(style.GetFontSize());
-    }
+    return true;
+}
 
-    if (style.HasFontItalic())
-    {
-        if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle()))
-            destStyle.SetFontStyle(style.GetFontStyle());
-    }
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrSize::CollectCommonAttributes(const wxTextAttrSize& attr, wxTextAttrSize& clashingAttr, wxTextAttrSize& absentAttr)
+{
+    m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width);
+    m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height);
+}
 
-    if (style.HasFontUnderlined())
-    {
-        if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()))
-            destStyle.SetFontUnderlined(style.GetFontUnderlined());
-    }
+// Collects the attributes that are common to a range of content, building up a note of
+// which attributes are absent in some objects and which clash in some objects.
+void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr)
+{
+    absentAttr.SetFlags(absentAttr.GetFlags() | (~attr.GetFlags() & wxTEXT_ATTR_ALL));
+    absentAttr.SetTextEffectFlags(absentAttr.GetTextEffectFlags() | (~attr.GetTextEffectFlags() & 0xFFFF));
 
-    if (style.HasFontFaceName())
-    {
-        if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
-            destStyle.SetFontFaceName(style.GetFontFaceName());
-    }
+    long forbiddenFlags = clashingAttr.GetFlags()|absentAttr.GetFlags();
 
-    if (style.GetTextColour().Ok() && style.HasTextColour())
+    if (attr.HasFont())
     {
-        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
-            destStyle.SetTextColour(style.GetTextColour());
-    }
+        // If different font size units are being used, this is a clash.
+        if (((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) | (currentStyle.GetFlags() & wxTEXT_ATTR_FONT_SIZE)) == wxTEXT_ATTR_FONT_SIZE)
+        {
+            currentStyle.SetFontSize(0);
+            currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE);
+            clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE);
+        }
+        else
+        {
+            if (attr.HasFontPointSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_POINT_SIZE))
+            {
+                if (currentStyle.HasFontPointSize())
+                {
+                    if (currentStyle.GetFontSize() != attr.GetFontSize())
+                    {
+                        // Clash of attr - mark as such
+                        clashingAttr.AddFlag(wxTEXT_ATTR_FONT_POINT_SIZE);
+                        currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_POINT_SIZE);
+                    }
+                }
+                else
+                    currentStyle.SetFontSize(attr.GetFontSize());
+            }
 
-    if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-    {
-        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
-            destStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
+            if (attr.HasFontPixelSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_PIXEL_SIZE))
+            {
+                if (currentStyle.HasFontPixelSize())
+                {
+                    if (currentStyle.GetFontSize() != attr.GetFontSize())
+                    {
+                        // Clash of attr - mark as such
+                        clashingAttr.AddFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE);
+                        currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE);
+                    }
+                }
+                else
+                    currentStyle.SetFontPixelSize(attr.GetFontSize());
+            }
+        }
 
-    if (style.HasAlignment())
-    {
-        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
-            destStyle.SetAlignment(style.GetAlignment());
-    }
+        if (attr.HasFontItalic() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_ITALIC))
+        {
+            if (currentStyle.HasFontItalic())
+            {
+                if (currentStyle.GetFontStyle() != attr.GetFontStyle())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_ITALIC);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_ITALIC);
+                }
+            }
+            else
+                currentStyle.SetFontStyle(attr.GetFontStyle());
+        }
 
-    if (style.HasTabs())
-    {
-        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
-            destStyle.SetTabs(style.GetTabs());
-    }
+        if (attr.HasFontFamily() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_FAMILY))
+        {
+            if (currentStyle.HasFontFamily())
+            {
+                if (currentStyle.GetFontFamily() != attr.GetFontFamily())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_FAMILY);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_FAMILY);
+                }
+            }
+            else
+                currentStyle.SetFontFamily(attr.GetFontFamily());
+        }
 
-    if (style.HasLeftIndent())
-    {
-        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
-                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
-            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
+        if (attr.HasFontWeight() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_WEIGHT))
+        {
+            if (currentStyle.HasFontWeight())
+            {
+                if (currentStyle.GetFontWeight() != attr.GetFontWeight())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_WEIGHT);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_WEIGHT);
+                }
+            }
+            else
+                currentStyle.SetFontWeight(attr.GetFontWeight());
+        }
 
-    if (style.HasRightIndent())
-    {
-        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
-            destStyle.SetRightIndent(style.GetRightIndent());
+        if (attr.HasFontFaceName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_FACE))
+        {
+            if (currentStyle.HasFontFaceName())
+            {
+                wxString faceName1(currentStyle.GetFontFaceName());
+                wxString faceName2(attr.GetFontFaceName());
+
+                if (faceName1 != faceName2)
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_FACE);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_FACE);
+                }
+            }
+            else
+                currentStyle.SetFontFaceName(attr.GetFontFaceName());
+        }
+
+        if (attr.HasFontUnderlined() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_UNDERLINE))
+        {
+            if (currentStyle.HasFontUnderlined())
+            {
+                if (currentStyle.GetFontUnderlined() != attr.GetFontUnderlined())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_UNDERLINE);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_UNDERLINE);
+                }
+            }
+            else
+                currentStyle.SetFontUnderlined(attr.GetFontUnderlined());
+        }
+
+        if (attr.HasFontStrikethrough() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_STRIKETHROUGH))
+        {
+            if (currentStyle.HasFontStrikethrough())
+            {
+                if (currentStyle.GetFontStrikethrough() != attr.GetFontStrikethrough())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH);
+                }
+            }
+            else
+                currentStyle.SetFontStrikethrough(attr.GetFontStrikethrough());
+        }
     }
 
-    if (style.HasParagraphSpacingAfter())
+    if (attr.HasTextColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TEXT_COLOUR))
     {
-        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
-            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+        if (currentStyle.HasTextColour())
+        {
+            if (currentStyle.GetTextColour() != attr.GetTextColour())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_TEXT_COLOUR);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_TEXT_COLOUR);
+            }
+        }
+        else
+            currentStyle.SetTextColour(attr.GetTextColour());
     }
 
-    if (style.HasParagraphSpacingBefore())
+    if (attr.HasBackgroundColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BACKGROUND_COLOUR))
     {
-        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
-            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+        if (currentStyle.HasBackgroundColour())
+        {
+            if (currentStyle.GetBackgroundColour() != attr.GetBackgroundColour())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BACKGROUND_COLOUR);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BACKGROUND_COLOUR);
+            }
+        }
+        else
+            currentStyle.SetBackgroundColour(attr.GetBackgroundColour());
     }
 
-    if (style.HasLineSpacing())
+    if (attr.HasAlignment() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_ALIGNMENT))
     {
-        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
-            destStyle.SetLineSpacing(style.GetLineSpacing());
+        if (currentStyle.HasAlignment())
+        {
+            if (currentStyle.GetAlignment() != attr.GetAlignment())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_ALIGNMENT);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_ALIGNMENT);
+            }
+        }
+        else
+            currentStyle.SetAlignment(attr.GetAlignment());
     }
 
-    if (style.HasCharacterStyleName())
+    if (attr.HasTabs() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TABS))
     {
-        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
-            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+        if (currentStyle.HasTabs())
+        {
+            if (!wxRichTextTabsEq(currentStyle.GetTabs(), attr.GetTabs()))
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_TABS);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_TABS);
+            }
+        }
+        else
+            currentStyle.SetTabs(attr.GetTabs());
     }
 
-    if (style.HasParagraphStyleName())
+    if (attr.HasLeftIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LEFT_INDENT))
     {
-        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
-            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+        if (currentStyle.HasLeftIndent())
+        {
+            if (currentStyle.GetLeftIndent() != attr.GetLeftIndent() || currentStyle.GetLeftSubIndent() != attr.GetLeftSubIndent())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_LEFT_INDENT);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_LEFT_INDENT);
+            }
+        }
+        else
+            currentStyle.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
     }
 
-    if (style.HasListStyleName())
+    if (attr.HasRightIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_RIGHT_INDENT))
     {
-        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
-            destStyle.SetListStyleName(style.GetListStyleName());
+        if (currentStyle.HasRightIndent())
+        {
+            if (currentStyle.GetRightIndent() != attr.GetRightIndent())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_RIGHT_INDENT);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_RIGHT_INDENT);
+            }
+        }
+        else
+            currentStyle.SetRightIndent(attr.GetRightIndent());
     }
 
-    if (style.HasBulletStyle())
+    if (attr.HasParagraphSpacingAfter() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_AFTER))
     {
-        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
-            destStyle.SetBulletStyle(style.GetBulletStyle());
+        if (currentStyle.HasParagraphSpacingAfter())
+        {
+            if (currentStyle.GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_PARA_SPACING_AFTER);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_PARA_SPACING_AFTER);
+            }
+        }
+        else
+            currentStyle.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
     }
 
-    if (style.HasBulletText())
+    if (attr.HasParagraphSpacingBefore() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_BEFORE))
     {
-        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
+        if (currentStyle.HasParagraphSpacingBefore())
         {
-            destStyle.SetBulletText(style.GetBulletText());
-            destStyle.SetBulletFont(style.GetBulletFont());
+            if (currentStyle.GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE);
+            }
         }
+        else
+            currentStyle.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
     }
 
-    if (style.HasBulletNumber())
+    if (attr.HasLineSpacing() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LINE_SPACING))
     {
-        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
-            destStyle.SetBulletNumber(style.GetBulletNumber());
+        if (currentStyle.HasLineSpacing())
+        {
+            if (currentStyle.GetLineSpacing() != attr.GetLineSpacing())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_LINE_SPACING);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_LINE_SPACING);
+            }
+        }
+        else
+            currentStyle.SetLineSpacing(attr.GetLineSpacing());
     }
 
-    if (style.HasBulletName())
+    if (attr.HasCharacterStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
     {
-        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
-            destStyle.SetBulletName(style.GetBulletName());
+        if (currentStyle.HasCharacterStyleName())
+        {
+            if (currentStyle.GetCharacterStyleName() != attr.GetCharacterStyleName())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetCharacterStyleName(attr.GetCharacterStyleName());
     }
 
-    if (style.HasURL())
+    if (attr.HasParagraphStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
     {
-        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
-            destStyle.SetURL(style.GetURL());
+        if (currentStyle.HasParagraphStyleName())
+        {
+            if (currentStyle.GetParagraphStyleName() != attr.GetParagraphStyleName())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetParagraphStyleName(attr.GetParagraphStyleName());
     }
 
-    if (style.HasPageBreak())
+    if (attr.HasListStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LIST_STYLE_NAME))
     {
-        if (!(compareWith && compareWith->HasPageBreak()))
-            destStyle.SetPageBreak();
+        if (currentStyle.HasListStyleName())
+        {
+            if (currentStyle.GetListStyleName() != attr.GetListStyleName())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_LIST_STYLE_NAME);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_LIST_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetListStyleName(attr.GetListStyleName());
     }
 
-    if (style.HasTextEffects())
+    if (attr.HasBulletStyle() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_STYLE))
     {
-        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
+        if (currentStyle.HasBulletStyle())
         {
-            int destBits = destStyle.GetTextEffects();
-            int destFlags = destStyle.GetTextEffectFlags();
-
-            int srcBits = style.GetTextEffects();
-            int srcFlags = style.GetTextEffectFlags();
-            
-            wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
-            destStyle.SetTextEffects(destBits);
-            destStyle.SetTextEffectFlags(destFlags);
+            if (currentStyle.GetBulletStyle() != attr.GetBulletStyle())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_STYLE);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_STYLE);
+            }
         }
+        else
+            currentStyle.SetBulletStyle(attr.GetBulletStyle());
     }
 
-    if (style.HasOutlineLevel())
+    if (attr.HasBulletNumber() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NUMBER))
     {
-        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
-            destStyle.SetOutlineLevel(style.GetOutlineLevel());
+        if (currentStyle.HasBulletNumber())
+        {
+            if (currentStyle.GetBulletNumber() != attr.GetBulletNumber())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_NUMBER);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_NUMBER);
+            }
+        }
+        else
+            currentStyle.SetBulletNumber(attr.GetBulletNumber());
     }
 
-    return true;
-}
-
-/*!
- * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
- */
-
-wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr()
-{
-    Copy(attr);
-}
-
-// Initialise this object.
-void wxTextAttrEx::Init()
-{
-    m_paragraphSpacingAfter = 0;
-    m_paragraphSpacingBefore = 0;
-    m_lineSpacing = 0;
-    m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
-    m_textEffects = wxTEXT_ATTR_EFFECT_NONE;
-    m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE;
-    m_bulletNumber = 0;
-    m_outlineLevel = 0;
-}
-
-// Copy
-void wxTextAttrEx::Copy(const wxTextAttrEx& attr)
-{
-    wxTextAttr::operator= (attr);
-
-    m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
-    m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
-    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_bulletText = attr.m_bulletText;
-    m_bulletFont = attr.m_bulletFont;
-    m_bulletName = attr.m_bulletName;
-    m_urlTarget = attr.m_urlTarget;
-    m_textEffects = attr.m_textEffects;
-    m_textEffectFlags = attr.m_textEffectFlags;
-    m_outlineLevel = attr.m_outlineLevel;
-}
-
-// Assignment from a wxTextAttrEx object
-void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
-{
-    Copy(attr);
-}
-
-// Assignment from a wxTextAttr object.
-void wxTextAttrEx::operator= (const wxTextAttr& attr)
-{
-    wxTextAttr::operator= (attr);
-}
-
-// Equality test
-bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
-{
-    return (
-        GetFlags() == attr.GetFlags() &&
-        GetTextColour() == attr.GetTextColour() &&
-        GetBackgroundColour() == attr.GetBackgroundColour() &&
-        GetFont() == attr.GetFont() &&
-        GetTextEffects() == attr.GetTextEffects() &&
-        GetTextEffectFlags() == attr.GetTextEffectFlags() &&
-        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() &&
-        GetOutlineLevel() == attr.GetOutlineLevel() &&
-        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
+    if (attr.HasBulletText() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_TEXT))
     {
-        // First find the basic, default font
-        long flags = 0;
-
-        wxFont font;
-        if (attrDef.HasFont())
+        if (currentStyle.HasBulletText())
         {
-            flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT);
-            font = attrDef.GetFont();
+            if (currentStyle.GetBulletText() != attr.GetBulletText())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_TEXT);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_TEXT);
+            }
         }
         else
         {
-            if (text)
-                font = text->GetFont();
-
-            // We leave flags at 0 because no font attributes have been specified yet
+            currentStyle.SetBulletText(attr.GetBulletText());
+            currentStyle.SetBulletFont(attr.GetBulletFont());
         }
-        if (!font.Ok())
-            font = *wxNORMAL_FONT;
+    }
 
-        // Otherwise, if there are font attributes in attr, apply them
-        if (attr.GetFlags() & wxTEXT_ATTR_FONT)
+    if (attr.HasBulletName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NAME))
+    {
+        if (currentStyle.HasBulletName())
         {
-            if (attr.HasFontSize())
-            {
-                flags |= wxTEXT_ATTR_FONT_SIZE;
-                font.SetPointSize(attr.GetFont().GetPointSize());
-            }
-            if (attr.HasFontItalic())
-            {
-                flags |= wxTEXT_ATTR_FONT_ITALIC;;
-                font.SetStyle(attr.GetFont().GetStyle());
-            }
-            if (attr.HasFontWeight())
-            {
-                flags |= wxTEXT_ATTR_FONT_WEIGHT;
-                font.SetWeight(attr.GetFont().GetWeight());
-            }
-            if (attr.HasFontFaceName())
-            {
-                flags |= wxTEXT_ATTR_FONT_FACE;
-                font.SetFaceName(attr.GetFont().GetFaceName());
-            }
-            if (attr.HasFontUnderlined())
+            if (currentStyle.GetBulletName() != attr.GetBulletName())
             {
-                flags |= wxTEXT_ATTR_FONT_UNDERLINE;
-                font.SetUnderlined(attr.GetFont().GetUnderlined());
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_NAME);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_NAME);
             }
-            newAttr.SetFont(font);
-            newAttr.SetFlags(newAttr.GetFlags()|flags);
+        }
+        else
+        {
+            currentStyle.SetBulletName(attr.GetBulletName());
         }
     }
 
-    // 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() )
+    if (attr.HasURL() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_URL))
     {
-        colFg = attrDef.GetTextColour();
-
-        if ( text && !colFg.Ok() )
-            colFg = text->GetForegroundColour();
+        if (currentStyle.HasURL())
+        {
+            if (currentStyle.GetURL() != attr.GetURL())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_URL);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_URL);
+            }
+        }
+        else
+        {
+            currentStyle.SetURL(attr.GetURL());
+        }
     }
 
-    wxColour colBg = attr.GetBackgroundColour();
-    if ( !colBg.Ok() )
+    if (attr.HasTextEffects() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_EFFECTS))
     {
-        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 (currentStyle.HasTextEffects())
+        {
+            // We need to find the bits in the new attr that are different:
+            // just look at those bits that are specified by the new attr.
 
-    if (attr.HasParagraphStyleName())
-        newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
+            // We need to remove the bits and flags that are not common between current attr
+            // and new attr. In so doing we need to take account of the styles absent from one or more of the
+            // previous styles.
 
-    if (attr.HasListStyleName())
-        newAttr.SetListStyleName(attr.GetListStyleName());
+            int currentRelevantTextEffects = currentStyle.GetTextEffects() & attr.GetTextEffectFlags();
+            int newRelevantTextEffects = attr.GetTextEffects() & attr.GetTextEffectFlags();
 
-    if (attr.HasBulletStyle())
-        newAttr.SetBulletStyle(attr.GetBulletStyle());
+            if (currentRelevantTextEffects != newRelevantTextEffects)
+            {
+                // Find the text effects that were different, using XOR
+                int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects;
 
-    if (attr.HasBulletNumber())
-        newAttr.SetBulletNumber(attr.GetBulletNumber());
+                // Clash of attr - mark as such
+                clashingAttr.SetTextEffectFlags(clashingAttr.GetTextEffectFlags() | differentEffects);
+                currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~differentEffects);
+            }
+        }
+        else
+        {
+            currentStyle.SetTextEffects(attr.GetTextEffects());
+            currentStyle.SetTextEffectFlags(attr.GetTextEffectFlags());
+        }
 
-    if (attr.HasBulletName())
-        newAttr.SetBulletName(attr.GetBulletName());
+        // Mask out the flags and values that cannot be common because they were absent in one or more objecrs
+        // that we've looked at so far
+        currentStyle.SetTextEffects(currentStyle.GetTextEffects() & ~absentAttr.GetTextEffectFlags());
+        currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~absentAttr.GetTextEffectFlags());
 
-    if (attr.HasBulletText())
-    {
-        newAttr.SetBulletText(attr.GetBulletText());
-        newAttr.SetBulletFont(attr.GetBulletFont());
+        if (currentStyle.GetTextEffectFlags() == 0)
+            currentStyle.RemoveFlag(wxTEXT_ATTR_EFFECTS);
     }
 
-    if (attr.HasURL())
-        newAttr.SetURL(attr.GetURL());
-
-    if (attr.HasTextEffects())
+    if (attr.HasOutlineLevel() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_OUTLINE_LEVEL))
     {
-        newAttr.SetTextEffects(attr.GetTextEffects());
-        newAttr.SetTextEffectFlags(attr.GetTextEffectFlags());
+        if (currentStyle.HasOutlineLevel())
+        {
+            if (currentStyle.GetOutlineLevel() != attr.GetOutlineLevel())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_OUTLINE_LEVEL);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_OUTLINE_LEVEL);
+            }
+        }
+        else
+            currentStyle.SetOutlineLevel(attr.GetOutlineLevel());
     }
-
-    if (attr.HasOutlineLevel())
-        newAttr.SetOutlineLevel(attr.GetOutlineLevel());
-
-    return newAttr;
 }
 
+WX_DEFINE_OBJARRAY(wxRichTextVariantArray);
 
-/*!
- * wxRichTextFileHandler
- * Base class for file handlers
- */
-
-IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject)
 
-#if wxUSE_STREAMS
-bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
+bool wxRichTextProperties::operator==(const wxRichTextProperties& props) const
 {
-    wxFFileInputStream stream(filename);
-    if (stream.Ok())
-        return LoadFile(buffer, stream);
-
-    return false;
-}
+    if (m_properties.GetCount() != props.GetCount())
+        return false;
 
-bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
-{
-    wxFFileOutputStream stream(filename);
-    if (stream.Ok())
-        return SaveFile(buffer, stream);
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)
+    {
+        const wxVariant& var1 = m_properties[i];
+        int idx = props.Find(var1.GetName());
+        if (idx == -1)
+            return false;
+        const wxVariant& var2 = props.m_properties[idx];
+        if (!(var1 == var2))
+            return false;
+    }
 
-    return false;
+    return true;
 }
-#endif // wxUSE_STREAMS
 
-/// Can we handle this filename (if using files)? By default, checks the extension.
-bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
+wxArrayString wxRichTextProperties::GetPropertyNames() const
 {
-    wxString path, file, ext;
-    wxSplitPath(filename, & path, & file, & ext);
-
-    return (ext.Lower() == GetExtension());
+    wxArrayString arr;
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)
+    {
+        arr.Add(m_properties[i].GetName());
+    }
+    return arr;
 }
 
-/*!
- * wxRichTextTextHandler
- * Plain text handler
- */
-
-IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
-
-#if wxUSE_STREAMS
-bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+int wxRichTextProperties::Find(const wxString& name) const
 {
-    if (!stream.IsOk())
-        return false;
-
-    wxString str;
-    int lastCh = 0;
-
-    while (!stream.Eof())
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)
     {
-        int ch = stream.GetC();
-
-        if (!stream.Eof())
-        {
-            if (ch == 10 && lastCh != 13)
-                str += wxT('\n');
-
-            if (ch > 0 && ch != 10)
-                str += wxChar(ch);
-
-            lastCh = ch;
-        }
+        if (m_properties[i].GetName() == name)
+            return (int) i;
     }
-
-    buffer->ResetAndClearCommands();
-    buffer->Clear();
-    buffer->AddParagraphs(str);
-    buffer->UpdateRanges();
-
-    return true;
+    return -1;
 }
 
-bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
+bool wxRichTextProperties::Remove(const wxString& name)
 {
-    if (!stream.IsOk())
+    int idx = Find(name);
+    if (idx != -1)
+    {
+        m_properties.RemoveAt(idx);
+        return true;
+    }
+    else
         return false;
-
-    wxString text = buffer->GetText();
-
-    wxString newLine = wxRichTextLineBreakChar;
-    text.Replace(newLine, wxT("\n"));
-    
-    wxCharBuffer buf = text.ToAscii();
-
-    stream.Write((const char*) buf, text.length());
-    return true;
 }
-#endif // wxUSE_STREAMS
-
-/*
- * Stores information about an image, in binary in-memory form
- */
 
-wxRichTextImageBlock::wxRichTextImageBlock()
+wxVariant* wxRichTextProperties::FindOrCreateProperty(const wxString& name)
 {
-    Init();
+    int idx = Find(name);
+    if (idx == wxNOT_FOUND)
+        SetProperty(name, wxString());
+    idx = Find(name);
+    if (idx != wxNOT_FOUND)
+    {
+        return & (*this)[idx];
+    }
+    else
+        return NULL;
 }
 
-wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject()
+const wxVariant& wxRichTextProperties::GetProperty(const wxString& name) const
 {
-    Init();
-    Copy(block);
+    static const wxVariant nullVariant;
+    int idx = Find(name);
+    if (idx != -1)
+        return m_properties[idx];
+    else
+        return nullVariant;
 }
 
-wxRichTextImageBlock::~wxRichTextImageBlock()
+wxString wxRichTextProperties::GetPropertyString(const wxString& name) const
 {
-    if (m_data)
-    {
-        delete[] m_data;
-        m_data = NULL;
-    }
+    return GetProperty(name).GetString();
 }
 
-void wxRichTextImageBlock::Init()
+long wxRichTextProperties::GetPropertyLong(const wxString& name) const
 {
-    m_data = NULL;
-    m_dataSize = 0;
-    m_imageType = -1;
+    return GetProperty(name).GetLong();
 }
 
-void wxRichTextImageBlock::Clear()
+bool wxRichTextProperties::GetPropertyBool(const wxString& name) const
 {
-    delete[] m_data;
-    m_data = NULL;
-    m_dataSize = 0;
-    m_imageType = -1;
+    return GetProperty(name).GetBool();
 }
 
-
-// Load the original image into a memory block.
-// If the image is not a JPEG, we must convert it into a JPEG
-// to conserve space.
-// If it's not a JPEG we can make use of 'image', already scaled, so we don't have to
-// load the image a 2nd time.
-
-bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG)
+double wxRichTextProperties::GetPropertyDouble(const wxString& name) const
 {
-    m_imageType = imageType;
-
-    wxString filenameToRead(filename);
-    bool removeFile = false;
-
-    if (imageType == -1)
-        return false; // Could not determine image type
-
-    if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
-    {
-        wxString tempFile;
-        bool success = wxGetTempFileName(_("image"), tempFile) ;
-
-        wxASSERT(success);
-
-        wxUnusedVar(success);
-
-        image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
-        filenameToRead = tempFile;
-        removeFile = true;
-
-        m_imageType = wxBITMAP_TYPE_JPEG;
-    }
-    wxFile file;
-    if (!file.Open(filenameToRead))
-        return false;
-
-    m_dataSize = (size_t) file.Length();
-    file.Close();
-
-    if (m_data)
-        delete[] m_data;
-    m_data = ReadBlock(filenameToRead, m_dataSize);
-
-    if (removeFile)
-        wxRemoveFile(filenameToRead);
-
-    return (m_data != NULL);
+    return GetProperty(name).GetDouble();
 }
 
-// Make an image block from the wxImage in the given
-// format.
-bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality)
+void wxRichTextProperties::SetProperty(const wxVariant& variant)
 {
-    m_imageType = imageType;
-    image.SetOption(wxT("quality"), quality);
-
-    if (imageType == -1)
-        return false; // Could not determine image type
-
-    wxString tempFile;
-    bool success = wxGetTempFileName(_("image"), tempFile) ;
-
-    wxASSERT(success);
-    wxUnusedVar(success);
-
-    if (!image.SaveFile(tempFile, m_imageType))
-    {
-        if (wxFileExists(tempFile))
-            wxRemoveFile(tempFile);
-        return false;
-    }
-
-    wxFile file;
-    if (!file.Open(tempFile))
-        return false;
-
-    m_dataSize = (size_t) file.Length();
-    file.Close();
-
-    if (m_data)
-        delete[] m_data;
-    m_data = ReadBlock(tempFile, m_dataSize);
+    wxASSERT(!variant.GetName().IsEmpty());
 
-    wxRemoveFile(tempFile);
+    int idx = Find(variant.GetName());
 
-    return (m_data != NULL);
+    if (idx == -1)
+        m_properties.Add(variant);
+    else
+        m_properties[idx] = variant;
 }
 
-
-// Write to a file
-bool wxRichTextImageBlock::Write(const wxString& filename)
+void wxRichTextProperties::SetProperty(const wxString& name, const wxVariant& variant)
 {
-    return WriteBlock(filename, m_data, m_dataSize);
-}
+    int idx = Find(name);
+    wxVariant var(variant);
+    var.SetName(name);
 
-void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block)
-{
-    m_imageType = block.m_imageType;
-    if (m_data)
-    {
-        delete[] m_data;
-        m_data = NULL;
-    }
-    m_dataSize = block.m_dataSize;
-    if (m_dataSize == 0)
-        return;
+    if (idx == -1)
+        m_properties.Add(var);
+    else
+        m_properties[idx] = var;
+}
 
-    m_data = new unsigned char[m_dataSize];
-    unsigned int i;
-    for (i = 0; i < m_dataSize; i++)
-        m_data[i] = block.m_data[i];
+void wxRichTextProperties::SetProperty(const wxString& name, const wxString& value)
+{
+    SetProperty(name, wxVariant(value, name));
 }
 
-//// Operators
-void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block)
+void wxRichTextProperties::SetProperty(const wxString& name, long value)
 {
-    Copy(block);
+    SetProperty(name, wxVariant(value, name));
 }
 
-// Load a wxImage from the block
-bool wxRichTextImageBlock::Load(wxImage& image)
+void wxRichTextProperties::SetProperty(const wxString& name, double value)
 {
-    if (!m_data)
-        return false;
+    SetProperty(name, wxVariant(value, name));
+}
 
-    // Read in the image.
-#if wxUSE_STREAMS
-    wxMemoryInputStream mstream(m_data, m_dataSize);
-    bool success = image.LoadFile(mstream, GetImageType());
-#else
-    wxString tempFile;
-    bool success = wxGetTempFileName(_("image"), tempFile) ;
-    wxASSERT(success);
+void wxRichTextProperties::SetProperty(const wxString& name, bool value)
+{
+    SetProperty(name, wxVariant(value, name));
+}
 
-    if (!WriteBlock(tempFile, m_data, m_dataSize))
+void wxRichTextProperties::RemoveProperties(const wxRichTextProperties& properties)
+{
+    size_t i;
+    for (i = 0; i < properties.GetCount(); i++)
     {
-        return false;
+        wxString name = properties.GetProperties()[i].GetName();
+        if (HasProperty(name))
+            Remove(name);
     }
-    success = image.LoadFile(tempFile, GetImageType());
-    wxRemoveFile(tempFile);
-#endif
+}
 
-    return success;
+void wxRichTextProperties::MergeProperties(const wxRichTextProperties& properties)
+{
+    size_t i;
+    for (i = 0; i < properties.GetCount(); i++)
+    {
+        SetProperty(properties.GetProperties()[i]);
+    }
 }
 
-// Write data in hex to a stream
-bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
+wxRichTextObject* wxRichTextObjectAddress::GetObject(wxRichTextParagraphLayoutBox* topLevelContainer) const
 {
-    wxString hex;
-    int i;
-    for (i = 0; i < (int) m_dataSize; i++)
+    if (m_address.GetCount() == 0)
+        return topLevelContainer;
+
+    wxRichTextCompositeObject* p = topLevelContainer;
+    size_t i = 0;
+    while (p && i < m_address.GetCount())
     {
-        hex = wxDecToHex(m_data[i]);
-        wxCharBuffer buf = hex.ToAscii();
+        int pos = m_address[i];
+        wxASSERT(pos >= 0 && pos < (int) p->GetChildren().GetCount());
+        if (pos < 0 || pos >= (int) p->GetChildren().GetCount())
+            return NULL;
 
-        stream.Write((const char*) buf, hex.length());
-    }
+        wxRichTextObject* p1 = p->GetChild(pos);
+        if (i == (m_address.GetCount()-1))
+            return p1;
 
-    return true;
+        p = wxDynamicCast(p1, wxRichTextCompositeObject);
+        i ++;
+    }
+    return NULL;
 }
 
-// Read data in hex from a stream
-bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType)
+bool wxRichTextObjectAddress::Create(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj)
 {
-    int dataSize = length/2;
+    m_address.Clear();
 
-    if (m_data)
-        delete[] m_data;
+    if (topLevelContainer == obj)
+        return true;
 
-    wxString str(wxT("  "));
-    m_data = new unsigned char[dataSize];
-    int i;
-    for (i = 0; i < dataSize; i ++)
+    wxRichTextObject* o = obj;
+    while (o)
     {
-        str[0] = stream.GetC();
-        str[1] = stream.GetC();
+        wxRichTextCompositeObject* p = wxDynamicCast(o->GetParent(), wxRichTextCompositeObject);
+        if (!p)
+            return false;
 
-        m_data[i] = (unsigned char)wxHexToDec(str);
-    }
+        int pos = p->GetChildren().IndexOf(o);
+        if (pos == -1)
+            return false;
 
-    m_dataSize = dataSize;
-    m_imageType = imageType;
+        m_address.Insert(pos, 0);
 
-    return true;
+        if (p == topLevelContainer)
+            return true;
+
+        o = p;
+    }
+    return false;
 }
 
-// Allocate and read from stream as a block of memory
-unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)
+// Equality test
+bool wxRichTextSelection::operator==(const wxRichTextSelection& sel) const
 {
-    unsigned char* block = new unsigned char[size];
-    if (!block)
-        return NULL;
-
-    stream.Read(block, size);
-
-    return block;
+    if (m_container != sel.m_container)
+        return false;
+    if (m_ranges.GetCount() != sel.m_ranges.GetCount())
+        return false;
+    size_t i;
+    for (i = 0; i < m_ranges.GetCount(); i++)
+        if (!(m_ranges[i] == sel.m_ranges[i]))
+            return false;
+    return true;
 }
 
-unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size)
+// Get the selections appropriate to the specified object, if any; returns wxRICHTEXT_NO_SELECTION if none
+// or none at the level of the object's container.
+wxRichTextRangeArray wxRichTextSelection::GetSelectionForObject(wxRichTextObject* obj) const
 {
-    wxFileInputStream stream(filename);
-    if (!stream.Ok())
-        return NULL;
+    if (IsValid())
+    {
+        wxRichTextParagraphLayoutBox* container = obj->GetParentContainer();
 
-    return ReadBlock(stream, size);
-}
+        if (container == m_container)
+            return m_ranges;
 
-// Write memory block to stream
-bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size)
-{
-    stream.Write((void*) block, size);
-    return stream.IsOk();
+        container = obj->GetContainer();
+        while (container)
+        {
+            if (container->GetParent())
+            {
+                // If we found that our object's container is within the range of
+                // a selection higher up, then assume the whole original object
+                // is also selected.
+                wxRichTextParagraphLayoutBox* parentContainer = container->GetParentContainer();
+                if (parentContainer == m_container)
+                {
+                    if (WithinSelection(container->GetRange().GetStart(), m_ranges))
+                    {
+                        wxRichTextRangeArray ranges;
+                        ranges.Add(obj->GetRange());
+                        return ranges;
+                    }
+                }
 
+                container = parentContainer;
+            }
+            else
+            {
+                container = NULL;
+                break;
+            }
+        }
+    }
+    return wxRichTextRangeArray();
 }
 
-// Write memory block to file
-bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size)
+// Is the given position within the selection?
+bool wxRichTextSelection::WithinSelection(long pos, wxRichTextObject* obj) const
 {
-    wxFileOutputStream outStream(filename);
-    if (!outStream.Ok())
+    if (!IsValid())
         return false;
+    else
+    {
+        wxRichTextRangeArray selectionRanges = GetSelectionForObject(obj);
+        return WithinSelection(pos, selectionRanges);
+    }
+}
 
-    return WriteBlock(outStream, block, size);
+// Is the given position within the selection range?
+bool wxRichTextSelection::WithinSelection(long pos, const wxRichTextRangeArray& ranges)
+{
+    size_t i;
+    for (i = 0; i < ranges.GetCount(); i++)
+    {
+        const wxRichTextRange& range = ranges[i];
+        if (pos >= range.GetStart() && pos <= range.GetEnd())
+            return true;
+    }
+    return false;
 }
 
-// Gets the extension for the block's type
-wxString wxRichTextImageBlock::GetExtension() const
+// Is the given range completely within the selection range?
+bool wxRichTextSelection::WithinSelection(const wxRichTextRange& range, const wxRichTextRangeArray& ranges)
 {
-    wxImageHandler* handler = wxImage::FindHandler(GetImageType());
-    if (handler)
-        return handler->GetExtension();
-    else
-        return wxEmptyString;
+    size_t i;
+    for (i = 0; i < ranges.GetCount(); i++)
+    {
+        const wxRichTextRange& eachRange = ranges[i];
+        if (range.IsWithin(eachRange))
+            return true;
+    }
+    return false;
 }
 
-#if wxUSE_DATAOBJ
+IMPLEMENT_CLASS(wxRichTextDrawingHandler, wxObject)
+IMPLEMENT_CLASS(wxRichTextDrawingContext, wxObject)
 
-/*!
- * The data object for a wxRichTextBuffer
- */
+bool wxRichTextDrawingContext::HasVirtualAttributes(wxRichTextObject* obj) const
+{
+    wxList::compatibility_iterator node = m_buffer->GetDrawingHandlers().GetFirst();
+    while (node)
+    {
+        wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+        if (handler->HasVirtualAttributes(obj))
+            return true;
 
-const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape");
+        node = node->GetNext();
+    }
+    return false;
+}
 
-wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer)
+wxRichTextAttr wxRichTextDrawingContext::GetVirtualAttributes(wxRichTextObject* obj) const
 {
-    m_richTextBuffer = richTextBuffer;
-
-    // this string should uniquely identify our format, but is otherwise
-    // arbitrary
-    m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId());
+    wxRichTextAttr attr;
+    // We apply all handlers, so we can may combine several different attributes
+    wxList::compatibility_iterator node = m_buffer->GetDrawingHandlers().GetFirst();
+    while (node)
+    {
+        wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+        if (handler->HasVirtualAttributes(obj))
+        {
+            bool success = handler->GetVirtualAttributes(attr, obj);
+            wxASSERT(success);
+            wxUnusedVar(success);
+        }
 
-    SetFormat(m_formatRichTextBuffer);
+        node = node->GetNext();
+    }
+    return attr;
 }
 
-wxRichTextBufferDataObject::~wxRichTextBufferDataObject()
+bool wxRichTextDrawingContext::ApplyVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const
 {
-    delete m_richTextBuffer;
+    if (HasVirtualAttributes(obj))
+    {
+        wxRichTextAttr a(GetVirtualAttributes(obj));
+        attr.Apply(a);
+        return true;
+    }
+    else
+        return false;
 }
 
-// after a call to this function, the richTextBuffer is owned by the caller and it
-// is responsible for deleting it!
-wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer()
+/// Adds a handler to the end
+void wxRichTextBuffer::AddDrawingHandler(wxRichTextDrawingHandler *handler)
 {
-    wxRichTextBuffer* richTextBuffer = m_richTextBuffer;
-    m_richTextBuffer = NULL;
-
-    return richTextBuffer;
+    sm_drawingHandlers.Append(handler);
 }
 
-wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
+/// Inserts a handler at the front
+void wxRichTextBuffer::InsertDrawingHandler(wxRichTextDrawingHandler *handler)
 {
-    return m_formatRichTextBuffer;
+    sm_drawingHandlers.Insert( handler );
 }
 
-size_t wxRichTextBufferDataObject::GetDataSize() const
+/// Removes a handler
+bool wxRichTextBuffer::RemoveDrawingHandler(const wxString& name)
 {
-    if (!m_richTextBuffer)
-        return 0;
-
-    wxString bufXML;
-
+    wxRichTextDrawingHandler *handler = FindDrawingHandler(name);
+    if (handler)
     {
-        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;
-        }
+        sm_drawingHandlers.DeleteObject(handler);
+        delete handler;
+        return true;
     }
-
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
-    return strlen(buffer) + 1;
-#else
-    return bufXML.Length()+1;
-#endif
+    else
+        return false;
 }
 
-bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const
+wxRichTextDrawingHandler* wxRichTextBuffer::FindDrawingHandler(const wxString& name)
 {
-    if (!pBuf || !m_richTextBuffer)
-        return false;
+    wxList::compatibility_iterator node = sm_drawingHandlers.GetFirst();
+    while (node)
+    {
+        wxRichTextDrawingHandler *handler = (wxRichTextDrawingHandler*)node->GetData();
+        if (handler->GetName().Lower() == name.Lower()) return handler;
 
-    wxString bufXML;
+        node = node->GetNext();
+    }
+    return NULL;
+}
 
+void wxRichTextBuffer::CleanUpDrawingHandlers()
+{
+    wxList::compatibility_iterator node = sm_drawingHandlers.GetFirst();
+    while (node)
     {
-        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;
-        }
+        wxRichTextDrawingHandler* handler = (wxRichTextDrawingHandler*)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete handler;
+        node = next;
     }
 
-#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;
+    sm_drawingHandlers.Clear();
 }
 
-bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+void wxRichTextBuffer::AddFieldType(wxRichTextFieldType *fieldType)
 {
-    delete m_richTextBuffer;
-    m_richTextBuffer = NULL;
-
-    wxString bufXML((const char*) buf, wxConvUTF8);
-
-    m_richTextBuffer = new wxRichTextBuffer;
+    sm_fieldTypes[fieldType->GetName()] = fieldType;
+}
 
-    wxStringInputStream stream(bufXML);
-    if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML))
+bool wxRichTextBuffer::RemoveFieldType(const wxString& name)
+{
+    wxRichTextFieldTypeHashMap::iterator it = sm_fieldTypes.find(name);
+    if (it == sm_fieldTypes.end())
+        return false;
+    else
     {
-        wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler."));
+        wxRichTextFieldType* fieldType = it->second;
+        sm_fieldTypes.erase(it);
+        delete fieldType;
+        return true;
+    }
+}
 
-        delete m_richTextBuffer;
-        m_richTextBuffer = NULL;
+wxRichTextFieldType *wxRichTextBuffer::FindFieldType(const wxString& name)
+{
+    wxRichTextFieldTypeHashMap::iterator it = sm_fieldTypes.find(name);
+    if (it == sm_fieldTypes.end())
+        return NULL;
+    else
+        return it->second;
+}
 
-        return false;
+void wxRichTextBuffer::CleanUpFieldTypes()
+{
+    wxRichTextFieldTypeHashMap::iterator it;
+    for( it = sm_fieldTypes.begin(); it != sm_fieldTypes.end(); ++it )
+    {
+        wxRichTextFieldType* fieldType = it->second;
+        delete fieldType;
     }
-    return true;
-}
 
-#endif
-    // wxUSE_DATAOBJ
+    sm_fieldTypes.clear();
+}
 
 #endif
     // wxUSE_RICHTEXT