Add wxVersionInfo and functions returning it for 3rd party libraries.

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 949d375ced59ed1b5c6b9465a1967bcd0d3bf96d..c8a276be44cf800cf6c406c7fc129d37e6248cec 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -28,17 +28,22 @@
     #include "wx/module.h"
 #endif
 
     #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/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/richtextctrl.h"
 #include "wx/richtext/richtextstyles.h"

+#include "wx/richtext/richtextimagedlg.h"

 
 #include "wx/listimpl.cpp"
 
 #include "wx/listimpl.cpp"

+#include "wx/arrimpl.cpp"

 
 WX_DEFINE_LIST(wxRichTextObjectList)
 WX_DEFINE_LIST(wxRichTextLineList)
 
 WX_DEFINE_LIST(wxRichTextObjectList)
 WX_DEFINE_LIST(wxRichTextLineList)


@@ -46,8 +51,381 @@ WX_DEFINE_LIST(wxRichTextLineList)
 // Switch off if the platform doesn't like it for some reason
 #define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1
 
 // 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;
 
 const wxChar wxRichTextLineBreakChar = (wxChar) 29;
 

+// Helper classes for floating layout
+struct wxRichTextFloatRectMap
+{
+    wxRichTextFloatRectMap(int sY, int eY, int w, wxRichTextObject* obj)
+    {
+        startY = sY;
+        endY = eY;
+        width = w;
+        anchor = obj;
+    }
+
+    int startY, endY;
+    int width;
+    wxRichTextObject* anchor;
+};
+
+WX_DEFINE_SORTED_ARRAY(wxRichTextFloatRectMap*, wxRichTextFloatRectMapArray);
+
+int wxRichTextFloatRectMapCmp(wxRichTextFloatRectMap* r1, wxRichTextFloatRectMap* r2)
+{
+    return r1->startY - r2->startY;
+}
+
+class wxRichTextFloatCollector
+{
+public:
+    wxRichTextFloatCollector(int width);
+    ~wxRichTextFloatCollector();
+
+    // Collect the floating objects info in the given paragraph
+    void CollectFloat(wxRichTextParagraph* para);
+    void CollectFloat(wxRichTextParagraph* para, wxRichTextObject* floating);
+
+    // 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, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style);
+
+    // HitTest the floats
+    int HitTest(wxDC& dc, const wxPoint& pt, long& textPosition);
+
+    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, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style);
+
+    static int HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition);
+
+private:
+    wxRichTextFloatRectMapArray m_left;
+    wxRichTextFloatRectMapArray m_right;
+    int m_width;
+    wxRichTextParagraph* m_para;
+};
+
+/*
+ * 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)
+{
+    int end = array.GetCount() - 1;
+    int start = 0;
+    int ret = 0;
+
+    wxASSERT(end >= 0);
+
+    while (true)
+    {
+        if (start > end)
+        {
+            break;
+        }
+
+        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;
+}
+
+int wxRichTextFloatCollector::GetWidthFromFloatRect(const wxRichTextFloatRectMapArray& array, int index, int startY, int endY)
+{
+    int ret = 0;
+    int len = array.GetCount();
+
+    wxASSERT(index >= 0 && index < len);
+
+    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++;
+    }
+
+    return ret;
+}
+
+wxRichTextFloatCollector::wxRichTextFloatCollector(int width) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp)
+{
+    m_width = width;
+    m_para = NULL;
+}
+
+void wxRichTextFloatCollector::FreeFloatRectMapArray(wxRichTextFloatRectMapArray& array)
+{
+    int len = array.GetCount();
+    for (int i = 0; i < len; i++)
+        delete array[i];
+}
+
+wxRichTextFloatCollector::~wxRichTextFloatCollector()
+{
+    FreeFloatRectMapArray(m_left);
+    FreeFloatRectMapArray(m_right);
+}
+
+int wxRichTextFloatCollector::GetFitPosition(const wxRichTextFloatRectMapArray& array, int start, int height) const
+{
+    if (array.GetCount() == 0)
+        return start;
+
+    unsigned int i = SearchAdjacentRect(array, start);
+    int last = start;
+    while (i < array.GetCount())
+    {
+        if (array[i]->startY - last >= height)
+            return last + 1;
+        last = array[i]->endY;
+        i++;
+    }
+
+    return last + 1;
+}
+
+int wxRichTextFloatCollector::GetFitPosition(int direction, int start, int height) const
+{
+    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
+    {
+        wxASSERT("Never should be here");
+        return start;
+    }
+}
+
+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("Must some error occurs");
+        }
+
+        m_para = para;
+}
+
+void wxRichTextFloatCollector::CollectFloat(wxRichTextParagraph* para)
+{
+    wxRichTextObjectList::compatibility_iterator node = para->GetChildren().GetFirst();
+    while (node)
+    {
+        wxRichTextObject* floating = node->GetData();
+
+        if (floating->IsFloating())
+        {
+            CollectFloat(para, floating);
+        }
+
+        node = node->GetNext();
+    }
+
+    m_para = para;
+}
+
+wxRichTextParagraph* wxRichTextFloatCollector::LastParagraph()
+{
+    return m_para;
+}
+
+wxRect wxRichTextFloatCollector::GetAvailableRect(int startY, int endY)
+{
+    int widthLeft = 0, widthRight = 0;
+    if (m_left.GetCount() != 0)
+    {
+        unsigned int i = SearchAdjacentRect(m_left, startY);
+        if (i >= 0 && i < m_left.GetCount())
+            widthLeft = GetWidthFromFloatRect(m_left, i, startY, endY);
+    }
+    if (m_right.GetCount() != 0)
+    {
+        unsigned int j = SearchAdjacentRect(m_right, startY);
+        if (j >= 0 && j < m_right.GetCount())
+            widthRight = GetWidthFromFloatRect(m_right, j, startY, endY);
+    }
+
+    return wxRect(widthLeft, 0, m_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;
+}
+
+void wxRichTextFloatCollector::DrawFloat(const wxRichTextFloatRectMapArray& array, wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& WXUNUSED(selectionRange), const wxRect& rect, int descent, int style)
+{
+    int start = rect.y;
+    int end = rect.y + rect.height;
+    unsigned int i, j;
+    i = SearchAdjacentRect(array, start);
+    if (i < 0 || i >= array.GetCount())
+        return;
+    j = SearchAdjacentRect(array, end);
+    if (j < 0 || j >= array.GetCount())
+        j = array.GetCount() - 1;
+    while (i <= j)
+    {
+        wxRichTextObject* obj = array[i]->anchor;
+        wxRichTextRange r = obj->GetRange();
+        obj->Draw(dc, r, wxRichTextRange(0, -1), wxRect(obj->GetPosition(), obj->GetCachedSize()), descent, style);
+        i++;
+    }
+}
+
+void wxRichTextFloatCollector::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)
+{
+    if (m_left.GetCount() > 0)
+        DrawFloat(m_left, dc, range, selectionRange, rect, descent, style);
+    if (m_right.GetCount() > 0)
+        DrawFloat(m_right, dc, range, selectionRange, rect, descent, style);
+}
+
+int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& array, wxDC& WXUNUSED(dc), const wxPoint& pt, long& textPosition)
+{
+    unsigned int i;
+    if (array.GetCount() == 0)
+        return wxRICHTEXT_HITTEST_NONE;
+    i = SearchAdjacentRect(array, pt.y);
+    if (i < 0 || i >= array.GetCount())
+        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();
+        if (pt.x > (pt.x + pt.x + size.x) / 2)
+            return wxRICHTEXT_HITTEST_BEFORE;
+        else
+            return wxRICHTEXT_HITTEST_AFTER;
+    }
+
+    return wxRICHTEXT_HITTEST_NONE;
+}
+
+int wxRichTextFloatCollector::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)
+{
+    int ret = HitTestFloat(m_left, dc, pt, textPosition);
+    if (ret == wxRICHTEXT_HITTEST_NONE)
+    {
+        ret = HitTestFloat(m_right, dc, pt, textPosition);
+    }
+    return ret;
+}
+
+// Helpers for efficiency
+inline void wxCheckSetFont(wxDC& dc, const wxFont& font)
+{
+    // JACS: did I do this some time ago when testing? Should we re-enable it?
+#if 0
+    const wxFont& font1 = dc.GetFont();
+    if (font1.IsOk() && font.IsOk())
+    {
+        if (font1.GetPointSize() == font.GetPointSize() &&
+            font1.GetFamily() == font.GetFamily() &&
+            font1.GetStyle() == font.GetStyle() &&
+            font1.GetWeight() == font.GetWeight() &&
+            font1.GetUnderlined() == font.GetUnderlined() &&
+            font1.GetFamily() == font.GetFamily() &&
+            font1.GetFaceName() == font.GetFaceName())
+            return;
+    }
+#endif
+    dc.SetFont(font);
+}
+
+inline void wxCheckSetPen(wxDC& dc, const wxPen& pen)
+{
+    const wxPen& pen1 = dc.GetPen();
+    if (pen1.IsOk() && pen.IsOk())
+    {
+        if (pen1.GetWidth() == pen.GetWidth() &&
+            pen1.GetStyle() == pen.GetStyle() &&
+            pen1.GetColour() == pen.GetColour())
+            return;
+    }
+    dc.SetPen(pen);
+}
+
+inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush)
+{
+    const wxBrush& brush1 = dc.GetBrush();
+    if (brush1.IsOk() && brush.IsOk())
+    {
+        if (brush1.GetStyle() == brush.GetStyle() &&
+            brush1.GetColour() == brush.GetColour())
+            return;
+    }
+    dc.SetBrush(brush);
+}
+

 /*!
  * wxRichTextObject
  * This is the base for drawable objects.
 /*!
  * wxRichTextObject
  * This is the base for drawable objects.


@@ -86,6 +464,7 @@ void wxRichTextObject::Copy(const wxRichTextObject& obj)
     m_dirty = obj.m_dirty;
     m_range = obj.m_range;
     m_attributes = obj.m_attributes;
     m_dirty = obj.m_dirty;
     m_range = obj.m_range;
     m_attributes = obj.m_attributes;

+    m_properties = obj.m_properties;

     m_descent = obj.m_descent;
 }
 
     m_descent = obj.m_descent;
 }
 


@@ -103,27 +482,299 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin
 }
 
 // Convert units in tenths of a millimetre to device units
 }
 
 // Convert units in tenths of a millimetre to device units

-int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units)
+int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) const

 {
 {

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

     // Unscale
     // Unscale

-    wxRichTextBuffer* buffer = GetBuffer();
-    if (buffer)
-        p = (int) ((double)p / buffer->GetScale());
+    double scale = 1.0;
+    if (GetBuffer())
+        scale = GetBuffer()->GetScale();
+    int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units, scale);
+

     return p;
 }
 
 // Convert units in tenths of a millimetre to device units
     return p;
 }
 
 // Convert units in tenths of a millimetre to device units

-int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units)
+int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units, double scale)

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

+    if (scale != 1.0)
+        pixels /= scale;

 
     return (int) pixels;
 }
 
 
     return (int) pixels;
 }
 

+// Convert units in pixels to tenths of a millimetre
+int wxRichTextObject::ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const
+{
+    int p = pixels;
+    double scale = 1.0;
+    if (GetBuffer())
+        scale = GetBuffer()->GetScale();
+
+    return ConvertPixelsToTenthsMM(dc.GetPPI().x, p, scale);
+}
+
+int wxRichTextObject::ConvertPixelsToTenthsMM(int ppi, int pixels, double scale)
+{
+    // There are ppi pixels in 254.1 "1/10 mm"
+
+    double p = double(pixels);
+
+    if (scale != 1.0)
+        p *= scale;
+
+    int units = int( p * 254.1 / (double) ppi );
+    return units;
+}
+
+// Draw the borders and background for the given rectangle and attributes.
+// Width and height are taken to be the content size, so excluding any
+// border, margin and padding.
+bool wxRichTextObject::DrawBoxAttributes(wxDC& dc, const wxRichTextAttr& attr, const wxRect& boxRect)
+{
+    // Assume boxRect is the area around the content
+    wxRect contentRect = boxRect;
+    wxRect marginRect, borderRect, paddingRect, outlineRect;
+
+    GetBoxRects(dc, attr, marginRect, borderRect, contentRect, paddingRect, outlineRect);
+
+    // Margin is transparent. Draw background from margin.
+    if (attr.HasBackgroundColour())
+    {
+        wxPen pen(attr.GetBackgroundColour());
+        wxBrush brush(attr.GetBackgroundColour());
+
+        dc.SetPen(pen);
+        dc.SetBrush(brush);
+        dc.DrawRectangle(marginRect);
+    }
+
+    if (attr.GetTextBoxAttr().GetBorder().HasBorder())
+        DrawBorder(dc, attr.GetTextBoxAttr().GetBorder(), borderRect);
+
+    if (attr.GetTextBoxAttr().GetOutline().HasBorder())
+        DrawBorder(dc, attr.GetTextBoxAttr().GetOutline(), outlineRect);
+
+    return true;
+}
+
+// Draw a border
+bool wxRichTextObject::DrawBorder(wxDC& dc, const wxTextAttrBorders& attr, const wxRect& rect)
+{
+    int borderLeft = 0, borderRight = 0, borderTop = 0, borderBottom = 0;
+    wxTextAttrDimensionConverter converter(dc);
+
+    if (attr.GetLeft().IsValid())
+    {
+        borderLeft = converter.GetPixels(attr.GetLeft().GetWidth());
+        wxColour col(attr.GetLeft().GetColour());
+
+        // 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);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
+
+        }
+        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);
+        }
+    }
+
+    if (attr.GetRight().IsValid())
+    {
+        borderRight = converter.GetPixels(attr.GetRight().GetWidth());
+
+        wxColour col(attr.GetRight().GetColour());
+
+        // If pen width is > 1, resorts to a solid rectangle.
+        if (borderRight == 1)
+        {
+            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);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height);
+
+        }
+        else if (borderRight > 1)
+        {
+            wxPen pen(col);
+            wxBrush brush(col);
+            dc.SetPen(pen);
+            dc.SetBrush(brush);
+            dc.DrawRectangle(rect.x - borderRight, rect.y, borderRight, rect.height);
+        }
+    }
+
+    if (attr.GetTop().IsValid())
+    {
+        borderTop = converter.GetPixels(attr.GetTop().GetWidth());
+
+        wxColour col(attr.GetTop().GetColour());
+
+        // 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);
+            dc.SetPen(pen);
+            dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y);
+
+        }
+        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);
+        }
+    }
+
+    if (attr.GetBottom().IsValid())
+    {
+        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);
+            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);
+        }
+    }
+
+    return true;
+}
+
+// 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, 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);
+
+    if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent())
+        marginLeft = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetLeft());
+    if (attr.GetTextBoxAttr().GetMargins().GetRight().IsPresent())
+        marginRight = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetRight());
+    if (attr.GetTextBoxAttr().GetMargins().GetTop().IsPresent())
+        marginTop = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetTop());
+    if (attr.GetTextBoxAttr().GetMargins().GetLeft().IsPresent())
+        marginBottom = converter.GetPixels(attr.GetTextBoxAttr().GetMargins().GetBottom());
+
+    if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent())
+        borderLeft = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth().IsPresent())
+        borderRight = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetRight().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth().IsPresent())
+        borderTop = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetTop().GetWidth());
+    if (attr.GetTextBoxAttr().GetBorder().GetLeft().GetWidth().IsPresent())
+        borderBottom = converter.GetPixels(attr.GetTextBoxAttr().GetBorder().GetBottom().GetWidth());
+
+    if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent())
+        paddingLeft = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetLeft());
+    if (attr.GetTextBoxAttr().GetPadding().GetRight().IsPresent())
+        paddingRight = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetRight());
+    if (attr.GetTextBoxAttr().GetPadding().GetTop().IsPresent())
+        paddingTop = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetTop());
+    if (attr.GetTextBoxAttr().GetPadding().GetLeft().IsPresent())
+        paddingBottom = converter.GetPixels(attr.GetTextBoxAttr().GetPadding().GetBottom());
+
+    if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent())
+        outlineLeft = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth().IsPresent())
+        outlineRight = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetRight().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth().IsPresent())
+        outlineTop = converter.GetPixels(attr.GetTextBoxAttr().GetOutline().GetTop().GetWidth());
+    if (attr.GetTextBoxAttr().GetOutline().GetLeft().GetWidth().IsPresent())
+        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;
+}
+
+

 /// Dump to output stream for debugging
 void wxRichTextObject::Dump(wxTextOutputStream& stream)
 {
 /// Dump to output stream for debugging
 void wxRichTextObject::Dump(wxTextOutputStream& stream)
 {


@@ -264,7 +915,8 @@ int wxRichTextCompositeObject::HitTest(wxDC& dc, const wxPoint& pt, long& textPo
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return wxRICHTEXT_HITTEST_NONE;
+    textPosition = GetRange().GetEnd()-1;
+    return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;

 }
 
 /// Finds the absolute position and row height for the given character position
 }
 
 /// Finds the absolute position and row height for the given character position


@@ -376,26 +1028,31 @@ wxString wxRichTextCompositeObject::GetTextForRange(const wxRichTextRange& range
 }
 
 /// Recursively merge all pieces that can be merged.
 }
 
 /// Recursively merge all pieces that can be merged.

-bool wxRichTextCompositeObject::Defragment()
+bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range)

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

-        wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
-        if (composite)
-            composite->Defragment();
-
-        if (node->GetNext())
+        if (range == wxRICHTEXT_ALL || !child->GetRange().IsOutside(range))

         {
         {

-            wxRichTextObject* nextChild = node->GetNext()->GetData();
-            if (child->CanMerge(nextChild) && child->Merge(nextChild))
+            wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
+            if (composite)
+                composite->Defragment();
+
+            if (node->GetNext())

             {
             {

-                nextChild->Dereference();
-                m_children.Erase(node->GetNext());
+                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.
+                    // Don't set node -- we'll see if we can merge again with the next
+                    // child.
+                }
+                else
+                    node = node->GetNext();

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


@@ -404,6 +1061,28 @@ bool wxRichTextCompositeObject::Defragment()
             node = node->GetNext();
     }
 
             node = node->GetNext();
     }
 

+    // 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))
+            {
+                if (child->IsEmpty())
+                {
+                    child->Dereference();
+                    m_children.Erase(node);
+                }
+                node = next;
+            }
+            else
+                node = node->GetNext();
+        }
+    }
+

     return true;
 }
 
     return true;
 }
 


@@ -419,102 +1098,118 @@ void wxRichTextCompositeObject::Dump(wxTextOutputStream& stream)
     }
 }
 
     }
 }
 

-

 /*!
 /*!

- * wxRichTextBox
- * This defines a 2D space to lay out objects
+ * wxRichTextParagraphLayoutBox
+ * This box knows how to lay out paragraphs.

  */
 
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextCompositeObject)

 
 

-wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
+wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):

     wxRichTextCompositeObject(parent)
 {
     wxRichTextCompositeObject(parent)
 {

+    Init();

 }
 
 }
 

-/// Draw the item
-bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style)
+wxRichTextParagraphLayoutBox::~wxRichTextParagraphLayoutBox()

 {
 {

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

     {
     {

-        wxRichTextObject* child = node->GetData();
-
-        wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize());
-        child->Draw(dc, range, selectionRange, childRect, descent, style);
-
-        node = node->GetNext();
+        delete m_floatCollector;
+        m_floatCollector = NULL;

     }
     }

-    return true;

 }
 
 }
 

-/// Lay the item out
-bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
+/// Initialize the object.
+void wxRichTextParagraphLayoutBox::Init()

 {
 {

-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        child->Layout(dc, rect, style);
+    m_ctrl = NULL;

 
 

-        node = node->GetNext();
-    }
-    m_dirty = false;
-    return true;
+    // 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;
+    m_floatCollector = NULL;

 }
 
 }
 

-/// 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
+void wxRichTextParagraphLayoutBox::Clear()

 {
 {

-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
-    if (node)
-    {
-        wxRichTextObject* child = node->GetData();
-        return child->GetRangeSize(range, size, descent, dc, flags, position);
-    }
-    else
-        return false;
+    DeleteChildren();
+
+    if (m_floatCollector)
+        delete m_floatCollector;
+    m_floatCollector = NULL;
+    m_partialParagraph = false;

 }
 
 /// Copy
 }
 
 /// Copy

-void wxRichTextBox::Copy(const wxRichTextBox& obj)
+void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)

 {
 {

+    Clear();
+

     wxRichTextCompositeObject::Copy(obj);
     wxRichTextCompositeObject::Copy(obj);

-}

 
 

+    m_partialParagraph = obj.m_partialParagraph;
+    m_defaultAttributes = obj.m_defaultAttributes;
+}

 
 

-/*!
- * wxRichTextParagraphLayoutBox
- * This box knows how to lay out paragraphs.
- */
+// Gather information about floating objects
+bool wxRichTextParagraphLayoutBox::UpdateFloatingObjects(int width, wxRichTextObject* untilObj)
+{
+    if (m_floatCollector != NULL)
+        delete m_floatCollector;
+    m_floatCollector = new wxRichTextFloatCollector(width);
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node && node->GetData() != untilObj)
+    {
+        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (child != NULL);
+        if (child)
+            m_floatCollector->CollectFloat(child);
+        node = node->GetNext();
+    }

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox, wxRichTextBox)
+    return true;
+}

 
 

-wxRichTextParagraphLayoutBox::wxRichTextParagraphLayoutBox(wxRichTextObject* parent):
-    wxRichTextBox(parent)
+// HitTest
+int wxRichTextParagraphLayoutBox::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition)

 {
 {

-    Init();
+    int ret = wxRICHTEXT_HITTEST_NONE;
+    if (m_floatCollector)
+        ret = m_floatCollector->HitTest(dc, pt, textPosition);
+
+    if (ret == wxRICHTEXT_HITTEST_NONE)
+        return wxRichTextCompositeObject::HitTest(dc, pt, textPosition);
+    else
+        return ret;

 }
 
 }
 

-/// Initialize the object.
-void wxRichTextParagraphLayoutBox::Init()
+/// Draw the floating objects
+void wxRichTextParagraphLayoutBox::DrawFloats(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int style)

 {
 {

-    m_ctrl = NULL;
+    if (m_floatCollector)
+        m_floatCollector->Draw(dc, range, selectionRange, rect, descent, style);
+}

 
 

-    // For now, assume is the only box and has no initial size.
-    m_range = wxRichTextRange(0, -1);
+void wxRichTextParagraphLayoutBox::MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextObject* obj)
+{
+    if (from == to)
+        return;

 
 

-    m_invalidRange.SetRange(-1, -1);
-    m_leftMargin = 4;
-    m_rightMargin = 4;
-    m_topMargin = 4;
-    m_bottomMargin = 4;
-    m_partialParagraph = false;
+    from->RemoveChild(obj);
+    to->AppendChild(obj);

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

+    DrawFloats(dc, range, selectionRange, rect, descent, style);

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


@@ -535,7 +1230,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
                 // Skip
             }
             else
                 // Skip
             }
             else

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

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


@@ -593,7 +1288,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
     if (invalidRange == wxRICHTEXT_ALL)
         layoutAll = true;
     else    // If we know what range is affected, start laying out from that point on.
     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())
+        if (invalidRange.GetStart() >= GetRange().GetStart())

     {
         wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart());
         if (firstParagraph)
     {
         wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart());
         if (firstParagraph)


@@ -602,10 +1297,13 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
             wxRichTextObjectList::compatibility_iterator previousNode;
             if ( firstNode )
                 previousNode = firstNode->GetPrevious();
             wxRichTextObjectList::compatibility_iterator previousNode;
             if ( firstNode )
                 previousNode = firstNode->GetPrevious();

-            if (firstNode && previousNode)
+            if (firstNode)

             {
             {

-                wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
-                availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+                if (previousNode)
+                {
+                    wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
+                    availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+                }

 
                 // Now we're going to start iterating from the first affected paragraph.
                 node = firstNode;
 
                 // Now we're going to start iterating from the first affected paragraph.
                 node = firstNode;


@@ -615,6 +1313,8 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
         }
     }
 
         }
     }
 

+    UpdateFloatingObjects(availableSpace.width, node ? node->GetData() : (wxRichTextObject*) NULL);
+

     // A way to force speedy rest-of-buffer layout (the 'else' below)
     bool forceQuickLayout = false;
 
     // A way to force speedy rest-of-buffer layout (the 'else' below)
     bool forceQuickLayout = false;
 


@@ -623,7 +1323,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
         // Assume this box only contains paragraphs
 
         wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);

-        wxCHECK_MSG( child, false, _T("Unknown object in layout") );
+        wxCHECK_MSG( child, false, wxT("Unknown object in layout") );

 
         // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
         if ( !forceQuickLayout &&
 
         // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines
         if ( !forceQuickLayout &&


@@ -682,16 +1382,8 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
     return true;
 }
 
     return true;
 }
 

-/// Copy
-void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
-{
-    wxRichTextBox::Copy(obj);
-
-    m_partialParagraph = obj.m_partialParagraph;
-}
-

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

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

 {
     wxSize sz;
 
 {
     wxSize sz;
 


@@ -799,25 +1491,29 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {

-        // child is a paragraph
-        wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
-        wxASSERT (child != NULL);
-
-        wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-        while (node2)
+        wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
+        if (obj->GetRange().Contains(pos))

         {
         {

-            wxRichTextLine* line = node2->GetData();
+            // child is a paragraph
+            wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph);
+            wxASSERT (child != NULL);
+
+            wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+            while (node2)
+            {
+                wxRichTextLine* line = node2->GetData();

 
 

-            wxRichTextRange range = line->GetAbsoluteRange();
+                wxRichTextRange range = line->GetAbsoluteRange();

 
 

-            if (range.Contains(pos) ||
+                if (range.Contains(pos) ||

 
 

-                // 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;
+                    // 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();
+                node2 = node2->GetNext();
+            }

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


@@ -901,18 +1597,28 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP
 
 
 /// Convenience function to add a paragraph of text
 
 
 /// Convenience function to add a paragraph of text

-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, 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.
 {
     // 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;
+    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())
+    {
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+    }
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;

 
     wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
 
 
     wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
 


@@ -925,18 +1631,28 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text,
 }
 
 /// Adds multiple paragraphs, based on newlines.
 }
 
 /// Adds multiple paragraphs, based on newlines.

-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, 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.
 {
     // 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;
+    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())
+    {
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+    }
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;

 
     wxRichTextParagraph* firstPara = NULL;
     wxRichTextParagraph* lastPara = NULL;
 
     wxRichTextParagraph* firstPara = NULL;
     wxRichTextParagraph* lastPara = NULL;


@@ -958,15 +1674,18 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
         wxChar ch = text[i];
         if (ch == wxT('\n') || ch == wxT('\r'))
         {
         wxChar ch = text[i];
         if (ch == wxT('\n') || ch == wxT('\r'))
         {

-            wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
-            plainText->SetText(line);
+            if (i != (len-1))
+            {
+                wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+                plainText->SetText(line);

 
 

-            para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+                para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);

 
 

-            AppendChild(para);
+                AppendChild(para);

 
 

-            lastPara = para;
-            line = wxEmptyString;
+                lastPara = para;
+                line = wxEmptyString;
+            }

         }
         else
             line += ch;
         }
         else
             line += ch;


@@ -988,18 +1707,28 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
 }
 
 /// Convenience function to add an image
 }
 
 /// Convenience function to add an image

-wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)
+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.
 {
     // 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;
+    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())
+    {
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+        if (def)
+            defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+    }
+    else
+        wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+
+    wxRichTextAttr* pStyle = paraStyle ? paraStyle : (wxRichTextAttr*) & defaultParaStyle;
+    wxRichTextAttr* cStyle = & defaultCharStyle;

 
     wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
     AppendChild(para);
 
     wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
     AppendChild(para);


@@ -1024,6 +1753,8 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag
     wxRichTextParagraph* para = GetParagraphAtPosition(position);
     if (para)
     {
     wxRichTextParagraph* para = GetParagraphAtPosition(position);
     if (para)
     {

+        wxRichTextAttr originalAttr = para->GetAttributes();
+

         wxRichTextObjectList::compatibility_iterator node = m_children.Find(para);
 
         // Now split at this position, returning the object to insert the new
         wxRichTextObjectList::compatibility_iterator node = m_children.Find(para);
 
         // Now split at this position, returning the object to insert the new


@@ -1044,11 +1775,6 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT (firstPara != NULL);
 
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT (firstPara != NULL);
 

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

             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
             while (objectNode)
             {
             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
             while (objectNode)
             {


@@ -1096,7 +1822,19 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT(firstPara != NULL);
 
             wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
             wxASSERT(firstPara != NULL);
 

+            if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE))
+                para->SetAttributes(firstPara->GetAttributes());
+
+            // 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;
+

             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
             wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();

+
+            if (objectNode && firstPara->GetChildren().GetCount() == 1 && objectNode->GetData()->IsEmpty())
+                emptyParagraphAttributes = objectNode->GetData()->GetAttributes();
+

             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();
             while (objectNode)
             {
                 wxRichTextObject* newObj = objectNode->GetData()->Clone();


@@ -1116,50 +1854,57 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag
             wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext();
             wxRichTextParagraph* finalPara = para;
 
             wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext();
             wxRichTextParagraph* finalPara = para;
 

+            bool needExtraPara = (!i || !fragment.GetPartialParagraph());
+

             // If there was only one paragraph, we need to insert a new one.
             // If there was only one paragraph, we need to insert a new one.

-            if (!i)
+            while (i)

             {
             {

-                finalPara = new wxRichTextParagraph;
+                wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
+                wxASSERT( para != NULL );

 
 

-                // 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());
+                finalPara = (wxRichTextParagraph*) para->Clone();

 
                 if (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);
 
                 if (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);

+
+                i = i->GetNext();

             }
             }

-            else while (i)
-            {
-                wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
-                wxASSERT( para != NULL );

 
 

-                finalPara = (wxRichTextParagraph*) para->Clone();
+            // 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 (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);
 
                 if (nextParagraph)
                     InsertChild(finalPara, nextParagraph);
                 else
                     AppendChild(finalPara);

-
-                i = i->GetNext();

             }
 
             // 4. Add back the remaining content.
             if (finalPara)
             {
             }
 
             // 4. Add back the remaining content.
             if (finalPara)
             {

-                finalPara->MoveFromList(savedObjects);
+                if (nextObject)
+                    finalPara->MoveFromList(savedObjects);

 
                 // Ensure there's at least one object
                 if (finalPara->GetChildCount() == 0)
                 {
                     wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
 
                 // Ensure there's at least one object
                 if (finalPara->GetChildCount() == 0)
                 {
                     wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);

+                    text->SetAttributes(emptyParagraphAttributes);

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

+            if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara)
+                finalPara->SetAttributes(firstPara->GetAttributes());
+            else if (finalPara && finalPara != para)
+                finalPara->SetAttributes(originalAttr);
+

             return true;
         }
     }
             return true;
         }
     }


@@ -1273,7 +2018,7 @@ long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosi
                 wxRichTextLine* line = node2->GetData();
                 wxRichTextRange lineRange = line->GetAbsoluteRange();
 
                 wxRichTextLine* line = node2->GetData();
                 wxRichTextRange lineRange = line->GetAbsoluteRange();
 

-                if (lineRange.Contains(pos))
+                if (lineRange.Contains(pos) || pos == lineRange.GetStart())

                 {
                     // 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
                 {
                     // 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


@@ -1343,6 +2088,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 
 {
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
 

+    wxRichTextParagraph* firstPara = NULL;

     while (node)
     {
         wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
     while (node)
     {
         wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);


@@ -1357,58 +2103,82 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range)
             // Deletes the content of this object within the given range
             obj->DeleteRange(range);
 
             // 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 the whole paragraph is within the range to delete,
             // delete the whole thing.

-            if (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd())
+            if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd())

             {
                 // Delete the whole object
                 RemoveChild(obj, true);
             {
                 // Delete the whole object
                 RemoveChild(obj, true);

+                obj = NULL;

             }
             }

+            else if (!firstPara)
+                firstPara = obj;
+

             // If the range includes the paragraph end, we need to join this
             // and the next paragraph.
             // If the range includes the paragraph end, we need to join this
             // and the next paragraph.

-            else if (range.Contains(obj->GetRange().GetEnd()))
+            if (range.GetEnd() <= thisRange.GetEnd())

             {
                 // We need to move the objects from the next paragraph
                 // to this paragraph
 
             {
                 // We need to move the objects from the next paragraph
                 // to this paragraph
 

-                if (next)
+                wxRichTextParagraph* nextParagraph = NULL;
+                if ((range.GetEnd() < thisRange.GetEnd()) && obj)
+                    nextParagraph = obj;
+                else

                 {
                 {

-                    wxRichTextParagraph* nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
-                    next = next->GetNext();
-                    if (nextParagraph)
-                    {
-                        // Delete the stuff we need to delete
-                        nextParagraph->DeleteRange(range);
+                    // We're ending at the end of the paragraph, so merge the _next_ paragraph.
+                    if (next)
+                        nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
+                }

 
 

-                        // Move the objects to the previous para
-                        wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
+                bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara;

 
 

-                        while (node1)
-                        {
-                            wxRichTextObject* obj1 = node1->GetData();
+                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();
+                }

 
 

-                            // If the object is empty, optimise it out
-                            if (obj1->IsEmpty())
-                            {
-                                delete obj1;
-                            }
-                            else
-                            {
-                                obj->AppendChild(obj1);
-                            }
+                if (firstPara && nextParagraph && firstPara != nextParagraph)
+                {
+                    // Move the objects to the previous para
+                    wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();

 
 

-                            wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
-                            nextParagraph->GetChildren().Erase(node1);
+                    while (node1)
+                    {
+                        wxRichTextObject* obj1 = node1->GetData();

 
 

-                            node1 = next1;
-                        }
+                        firstPara->AppendChild(obj1);

 
 

-                        // Delete the paragraph
-                        RemoveChild(nextParagraph, true);
+                        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;

             }
         }
 
             }
         }
 


@@ -1429,8 +2199,6 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {
         wxRichTextObject* child = node->GetData();
         if (!child->GetRange().IsOutside(range))
         {

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

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


@@ -1438,7 +2206,7 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
 
             text += childText;
 
 
             text += childText;
 

-            if (childRange.GetEnd() == child->GetRange().GetEnd())
+            if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext())

                 text += wxT("\n");
 
             lineCount ++;
                 text += wxT("\n");
 
             lineCount ++;


@@ -1561,11 +2329,12 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
     bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0);
     bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 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);

 
     // Apply paragraph style first, if any
     wxRichTextAttr wholeStyle(style);
 
 
     // Apply paragraph style first, if any
     wxRichTextAttr wholeStyle(style);
 

-    if (wholeStyle.HasParagraphStyleName() && GetStyleSheet())
+    if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet())

     {
         wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
         if (def)
     {
         wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
         if (def)


@@ -1576,7 +2345,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     wxRichTextAttr characterAttributes(wholeStyle);
     characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 
     wxRichTextAttr characterAttributes(wholeStyle);
     characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 

-    if (characterAttributes.HasCharacterStyleName() && GetStyleSheet())
+    if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet())

     {
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
         if (def)
     {
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
         if (def)


@@ -1630,7 +2399,12 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 // to be included in the paragraph style
                 if ((paragraphStyle || parasOnly) && !charactersOnly)
                 {
                 // to be included in the paragraph style
                 if ((paragraphStyle || parasOnly) && !charactersOnly)
                 {

-                    if (resetExistingStyle)
+                    if (removeStyle)
+                    {
+                        // Removes the given style from the paragraph
+                        wxRichTextRemoveStyle(newPara->GetAttributes(), style);
+                    }
+                    else if (resetExistingStyle)

                         newPara->GetAttributes() = wholeStyle;
                     else
                     {
                         newPara->GetAttributes() = wholeStyle;
                     else
                     {


@@ -1656,8 +2430,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 // 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.
 
                 // 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())
+                if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd())

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


@@ -1680,7 +2453,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                         splitPoint ++;
 
                     // Find last object
                         splitPoint ++;
 
                     // Find last object

-                    if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1))
+                    if (splitPoint == newPara->GetRange().GetEnd())

                         lastObject = newPara->GetChildren().GetLast()->GetData();
                     else
                         // lastObject is set as a side-effect of splitting. It's
                         lastObject = newPara->GetChildren().GetLast()->GetData();
                     else
                         // lastObject is set as a side-effect of splitting. It's


@@ -1705,7 +2478,12 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                     {
                         wxRichTextObject* child = node2->GetData();
 
                     {
                         wxRichTextObject* child = node2->GetData();
 

-                        if (resetExistingStyle)
+                        if (removeStyle)
+                        {
+                            // Removes the given style from the paragraph
+                            wxRichTextRemoveStyle(child->GetAttributes(), style);
+                        }
+                        else if (resetExistingStyle)

                             child->GetAttributes() = characterAttributes;
                         else
                         {
                             child->GetAttributes() = characterAttributes;
                         else
                         {


@@ -1739,53 +2517,50 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     return true;
 }
 
     return true;
 }
 

-/// Set text attributes
-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags)
+void wxRichTextParagraphLayoutBox::SetImageStyle(wxRichTextImage *image, const wxRichTextAttr& textAttr, 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);
-}
+    bool withUndo = flags & wxRICHTEXT_SETSTYLE_WITH_UNDO;
+    bool haveControl = (GetRichTextCtrl() != NULL);
+    wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+    wxRichTextParagraph* para = GetParagraphAtPosition(image->GetRange().GetStart());
+    wxRichTextAction *action = NULL;
+    wxRichTextAttr oldTextAttr = image->GetAttributes();

 
 

-/// Get the text attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)
-{
-    wxTextAttrEx textAttrEx(style);
-    if (GetStyle(position, textAttrEx))
+    if (haveControl && withUndo)

     {
     {

-        style = textAttrEx;
-        return true;
+        action = new wxRichTextAction(NULL, _("Change Image Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+        action->SetRange(image->GetRange().FromInternal());
+        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+        image->SetAttributes(textAttr);
+
+        // Set the new attribute
+        newPara = new wxRichTextParagraph(*para);
+        action->GetNewParagraphs().AppendChild(newPara);
+        // Change back to the old one
+        image->SetAttributes(oldTextAttr);
+        action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));

     }
     else
     }
     else

-        return false;
+        newPara = para;
+
+    if (haveControl && withUndo)
+        GetRichTextCtrl()->GetBuffer().SubmitAction(action);

 }
 
 }
 

-/// Get the content (uncombined) attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style)
+/// Get the text attributes for this position.
+bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)

 {
 {

-    return DoGetStyle(position, style, false);
+    return DoGetStyle(position, style, true);

 }
 
 bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
 {
 }
 
 bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
 {

-    wxTextAttrEx textAttrEx(style);
-    if (GetUncombinedStyle(position, textAttrEx))
-    {
-        style = textAttrEx;
-        return true;
-    }
-    else
-        return false;
+    return DoGetStyle(position, style, false);

 }
 
 /// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
 /// context attributes.
 }
 
 /// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
 /// context attributes.

-bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles)
+bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles)

 {
     wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
 
 {
     wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
 


@@ -1834,479 +2609,59 @@ static bool wxHasStyle(long flags, long style)
 
 /// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of
 /// 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)
+bool wxRichTextParagraphLayoutBox::CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr)
+{
+    currentStyle.CollectCommonAttributes(style, clashingAttr, absentAttr);
+
+    return true;
+}
+
+/// Get the combined style for a range - if any attribute is different within the range,
+/// that attribute is not present within the flags.
+/// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself
+/// nested.
+bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style)

 {
 {

-    if (style.HasFont())
+    style = wxRichTextAttr();
+
+    wxRichTextAttr clashingAttr;
+    wxRichTextAttr absentAttrPara, absentAttrChar;
+
+    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)

     {
     {

-        if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
+        wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData();
+        if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontSize())
+            if (para->GetChildren().GetCount() == 0)

             {
             {

-                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);
-                }
+                wxRichTextAttr paraStyle = para->GetCombinedAttributes();
+
+                CollectStyle(style, paraStyle, clashingAttr, absentAttrPara);

             }
             else
             {
             }
             else
             {

-                if (!currentStyle.GetFont().Ok())
-                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
-                wxFont font(currentStyle.GetFont());
-                font.SetPointSize(style.GetFont().GetPointSize());
+                wxRichTextRange paraRange(para->GetRange());
+                paraRange.LimitTo(range);

 
 

-                wxSetFontPreservingStyles(currentStyle, font);
-                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-            }
-        }
+                // First collect paragraph attributes only
+                wxRichTextAttr paraStyle = para->GetCombinedAttributes();
+                paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
+                CollectStyle(style, paraStyle, clashingAttr, absentAttrPara);

 
 

-        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);
-            }
-        }
-
-        if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
-        {
-            if (currentStyle.GetFont().Ok() && currentStyle.HasFontWeight())
-            {
-                if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight())
-                {
-                    // Clash of style - mark as such
-                    multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT;
-                    currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_FONT_WEIGHT);
-                }
-            }
-            else
-            {
-                if (!currentStyle.GetFont().Ok())
-                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
-                wxFont font(currentStyle.GetFont());
-                font.SetWeight(style.GetFont().GetWeight());
-                wxSetFontPreservingStyles(currentStyle, font);
-                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
-            }
-        }
-
-        if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))
-        {
-            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
-            {
-                if (!currentStyle.GetFont().Ok())
-                    wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
-                wxFont font(currentStyle.GetFont());
-                font.SetFaceName(style.GetFont().GetFaceName());
-                wxSetFontPreservingStyles(currentStyle, font);
-                currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
-            }
-        }
-
-        if (style.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);
-            }
-        }
-    }
-
-    if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR))
-    {
-        if (currentStyle.HasTextColour())
-        {
-            if (currentStyle.GetTextColour() != style.GetTextColour())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_TEXT_COLOUR;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TEXT_COLOUR);
-            }
-        }
-        else
-            currentStyle.SetTextColour(style.GetTextColour());
-    }
-
-    if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR))
-    {
-        if (currentStyle.HasBackgroundColour())
-        {
-            if (currentStyle.GetBackgroundColour() != style.GetBackgroundColour())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_BACKGROUND_COLOUR;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BACKGROUND_COLOUR);
-            }
-        }
-        else
-            currentStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
-
-    if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_ALIGNMENT))
-    {
-        if (currentStyle.HasAlignment())
-        {
-            if (currentStyle.GetAlignment() != style.GetAlignment())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_ALIGNMENT;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_ALIGNMENT);
-            }
-        }
-        else
-            currentStyle.SetAlignment(style.GetAlignment());
-    }
-
-    if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TABS))
-    {
-        if (currentStyle.HasTabs())
-        {
-            if (!wxRichTextTabsEq(currentStyle.GetTabs(), style.GetTabs()))
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_TABS;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_TABS);
-            }
-        }
-        else
-            currentStyle.SetTabs(style.GetTabs());
-    }
-
-    if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LEFT_INDENT))
-    {
-        if (currentStyle.HasLeftIndent())
-        {
-            if (currentStyle.GetLeftIndent() != style.GetLeftIndent() || currentStyle.GetLeftSubIndent() != style.GetLeftSubIndent())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_LEFT_INDENT;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT);
-            }
-        }
-        else
-            currentStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
-
-    if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT))
-    {
-        if (currentStyle.HasRightIndent())
-        {
-            if (currentStyle.GetRightIndent() != style.GetRightIndent())
-            {
-                // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_RIGHT_INDENT;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_RIGHT_INDENT);
-            }
-        }
-        else
-            currentStyle.SetRightIndent(style.GetRightIndent());
-    }
-
-    if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER))
-    {
-        if (currentStyle.HasParagraphSpacingAfter())
-        {
-            if (currentStyle.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());
-    }
-
-    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 (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());
-    }
-
-    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());
-    }
-
-    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());
-    }
-
-    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());
-    }
-
-    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 (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());
-    }
-
-    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());
-        }
-    }
-
-    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());
-        }
-    }
-
-    if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL))
-    {
-        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());
-        }
-    }
-
-    if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_EFFECTS))
-    {
-        if (currentStyle.HasTextEffects())
-        {
-            // 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();
-
-            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 (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());
-    }
-
-    return true;
-}
-
-/// Get the combined style for a range - if any attribute is different within the range,
-/// that attribute is not present within the flags.
-/// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself
-/// nested.
-bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttrEx& style)
-{
-    style = wxTextAttrEx();
-
-    // The attributes that aren't valid because of multiple styles within the range
-    long multipleStyleAttributes = 0;
-    int multipleTextEffectAttributes = 0;
-    
-    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
-    while (node)
-    {
-        wxRichTextParagraph* para = (wxRichTextParagraph*) node->GetData();
-        if (!(para->GetRange().GetStart() > range.GetEnd() || para->GetRange().GetEnd() < range.GetStart()))
-        {
-            if (para->GetChildren().GetCount() == 0)
-            {
-                wxTextAttrEx paraStyle = para->GetCombinedAttributes();
-
-                CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);
-            }
-            else
-            {
-                wxRichTextRange paraRange(para->GetRange());
-                paraRange.LimitTo(range);
-
-                // First collect paragraph attributes only
-                wxTextAttrEx paraStyle = para->GetCombinedAttributes();
-                paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
-                CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);
-
-                wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
+                wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();

 
                 while (childNode)
                 {
                     wxRichTextObject* child = childNode->GetData();
                     if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
                     {
 
                 while (childNode)
                 {
                     wxRichTextObject* child = childNode->GetData();
                     if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
                     {

-                        wxTextAttrEx childStyle = para->GetCombinedAttributes(child->GetAttributes());
+                        wxRichTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes());

 
                         // Now collect character attributes only
                         childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
 
 
                         // Now collect character attributes only
                         childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
 

-                        CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes);
+                        CollectStyle(style, childStyle, clashingAttr, absentAttrChar);

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


@@ -2319,7 +2674,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
 }
 
 /// Set default style
 }
 
 /// Set default style

-bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style)
+bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxRichTextAttr& style)

 {
     m_defaultAttributes = style;
     return true;
 {
     m_defaultAttributes = style;
     return true;


@@ -2344,7 +2699,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())
         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())

-                return foundCount == matchingCount;
+                return foundCount == matchingCount && foundCount != 0;

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


@@ -2353,12 +2708,17 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
                 while (node2)
                 {
                     wxRichTextObject* child = node2->GetData();
                 while (node2)
                 {
                     wxRichTextObject* child = node2->GetData();

-                    if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
+                    // Allow for empty string if no buffer
+                    wxRichTextRange childRange = child->GetRange();
+                    if (childRange.GetLength() == 0 && GetRange().GetLength() == 1)
+                        childRange.SetEnd(childRange.GetEnd()+1);
+
+                    if (!childRange.IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))

                     {
                         foundCount ++;
                     {
                         foundCount ++;

-                        wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes());
+                        wxRichTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());

 
 

-                        if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
+                        if (wxTextAttrEqPartial(textAttr, style))

                             matchingCount ++;
                     }
 
                             matchingCount ++;
                     }
 


@@ -2370,13 +2730,7 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return foundCount == matchingCount;
-}
-
-bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
-{
-    wxRichTextAttr richStyle = style;
-    return HasCharacterAttributes(range, richStyle);
+    return foundCount == matchingCount && foundCount != 0;

 }
 
 /// Test if this whole range has paragraph attributes of the specified kind. If any
 }
 
 /// Test if this whole range has paragraph attributes of the specified kind. If any


@@ -2398,42 +2752,40 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange&
         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())
         {
             // Stop searching if we're beyond the range of interest
             if (para->GetRange().GetStart() > range.GetEnd())

-                return foundCount == matchingCount;
+                return foundCount == matchingCount && foundCount != 0;

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

-                wxTextAttrEx textAttr = GetAttributes();
+                wxRichTextAttr textAttr = GetAttributes();

                 // Apply the paragraph style
                 wxRichTextApplyStyle(textAttr, para->GetAttributes());
 
                 foundCount ++;
                 // Apply the paragraph style
                 wxRichTextApplyStyle(textAttr, para->GetAttributes());
 
                 foundCount ++;

-                if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
+                if (wxTextAttrEqPartial(textAttr, style))

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

-    return foundCount == matchingCount;
+    return foundCount == matchingCount && foundCount != 0;

 }
 
 }
 

-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
+void wxRichTextParagraphLayoutBox::Reset()

 {
 {

-    wxRichTextAttr richStyle = style;
-    return HasParagraphAttributes(range, richStyle);
-}
+    Clear();

 
 

-void wxRichTextParagraphLayoutBox::Clear()
-{
-    DeleteChildren();
-}
+    wxRichTextBuffer* buffer = wxDynamicCast(this, wxRichTextBuffer);
+    if (buffer && GetRichTextCtrl())
+    {
+        wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, GetRichTextCtrl()->GetId());
+        event.SetEventObject(GetRichTextCtrl());

 
 

-void wxRichTextParagraphLayoutBox::Reset()
-{
-    Clear();
+        buffer->SendEvent(event, true);
+    }

 
     AddParagraph(wxEmptyString);
 
     AddParagraph(wxEmptyString);

-    
+

     Invalidate(wxRICHTEXT_ALL);
 }
 
     Invalidate(wxRICHTEXT_ALL);
 }
 


@@ -2469,11 +2821,10 @@ wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagrap
     if (wholeParagraphs)
     {
         wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());
     if (wholeParagraphs)
     {
         wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart());

-        wxRichTextParagraph* para2 = GetParagraphAtPosition(range.GetEnd());

         if (para1)
             range.SetStart(para1->GetRange().GetStart());
         if (para1)
             range.SetStart(para1->GetRange().GetStart());

-        if (para2)
-            range.SetEnd(para2->GetRange().GetEnd());
+        // floating layout make all child should be relayout
+        range.SetEnd(GetRange().GetEnd());

     }
     return range;
 }
     }
     return range;
 }


@@ -2487,6 +2838,29 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
 
     int foundCount = 0;
 
 
     int foundCount = 0;
 

+    wxRichTextAttr attr(GetBasicStyle());
+    if (GetBasicStyle().HasParagraphStyleName())
+    {
+        wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
+        if (paraDef)
+        {
+            attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
+            SetBasicStyle(attr);
+            foundCount ++;
+        }
+    }
+
+    if (GetBasicStyle().HasCharacterStyleName())
+    {
+        wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
+        if (charDef)
+        {
+            attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
+            SetBasicStyle(attr);
+            foundCount ++;
+        }
+    }
+

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


@@ -2504,6 +2878,13 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
             // So when changing a list style interactively, could retrieve level based on current style, then
             // set appropriate indent and apply new style.
 
             // So when changing a list style interactively, could retrieve level based on current style, then
             // set appropriate indent and apply new style.
 

+            int outline = -1;
+            int num = -1;
+            if (para->GetAttributes().HasOutlineLevel())
+                outline = para->GetAttributes().GetOutlineLevel();
+            if (para->GetAttributes().HasBulletNumber())
+                num = para->GetAttributes().GetBulletNumber();
+

             if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
             {
                 int currentIndent = para->GetAttributes().GetLeftIndent();
             if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
             {
                 int currentIndent = para->GetAttributes().GetLeftIndent();


@@ -2554,6 +2935,11 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
                     foundCount ++;
                 }
             }
                     foundCount ++;
                 }
             }

+
+            if (outline != -1)
+                para->GetAttributes().SetOutlineLevel(outline);
+            if (num != -1)
+                para->GetAttributes().SetBulletNumber(num);

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


@@ -2565,7 +2951,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
 bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
     wxRichTextStyleSheet* styleSheet = GetStyleSheet();
 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 withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);


@@ -2633,7 +3019,7 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx
                     // Renumbering will need to be done when we promote/demote a paragraph.
 
                     // Apply the overall list style, and item style for this level
                     // 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));
+                    wxRichTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet));

                     wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
 
                     // Now we need to do numbering
                     wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
 
                     // Now we need to do numbering


@@ -2709,7 +3095,7 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co
 
     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
 
     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
 #endif
 
     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
 #endif
 


@@ -2808,7 +3194,7 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co
                     }
 
                     // Apply the overall list style, and item style for this level
                     }
 
                     // Apply the overall list style, and item style for this level

-                    wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
+                    wxRichTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));

                     wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
 
                     // OK, we've (re)applied the style, now let's get the numbering right.
                     wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
 
                     // OK, we've (re)applied the style, now let's get the numbering right.


@@ -2923,7 +3309,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
 {
     if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
         return false;
 {
     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())
     {
     wxRichTextStyleSheet* styleSheet = GetStyleSheet();
     if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
     {


@@ -2932,7 +3318,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
         {
             // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
             // int thisLevel = def->FindLevelForIndent(thisIndent);
         {
             // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
             // int thisLevel = def->FindLevelForIndent(thisIndent);

-            
+

             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));
             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));


@@ -2940,10 +3326,10 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
                 attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
             attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
             attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());
                 attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
             attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
             attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());

-            
+

             int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
             attr.SetBulletNumber(nextNumber);
             int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
             attr.SetBulletNumber(nextNumber);

-            
+

             if (isOutline)
             {
                 wxString text = previousParagraph->GetAttributes().GetBulletText();
             if (isOutline)
             {
                 wxString text = previousParagraph->GetAttributes().GetBulletText();


@@ -2962,7 +3348,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
                     attr.SetBulletText(text);
                 }
             }
                     attr.SetBulletText(text);
                 }
             }

-            
+

             return true;
         }
         else
             return true;
         }
         else


@@ -2981,14 +3367,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichTextParagraph, wxRichTextBox)
 
 wxArrayInt wxRichTextParagraph::sm_defaultTabs;
 
 
 wxArrayInt wxRichTextParagraph::sm_defaultTabs;
 

-wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style):
+wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxRichTextAttr* style):

     wxRichTextBox(parent)
 {
     if (style)
         SetAttributes(*style);
 }
 
     wxRichTextBox(parent)
 {
     if (style)
         SetAttributes(*style);
 }
 

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

     wxRichTextBox(parent)
 {
     if (paraStyle)
     wxRichTextBox(parent)
 {
     if (paraStyle)


@@ -3003,9 +3389,9 @@ wxRichTextParagraph::~wxRichTextParagraph()
 }
 
 /// Draw the item
 }
 
 /// Draw the item

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

 {
 {

-    wxTextAttrEx attr = GetCombinedAttributes();
+    wxRichTextAttr attr = GetCombinedAttributes();

 
     // Draw the bullet, if any
     if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
 
     // Draw the bullet, if any
     if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)


@@ -3015,10 +3401,20 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
             int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
 
             int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
             int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
 

-            wxTextAttrEx bulletAttr(GetCombinedAttributes());
+            wxRichTextAttr bulletAttr(GetCombinedAttributes());
+
+            // 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());
+                }
+            }

 
             // Get line height from first line, if any
 
             // Get line height from first line, if any

-            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
+            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : NULL;

 
             wxPoint linePos;
             int lineHeight wxDUMMY_INITIALIZE(0);
 
             wxPoint linePos;
             int lineHeight wxDUMMY_INITIALIZE(0);


@@ -3030,12 +3426,12 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             else
             {
                 wxFont font;
             else
             {
                 wxFont font;

-                if (bulletAttr.GetFont().Ok())
-                    font = bulletAttr.GetFont();
+                if (bulletAttr.HasFont() && GetBuffer())
+                    font = GetBuffer()->GetFontTable().FindFont(bulletAttr);

                 else
                     font = (*wxNORMAL_FONT);
 
                 else
                     font = (*wxNORMAL_FONT);
 

-                dc.SetFont(font);
+                wxCheckSetFont(dc, font);

 
                 lineHeight = dc.GetCharHeight();
                 linePos = GetPosition();
 
                 lineHeight = dc.GetCharHeight();
                 linePos = GetPosition();


@@ -3049,15 +3445,15 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 if (wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect);
             }
                 if (wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect);
             }

-            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)                
-            {                
+            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)
+            {

                 if (wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect);
             }
             else
             {
                 wxString bulletText = GetBulletText();
                 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);
             }
                 if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
                     wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);
             }


@@ -3072,40 +3468,56 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
         wxRichTextLine* line = node->GetData();
         wxRichTextRange lineRange = line->GetAbsoluteRange();
 
         wxRichTextLine* line = node->GetData();
         wxRichTextRange lineRange = line->GetAbsoluteRange();
 

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

         // Lines are specified relative to the paragraph
 
         wxPoint linePosition = line->GetPosition() + GetPosition();
         // 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)
+        // 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))

         {
         {

-            wxRichTextObject* child = node2->GetData();
-            
-            if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
+            wxPoint objectPosition = linePosition;
+            int maxDescent = line->GetDescent();
+
+            // Loop through objects until we get to the one within range
+            wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
+
+            int i = 0;
+            while (node2)

             {
             {

-                // Draw this part of the line at the correct position
-                wxRichTextRange objectRange(child->GetRange());
-                objectRange.LimitTo(lineRange);
+                wxRichTextObject* child = node2->GetData();

 
 

-                wxSize objectSize;
-                int descent = 0;
-                child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);
+                if (!child->IsFloating() && child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
+                {
+                    // Draw this part of the line at the correct position
+                    wxRichTextRange objectRange(child->GetRange());
+                    objectRange.LimitTo(lineRange);

 
 

-                // 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);
+                    wxSize objectSize;
+#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, wxRICHTEXT_UNFORMATTED, objectPosition);
+                    }

 
 

-                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;
+                    // 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);

 
 

-            node2 = node2->GetNext();
+                    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();
         }
 
         node = node->GetNext();


@@ -3114,10 +3526,36 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
     return true;
 }
 
     return true;
 }
 

+// Get the range width using partial extents calculated for the whole paragraph.
+static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents)
+{
+    wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength());
+
+    if (partialExtents.GetCount() < (size_t) range.GetLength())
+        return 0;
+
+    int leftMostPos = 0;
+    if (range.GetStart() - para.GetRange().GetStart() > 0)
+        leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1];
+
+    int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()];
+
+    int w = rightMostPos - leftMostPos;
+
+    return w;
+}
+

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

-    wxTextAttrEx attr = GetCombinedAttributes();
+    // Deal with floating objects firstly before the normal layout
+    wxRichTextBuffer* buffer = GetBuffer();
+    wxASSERT(buffer);
+    wxRichTextFloatCollector* collector = buffer->GetFloatCollector();
+    wxASSERT(collector);
+    LayoutFloat(dc, rect, style, collector);
+
+    wxRichTextAttr attr = GetCombinedAttributes();

 
     // ClearLines();
 
 
     // ClearLines();
 


@@ -3131,24 +3569,16 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     int lineSpacing = 0;
 
     // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.
     int lineSpacing = 0;
 
     // Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.

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

     {
     {

-        dc.SetFont(attr.GetFont());
-        lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10;
+        wxCheckSetFont(dc, attr.GetFont());
+        lineSpacing = (int) (double(dc.GetCharHeight()) * (double(attr.GetLineSpacing())/10.0 - 1.0));

     }
 
     }
 

-    // Available space for text on each line differs.
-    int availableTextSpaceFirstLine = rect.GetWidth() - leftIndent - rightIndent;
-
-    // Bullets start the text at the same position as subsequent lines
-    if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
-        availableTextSpaceFirstLine -= leftSubIndent;
-
-    int availableTextSpaceSubsequentLines = rect.GetWidth() - leftIndent - rightIndent - leftSubIndent;
-

     // Start position for each line relative to the paragraph
     int startPositionFirstLine = leftIndent;
     int startPositionSubsequentLines = leftIndent + leftSubIndent;
     // Start position for each line relative to the paragraph
     int startPositionFirstLine = leftIndent;
     int startPositionSubsequentLines = leftIndent + leftSubIndent;

+    wxRect availableRect;

 
     // If we have a bullet in this paragraph, the start position for the first line's text
     // is actually leftIndent + leftSubIndent.
 
     // If we have a bullet in this paragraph, the start position for the first line's text
     // is actually leftIndent + leftSubIndent.


@@ -3164,9 +3594,36 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph
     int lineHeight = 0;
     int maxWidth = 0;
     wxPoint currentPosition(0, spaceBeforePara); // We will calculate lines relative to paragraph
     int lineHeight = 0;
     int maxWidth = 0;

+    int maxAscent = 0;

     int maxDescent = 0;
     int maxDescent = 0;

-

     int lineCount = 0;
     int lineCount = 0;

+    int lineAscent = 0;
+    int lineDescent = 0;
+
+    wxRichTextObjectList::compatibility_iterator node;
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+    wxUnusedVar(style);
+    wxArrayInt partialExtents;
+
+    wxSize paraSize;
+    int paraDescent = 0;
+
+    // This calculates the partial text extents
+    GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+#else
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+
+        child->SetCachedSize(wxDefaultSize);
+        child->Layout(dc, rect, style);
+
+        node = node->GetNext();
+    }
+
+#endif

 
     // Split up lines
 
 
     // Split up lines
 


@@ -3174,11 +3631,18 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     // find the child corresponding to the start position of the string, and
     // continue.
 
     // find the child corresponding to the start position of the string, and
     // continue.
 

-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    node = m_children.GetFirst();

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

+        // If floating, ignore. We already laid out floats.
+        if (child->IsFloating() || child->GetRange().GetLength() == 0)
+        {
+            node = node->GetNext();
+            continue;
+        }
+

         // 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?
         // 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?


@@ -3186,49 +3650,66 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         // can't tell the position until the size is determined. So possibly introduce
         // another layout phase.
 
         // can't tell the position until the size is determined. So possibly introduce
         // another layout phase.
 

-        // TODO: can't this be called only once per child?
-        child->Layout(dc, rect, style);
-
-        // Available width depends on whether we're on the first or subsequent lines
-        int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines);
-
-        currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
-

         // 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.
         // 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());
         long nextBreakPos = GetFirstLineBreakPosition(lastEndPos+1);
         long lastPosToUse = child->GetRange().GetEnd();
         bool lineBreakInThisObject = (nextBreakPos > -1 && nextBreakPos <= child->GetRange().GetEnd());

-        
+

         if (lineBreakInThisObject)
             lastPosToUse = nextBreakPos;
 
         wxSize childSize;
         int childDescent = 0;
         if (lineBreakInThisObject)
             lastPosToUse = nextBreakPos;
 
         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
         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, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+            childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents);
+#else

             GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
             GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());

+#endif
+        }
+
+        // Available width depends on the floating objects and the line height
+        // Note: the floating objects may be placed vertically along the two side of
+        //       buffer, so we may have different available line width with different
+        //       [startY, endY]. So, we should can't determine how wide the available
+        //       space is until we know the exact line height.
+        lineDescent = wxMax(childDescent, maxDescent);
+        lineAscent = wxMax(childSize.y-childDescent, maxAscent);
+        lineHeight = lineDescent + lineAscent;
+        availableRect = collector->GetAvailableRect(rect.y + currentPosition.y, rect.y + currentPosition.y + lineHeight);
+
+        currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines);

 
         // 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)
 
 
         // 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)
 

-        if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableSpaceForText)) ||
-            (childSize.x + currentWidth > availableSpaceForText))
+        if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableRect.width)) ||
+            (childSize.x + currentWidth > availableRect.width))

         {
             long wrapPosition = 0;
 
         {
             long wrapPosition = 0;
 

+            int indent = lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines;
+            indent += rightIndent;

             // Find a place to wrap. This may walk back to previous children,
             // for example if a word spans several objects.
             // 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))
+            // 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, availableRect.width - indent, wrapPosition, & partialExtents))

             {
                 // If the function failed, just cut it off at the end of this child.
                 wrapPosition = child->GetRange().GetEnd();
             {
                 // If the function failed, just cut it off at the end of this child.
                 wrapPosition = child->GetRange().GetEnd();


@@ -3243,10 +3724,23 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
             // Let's find the actual size of the current line now
             wxSize actualSize;
             wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
             // Let's find the actual size of the current line now
             wxSize actualSize;
             wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);

+
+            /// Use previous descent, not the wrapping descent we just found, since this may be too big
+            /// for the fragment we're about to add.
+            childDescent = maxDescent;
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+            // Get height only, then the width using the partial extents
+            GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+            actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents);
+#else

             GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);
             GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);

+#endif
+

             currentWidth = actualSize.x;
             currentWidth = actualSize.x;

-            lineHeight = wxMax(lineHeight, actualSize.y);

             maxDescent = wxMax(childDescent, maxDescent);
             maxDescent = wxMax(childDescent, maxDescent);

+            maxAscent = wxMax(actualSize.y-childDescent, maxAscent);
+            lineHeight = maxDescent + maxAscent;

 
             // Add a new line
             wxRichTextLine* line = AllocateLine(lineCount);
 
             // Add a new line
             wxRichTextLine* line = AllocateLine(lineCount);


@@ -3262,6 +3756,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
             currentPosition.y += lineSpacing;
             currentWidth = 0;
             maxDescent = 0;
             currentPosition.y += lineSpacing;
             currentWidth = 0;
             maxDescent = 0;

+            maxAscent = 0;

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


@@ -3285,8 +3780,9 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         {
             // We still fit, so don't add a line, and keep going
             currentWidth += childSize.x;
         {
             // We still fit, so don't add a line, and keep going
             currentWidth += childSize.x;

-            lineHeight = wxMax(lineHeight, childSize.y);

             maxDescent = wxMax(childDescent, maxDescent);
             maxDescent = wxMax(childDescent, maxDescent);

+            maxAscent = wxMax(childSize.y-childDescent, maxAscent);
+            lineHeight = maxDescent + maxAscent;

 
             maxWidth = wxMax(maxWidth, currentWidth);
             lastEndPos = child->GetRange().GetEnd();
 
             maxWidth = wxMax(maxWidth, currentWidth);
             lastEndPos = child->GetRange().GetEnd();


@@ -3299,7 +3795,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     // Substract -1 because the last position is always the end-paragraph position.
     if (lastCompletedEndPos <= GetRange().GetEnd()-1)
     {
     // Substract -1 because the last position is always the end-paragraph position.
     if (lastCompletedEndPos <= GetRange().GetEnd()-1)
     {

-        currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
+        currentPosition.x = (lineCount == 0 ? availableRect.x + startPositionFirstLine : availableRect.x + startPositionSubsequentLines);

 
         wxRichTextLine* line = AllocateLine(lineCount);
 
 
         wxRichTextLine* line = AllocateLine(lineCount);
 


@@ -3310,10 +3806,10 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
 
         line->SetPosition(currentPosition);
 
 
         line->SetPosition(currentPosition);
 

-        if (lineHeight == 0)
+        if (lineHeight == 0 && GetBuffer())

         {
         {

-            if (attr.GetFont().Ok())
-                dc.SetFont(attr.GetFont());
+            wxFont font(GetBuffer()->GetFontTable().FindFont(attr));
+            wxCheckSetFont(dc, font);

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


@@ -3333,17 +3829,59 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
     ClearUnusedLines(lineCount);
 
     // Apply styles to wrapped lines
     ClearUnusedLines(lineCount);
 
     // Apply styles to wrapped lines

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

 
 

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

 
     m_dirty = false;
 
 
     m_dirty = false;
 

+#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();
+
+        // Loop through objects until we get to the one within range
+        wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
+
+        while (node2)
+        {
+            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();
+        }
+
+        lineNode = lineNode->GetNext();
+    }
+#endif
+#endif
+

     return true;
 }
 
 /// Apply paragraph styles, such as centering, to wrapped lines
     return true;
 }
 
 /// Apply paragraph styles, such as centering, to wrapped lines

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

 {
     if (!attr.HasAlignment())
         return;
 {
     if (!attr.HasAlignment())
         return;


@@ -3359,12 +3897,14 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wx
         // centering, right-justification
         if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
         {
         // centering, right-justification
         if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
         {

-            pos.x = (rect.GetWidth() - size.x)/2 + pos.x;
+            int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+            pos.x = (rect.GetWidth() - pos.x - rightIndent - size.x)/2 + pos.x;

             line->SetPosition(pos);
         }
         else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
         {
             line->SetPosition(pos);
         }
         else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
         {

-            pos.x = pos.x + rect.GetWidth() - size.x;
+            int rightIndent = ConvertTenthsMMToPixels(dc, attr.GetRightIndent());
+            pos.x = rect.GetWidth() - size.x - rightIndent;

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


@@ -3444,7 +3984,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
 
 void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj)
 {
 
 void wxRichTextParagraph::Copy(const wxRichTextParagraph& obj)
 {

-    wxRichTextBox::Copy(obj);
+    wxRichTextCompositeObject::Copy(obj);

 }
 
 /// Clear the cached lines
 }
 
 /// Clear the cached lines


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

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

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


@@ -3467,24 +4007,84 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 
         wxSize sz;
 
 
         wxSize sz;
 

+        wxArrayInt childExtents;
+        wxArrayInt* p;
+        if (partialExtents)
+            p = & childExtents;
+        else
+            p = NULL;
+

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

+

             wxRichTextObject* child = node->GetData();
             if (!child->GetRange().IsOutside(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;
+
+                        partialExtents->Add(0 /* zero size */ + lastSize);
+                    }
+                }
+                else
+                {

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

-                if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
+                // 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();
+
+                    sz.y = wxMax(sz.y, childSize.y);
+                    sz.x += childSize.x;
+                    descent = wxMax(descent, childDescent);
+                }
+                else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p))

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

+
+                    if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
+                    {
+                        child->SetCachedSize(childSize);
+                        child->SetDescent(childDescent);
+                    }
+
+                    if (partialExtents)
+                    {
+                        int lastSize;
+                        if (partialExtents->GetCount() > 0)
+                            lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+                        else
+                            lastSize = 0;
+
+                        size_t i;
+                        for (i = 0; i < childExtents.GetCount(); i++)
+                        {
+                            partialExtents->Add(childExtents[i] + lastSize);
+                        }
+                    }
+                }

                 }
                 }

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

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


@@ -3517,14 +4117,14 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz
                 {
                     wxRichTextObject* child = node2->GetData();
 
                 {
                     wxRichTextObject* child = node2->GetData();
 

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

                     {
                         wxRichTextRange rangeToUse = lineRange;
                         rangeToUse.LimitTo(child->GetRange());
 
                         wxSize childSize;
                         int childDescent = 0;
                     {
                         wxRichTextRange rangeToUse = lineRange;
                         rangeToUse.LimitTo(child->GetRange());
 
                         wxSize childSize;
                         int childDescent = 0;

-                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, position))
+                        if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y)))

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


@@ -3653,20 +4253,53 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
         wxSize lineSize = line->GetSize();
         wxRichTextRange lineRange = line->GetAbsoluteRange();
 
         wxSize lineSize = line->GetSize();
         wxRichTextRange lineRange = line->GetAbsoluteRange();
 

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

         {
             if (pt.x < linePos.x)
             {
                 textPosition = lineRange.GetStart();
         {
             if (pt.x < linePos.x)
             {
                 textPosition = lineRange.GetStart();

-                return wxRICHTEXT_HITTEST_BEFORE;
+                return wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_OUTSIDE;

             }
             else if (pt.x >= (linePos.x + lineSize.x))
             {
                 textPosition = lineRange.GetEnd();
             }
             else if (pt.x >= (linePos.x + lineSize.x))
             {
                 textPosition = lineRange.GetEnd();

-                return wxRICHTEXT_HITTEST_AFTER;
+                return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;

             }
             else
             {
             }
             else
             {

+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+                wxArrayInt partialExtents;
+
+                wxSize paraSize;
+                int paraDescent;
+
+                // This calculates the partial text extents
+                GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & 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?
+
+                        // 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++)
                 long i;
                 int lastX = linePos.x;
                 for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++)


@@ -3688,7 +4321,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
                         // Let's see if we can be more precise about
                         // which side of the position it's on.
 
                         // Let's see if we can be more precise about
                         // which side of the position it's on.
 

-                        int midPoint = (nextX - lastX)/2 + lastX;
+                        int midPoint = (nextX + lastX)/2;

                         if (pt.x >= midPoint)
                             return wxRICHTEXT_HITTEST_AFTER;
                         else
                         if (pt.x >= midPoint)
                             return wxRICHTEXT_HITTEST_AFTER;
                         else


@@ -3699,6 +4332,7 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition
                         lastX = nextX;
                     }
                 }
                         lastX = nextX;
                     }
                 }

+#endif

             }
         }
 
             }
         }
 


@@ -3837,7 +4471,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex
                     text += textObj->GetTextForRange(range);
                 }
                 else
                     text += textObj->GetTextForRange(range);
                 }
                 else

-                    return true;
+                {
+                    text += wxT(" ");
+                }

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


@@ -3857,7 +4493,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex
                     text = textObj->GetTextForRange(range) + text;
                 }
                 else
                     text = textObj->GetTextForRange(range) + text;
                 }
                 else

-                    return true;
+                {
+                    text = wxT(" ") + text;
+                }

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


@@ -3868,21 +4506,85 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex
 }
 
 /// Find a suitable wrap position.
 }
 
 /// Find a suitable wrap position.

-bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition)
+bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, 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;
     // Find the first position where the line exceeds the available space.
     wxSize sz;

-    long i;

     long breakPosition = range.GetEnd();
     long breakPosition = range.GetEnd();

-    for (i = range.GetStart(); i <= range.GetEnd(); i++)
+
+#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 descent = 0;
-        GetRangeSize(wxRichTextRange(range.GetStart(), i), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+        int widthBefore;
+
+        if (range.GetStart() > GetRange().GetStart())
+            widthBefore = (*partialExtents)[range.GetStart() - GetRange().GetStart() - 1];
+        else
+            widthBefore = 0;

 
 

-        if (sz.x > availableSpace)
+        size_t i;
+        for (i = (size_t) range.GetStart(); i <= (size_t) range.GetEnd(); i++)

         {
         {

-            breakPosition = i-1;
-            break;
+            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, 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, wxRICHTEXT_UNFORMATTED);
+
+                if (sz.x > availableSpace)
+                    breakPosition = minPos - 1;
+                else
+                {
+                    GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, 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, wxRICHTEXT_UNFORMATTED);
+
+                if (sz.x > availableSpace)
+                {
+                    maxPos = nextPos;
+                }
+                else
+                {
+                    minPos = nextPos;
+                }
+            }

         }
     }
 
         }
     }
 


@@ -3900,9 +4602,11 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d
         else
         {
             int spacePos = plainText.Find(wxT(' '), true);
         else
         {
             int spacePos = plainText.Find(wxT(' '), true);

-            if (spacePos != wxNOT_FOUND)
+            int tabPos = plainText.Find(wxT('\t'), true);
+            int pos = wxMax(spacePos, tabPos);
+            if (pos != wxNOT_FOUND)

             {
             {

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

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


@@ -3950,7 +4654,7 @@ wxString wxRichTextParagraph::GetBulletText()
     {
         text = GetAttributes().GetBulletText();
     }
     {
         text = GetAttributes().GetBulletText();
     }

-    
+

     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
     {
         // The outline style relies on the text being computed statically,
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
     {
         // The outline style relies on the text being computed statically,


@@ -4014,9 +4718,9 @@ bool wxRichTextParagraph::ClearUnusedLines(int lineCount)
 
 /// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically
 /// retrieve the actual style.
 
 /// 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
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxRichTextAttr& contentStyle) const

 {
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
     if (buf)
     {
     wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
     if (buf)
     {


@@ -4031,9 +4735,9 @@ wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& cont
 }
 
 /// Get combined attributes of the base style and paragraph style.
 }
 
 /// Get combined attributes of the base style and paragraph style.

-wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes() const
+wxRichTextAttr wxRichTextParagraph::GetCombinedAttributes() const

 {
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
     if (buf)
     {
     wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
     if (buf)
     {


@@ -4062,27 +4766,74 @@ void wxRichTextParagraph::ClearDefaultTabs()
     sm_defaultTabs.Clear();
 }
 
     sm_defaultTabs.Clear();
 }
 

-/// Get the first position from pos that has a line break character.
-long wxRichTextParagraph::GetFirstLineBreakPosition(long pos)
+void wxRichTextParagraph::LayoutFloat(wxDC& dc, const wxRect& rect, int style, wxRichTextFloatCollector* floatCollector)

 {
 {

-    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxRichTextObject* obj = node->GetData();
-        if (pos >= obj->GetRange().GetStart() && pos <= obj->GetRange().GetEnd())
+        wxRichTextObject* anchored = node->GetData();
+        if (anchored && anchored->IsFloating())

         {
         {

-            wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText);
-            if (textObj)
+            wxSize size;
+            int descent, x = 0;
+            anchored->GetRangeSize(anchored->GetRange(), size, descent, dc, style);
+
+            int offsetY = 0;
+            if (anchored->GetAttributes().GetTextBoxAttr().GetTop().IsPresent())

             {
             {

-                long breakPos = textObj->GetFirstLineBreakPosition(pos);
-                if (breakPos > -1)
-                    return breakPos;
+                offsetY = anchored->GetAttributes().GetTextBoxAttr().GetTop().GetValue();
+                if (anchored->GetAttributes().GetTextBoxAttr().GetTop().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+                {
+                    offsetY = ConvertTenthsMMToPixels(dc, offsetY);
+                }

             }
             }

-        }
-        node = node->GetNext();
-    }
-    return -1;
-}
+
+            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 = 0;
+            else if (anchored->GetAttributes().GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_FLOAT_RIGHT)
+                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
 
 /*!
  * wxRichTextLine


@@ -4104,12 +4855,18 @@ void wxRichTextLine::Init(wxRichTextParagraph* parent)
     m_pos = wxPoint(0, 0);
     m_size = wxSize(0, 0);
     m_descent = 0;
     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;
 }
 
 /// 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
 }
 
 /// Get the absolute object position


@@ -4133,7 +4890,7 @@ wxRichTextRange wxRichTextLine::GetAbsoluteRange() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
 

-wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
+wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxRichTextAttr* style):

     wxRichTextObject(parent)
 {
     if (style)
     wxRichTextObject(parent)
 {
     if (style)


@@ -4144,13 +4901,16 @@ wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject*
 
 #define USE_KERNING_FIX 1
 
 
 #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, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
 /// 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);
 

-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+    wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());

 
     int offset = GetRange().GetStart();
 
 
     int offset = GetRange().GetStart();
 


@@ -4158,22 +4918,50 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
     wxString str = m_text;
     wxString toRemove = wxRichTextLineBreakChar;
     str.Replace(toRemove, wxT(" "));
     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))
     if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))

-        stringChunk.MakeUpper();
-
-    int charHeight = dc.GetCharHeight();
+        str.MakeUpper();

 
 

-    int x = rect.x;
-    int y = rect.y + (rect.height - charHeight - (descent - m_descent));
+    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.
 
 
     // Test for the optimized situations where all is selected, or none
     // is selected.
 

-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
+    wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr));
+    wxCheckSetFont(dc, textFont);
+    int charHeight = dc.GetCharHeight();
+
+    int x, y;
+    if ( textFont.Ok() )
+    {
+        if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) )
+        {
+            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) )
+        {
+            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));
+    }

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


@@ -4191,7 +4979,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
         // (c) Part selected, part not
         // Let's draw unselected chunk, selected chunk, then unselected chunk.
 
         // (c) Part selected, part not
         // Let's draw unselected chunk, selected chunk, then unselected chunk.
 

-        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

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


@@ -4200,7 +4988,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             int s1 = selectionRange.GetStart()-1;
             int fragmentLen = s1 - r1 + 1;
             if (fragmentLen < 0)
             int s1 = selectionRange.GetStart()-1;
             int fragmentLen = s1 - r1 + 1;
             if (fragmentLen < 0)

+            {

                 wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
                 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);
             wxString stringFragment = str.Mid(r1 - offset, fragmentLen);
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);


@@ -4231,7 +5021,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
 
             int fragmentLen = s2 - s1 + 1;
             if (fragmentLen < 0)
 
             int fragmentLen = s2 - s1 + 1;
             if (fragmentLen < 0)

+            {

                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
                 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);
             wxString stringFragment = str.Mid(s1 - offset, fragmentLen);
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);


@@ -4262,7 +5054,9 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
 
             int fragmentLen = r2 - s2 + 1;
             if (fragmentLen < 0)
 
             int fragmentLen = r2 - s2 + 1;
             if (fragmentLen < 0)

+            {

                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
                 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);
             wxString stringFragment = str.Mid(s2 - offset, fragmentLen);
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);


@@ -4272,7 +5066,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
     return true;
 }
 
     return true;
 }
 

-bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected)
+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);
 
 {
     bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND);
 


@@ -4302,17 +5096,28 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
 
     if (selected)
     {
 
     if (selected)
     {

-        dc.SetBrush(*wxBLACK_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetTextForeground(*wxWHITE);
-        dc.SetBackgroundMode(wxTRANSPARENT);
+        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());
     }
     else
     {
         dc.SetTextForeground(attr.GetTextColour());

-        dc.SetBackgroundMode(wxTRANSPARENT);
+
+        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 = x;

     while (hasTabs)
     {
         // the string has a tab
     while (hasTabs)
     {
         // the string has a tab


@@ -4324,9 +5129,19 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
         bool not_found = true;
         for (int i = 0; i < tabCount && not_found; ++i)
         {
         bool not_found = true;
         for (int i = 0; i < tabCount && not_found; ++i)
         {

-            nextTabPos = tabArray.Item(i);
-            if (nextTabPos > tabPos)
+            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)
                 {
                 not_found = false;
                 if (selected)
                 {


@@ -4339,9 +5154,9 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
                 if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
                 {
                     wxPen oldPen = dc.GetPen();
                 if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
                 {
                     wxPen oldPen = dc.GetPen();

-                    dc.SetPen(wxPen(attr.GetTextColour(), 1));
+                    wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));

                     dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
                     dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));

-                    dc.SetPen(oldPen);
+                    wxCheckSetPen(dc, oldPen);

                 }
 
                 x = nextTabPos;
                 }
 
                 x = nextTabPos;


@@ -4363,9 +5178,9 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
         if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
         {
             wxPen oldPen = dc.GetPen();
         if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
         {
             wxPen oldPen = dc.GetPen();

-            dc.SetPen(wxPen(attr.GetTextColour(), 1));
+            wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));

             dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
             dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));

-            dc.SetPen(oldPen);
+            wxCheckSetPen(dc, oldPen);

         }
 
         x += w;
         }
 
         x += w;


@@ -4377,24 +5192,9 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
 /// Lay the item out
 bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
 {
 /// Lay the item out
 bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
 {

-    wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
-    wxASSERT (para != NULL);
-
-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
-
-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
-
-    wxString str = m_text;    
-    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
-        str.MakeUpper();
-
-    wxString toReplace = wxRichTextLineBreakChar;
-    str.Replace(toReplace, wxT(" "));
-
-    wxCoord w, h;
-    dc.GetTextExtent(str, & w, & h, & m_descent);
-    m_size = wxSize(w, dc.GetCharHeight());
+    // Only lay out if we haven't already cached the size
+    if (m_size.x == -1)
+        GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0));

 
     return true;
 }
 
     return true;
 }


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

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

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


@@ -4417,18 +5217,35 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 

-    wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+    wxRichTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());

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

-    if (textAttr.GetFont().Ok())
-        dc.SetFont(textAttr.GetFont());
+    bool bScript(false);
+    wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr));
+    if (font.Ok())
+    {
+        if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+            || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) )
+        {
+            wxFont textFont = font;
+            double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+            textFont.SetPointSize( static_cast<int>(size) );
+            wxCheckSetFont(dc, textFont);
+            bScript = true;
+        }
+        else
+        {
+            wxCheckSetFont(dc, font);
+        }
+    }

 
 

+    bool haveDescent = false;

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

-    
+

     wxString str(m_text);
     wxString toReplace = wxRichTextLineBreakChar;
     str.Replace(toReplace, wxT(" "));
     wxString str(m_text);
     wxString toReplace = wxRichTextLineBreakChar;
     str.Replace(toReplace, wxT(" "));


@@ -4462,28 +5279,111 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 
         while (stringChunk.Find(wxT('\t')) >= 0)
         {
 
         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'));
             // 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;
+
+            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] + position.x;
+                else
+                    absoluteWidth = position.x;
+            }
+            else
+            {
+                dc.GetTextExtent(stringFragment, & w, & h);
+                width += w;
+                absoluteWidth = width + position.x;
+                haveDescent = true;
+            }
+

             bool notFound = true;
             for (int i = 0; i < tabCount && notFound; ++i)
             {
                 nextTabPos = tabArray.Item(i);
             bool notFound = true;
             for (int i = 0; i < tabCount && notFound; ++i)
             {
                 nextTabPos = tabArray.Item(i);

-                if (nextTabPos > absoluteWidth)
+
+                // 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 - position.x;
                     notFound = false;
                     width = nextTabPos - position.x;

+
+                    if (partialExtents)
+                        partialExtents->Add(width);

                 }
             }
         }
     }
                 }
             }
         }
     }

-    dc.GetTextExtent(stringChunk, & w, & h, & descent);
-    width += w;
-    size = wxSize(width, dc.GetCharHeight());
+
+    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;
 }
 
     return true;
 }


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

-    
+

     if (index < 0 || index >= (int) m_text.length())
         return NULL;
 
     if (index < 0 || index >= (int) m_text.length())
         return NULL;
 


@@ -4507,7 +5407,7 @@ wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 
     newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
     GetRange().SetEnd(pos-1);
 
     newObject->SetRange(wxRichTextRange(pos, GetRange().GetEnd()));
     GetRange().SetEnd(pos-1);

-    
+

     return newObject;
 }
 
     return newObject;
 }
 


@@ -4568,6 +5468,7 @@ bool wxRichTextPlainText::Merge(wxRichTextObject* object)
     if (textObject)
     {
         m_text += textObject->GetText();
     if (textObject)
     {
         m_text += textObject->GetText();

+        wxRichTextApplyStyle(m_attributes, textObject->GetAttributes());

         return true;
     }
     else
         return true;
     }
     else


@@ -4636,7 +5537,7 @@ wxRichTextBuffer::~wxRichTextBuffer()
 void wxRichTextBuffer::ResetAndClearCommands()
 {
     Reset();
 void wxRichTextBuffer::ResetAndClearCommands()
 {
     Reset();

-    
+

     GetCommandProcessor()->ClearCommands();
 
     Modify(false);
     GetCommandProcessor()->ClearCommands();
 
     Modify(false);


@@ -4649,8 +5550,10 @@ void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj)
 
     m_styleSheet = obj.m_styleSheet;
     m_modified = obj.m_modified;
 
     m_styleSheet = obj.m_styleSheet;
     m_modified = obj.m_modified;

-    m_batchedCommandDepth = obj.m_batchedCommandDepth;
-    m_batchedCommand = obj.m_batchedCommand;
+    m_batchedCommandDepth = 0;
+    if (m_batchedCommand)
+        delete m_batchedCommand;
+    m_batchedCommand = NULL;

     m_suppressUndo = obj.m_suppressUndo;
 }
 
     m_suppressUndo = obj.m_suppressUndo;
 }
 


@@ -4685,10 +5588,10 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 

-    wxTextAttrEx attr(GetDefaultStyle());
+    wxRichTextAttr attr(GetDefaultStyle());

 
 

-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;

     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
         paraAttr = GetStyleForNewParagraph(pos);
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
         paraAttr = GetStyleForNewParagraph(pos);


@@ -4700,21 +5603,23 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr
 
     action->GetNewParagraphs() = paragraphs;
 
 
     action->GetNewParagraphs() = paragraphs;
 

-    if (p)
+    if (p && !p->IsDefault())

     {
     {

-        wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
-        while (node)
+        for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext())

         {
         {

-            wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData();
-            obj->SetAttributes(*p);
-            node = node->GetPrevious();
+            wxRichTextObject* child = node->GetData();
+            child->SetAttributes(*p);

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

+    wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1);
+    if (!paragraphs.GetPartialParagraph())
+        range.SetEnd(range.GetEnd()+1);
+

     // Set the range we'll need to delete in Undo
     // Set the range we'll need to delete in Undo

-    action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1));
+    action->SetRange(range);

 
     SubmitAction(action);
 
 
     SubmitAction(action);
 


@@ -4726,11 +5631,12 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 

-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;

     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {

-        paraAttr = GetStyleForNewParagraph(pos);
+        // Get appropriate paragraph style
+        paraAttr = GetStyleForNewParagraph(pos, false, false);

         if (!paraAttr.IsDefault())
             p = & paraAttr;
     }
         if (!paraAttr.IsDefault())
             p = & paraAttr;
     }


@@ -4763,28 +5669,68 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
 

-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;

     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {

-        paraAttr = GetStyleForNewParagraph(pos);
+        paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */);

         if (!paraAttr.IsDefault())
             p = & paraAttr;
     }
 
         if (!paraAttr.IsDefault())
             p = & paraAttr;
     }
 

-    wxTextAttrEx attr(GetDefaultStyle());
+    wxRichTextAttr attr(GetDefaultStyle());

 
     wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
     action->GetNewParagraphs().SetPartialParagraph(false);
 
     wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
     action->GetNewParagraphs().SetPartialParagraph(false);

-    action->SetPosition(pos);
+    wxRichTextParagraph* para = GetParagraphAtPosition(pos, false);
+    long pos1 = pos;

 
     if (p)
         newPara->SetAttributes(*p);
 
 
     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
+    // Use the default character style
+    if (!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(GetDefaultStyle());
+        wxRichTextAttr toApply;
+        if (para)
+        {
+            wxRichTextAttr combinedAttr = para->GetCombinedAttributes();
+            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
     // Set the range we'll need to delete in Undo

-    action->SetRange(wxRichTextRange(pos, pos));
+    action->SetRange(wxRichTextRange(pos1, pos1));

 
     SubmitAction(action);
 
 
     SubmitAction(action);
 


@@ -4792,12 +5738,13 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int
 }
 
 /// Submit command to insert the given image
 }
 
 /// Submit command to insert the given image

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

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

-    wxTextAttrEx* p = NULL;
-    wxTextAttrEx paraAttr;
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;

     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
         paraAttr = GetStyleForNewParagraph(pos);
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
         paraAttr = GetStyleForNewParagraph(pos);


@@ -4805,7 +5752,7 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
             p = & paraAttr;
     }
 
             p = & paraAttr;
     }
 

-    wxTextAttrEx attr(GetDefaultStyle());
+    wxRichTextAttr attr(GetDefaultStyle());

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


@@ -4813,6 +5760,7 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
 
     wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
     newPara->AppendChild(imageObject);
 
     wxRichTextImage* imageObject = new wxRichTextImage(imageBlock, newPara);
     newPara->AppendChild(imageObject);

+    imageObject->SetAttributes(textAttr);

     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
 
     action->GetNewParagraphs().AppendChild(newPara);
     action->GetNewParagraphs().UpdateRanges();
 


@@ -4828,24 +5776,60 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
     return true;
 }
 
     return true;
 }
 

+// Insert an object with no change of it
+bool wxRichTextBuffer::InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags)
+{
+    wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert object"), wxRICHTEXT_INSERT, this, ctrl, false);
+
+    wxRichTextAttr* p = NULL;
+    wxRichTextAttr paraAttr;
+    if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
+    {
+        paraAttr = GetStyleForNewParagraph(pos);
+        if (!paraAttr.IsDefault())
+            p = & paraAttr;
+    }
+
+    wxRichTextAttr attr(GetDefaultStyle());
+
+    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));
+
+    SubmitAction(action);
+
+    return true;
+}

 /// Get the style that is appropriate for a new paragraph at this position.
 /// If the previous paragraph has a paragraph style name, look up the next-paragraph
 /// style.
 /// Get the style that is appropriate for a new paragraph at this position.
 /// If the previous paragraph has a paragraph style name, look up the next-paragraph
 /// style.

-wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition) const
+wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const

 {
     wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
     if (para)
     {
         wxRichTextAttr attr;
         bool foundAttributes = false;
 {
     wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
     if (para)
     {
         wxRichTextAttr attr;
         bool foundAttributes = false;

-        
+

         // Look for a matching paragraph style
         // Look for a matching paragraph style

-        if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
+        if (lookUpNewParaStyle && !para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())

         {
             wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
             if (paraDef)
             {
         {
             wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
             if (paraDef)
             {

-                if (!paraDef->GetNextStyle().IsEmpty())
+                // 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 = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
                     if (nextParaDef)
                 {
                     wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
                     if (nextParaDef)


@@ -4854,7 +5838,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                         attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());
                     }
                 }
                         attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());
                     }
                 }

-                
+

                 // If we didn't find the 'next style', use this style instead.
                 if (!foundAttributes)
                 {
                 // If we didn't find the 'next style', use this style instead.
                 if (!foundAttributes)
                 {


@@ -4863,6 +5847,25 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                 }
             }
         }
                 }
             }
         }

+
+        // Also apply list style if present
+        if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet())
+        {
+            wxRichTextListStyleDefinition* listDef = 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, GetStyleSheet()));
+                wxRichTextApplyStyle(attr, listStyle);
+                attr.SetOutlineLevel(thisLevel);
+                if (para->GetAttributes().HasBulletNumber())
+                    attr.SetBulletNumber(para->GetAttributes().GetBulletNumber());
+            }
+        }
+

         if (!foundAttributes)
         {
             attr = para->GetAttributes();
         if (!foundAttributes)
         {
             attr = para->GetAttributes();


@@ -4874,14 +5877,6 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                     (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
             attr.SetFlags(flags);
         }
                     (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
             attr.SetFlags(flags);
         }

-        
-        // Now see if we need to number the paragraph.
-        if (attr.HasBulletStyle())
-        {
-            wxRichTextAttr numberingAttr;
-            if (FindNextParagraphNumber(para, numberingAttr))
-                wxRichTextApplyStyle(attr, (const wxRichTextAttr&) numberingAttr);
-        }

 
         return attr;
     }
 
         return attr;
     }


@@ -4902,22 +5897,18 @@ bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichT
     // Copy the fragment that we'll need to restore in Undo
     CopyFragment(range, action->GetOldParagraphs());
 
     // Copy the fragment that we'll need to restore in Undo
     CopyFragment(range, action->GetOldParagraphs());
 

-    // 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)
+    // 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* lastPara = GetParagraphAtPosition(range.GetStart());
-        if (lastPara)
+        wxRichTextParagraph* para = GetParagraphAtPosition(range.GetStart());
+        if (para && para->GetRange().GetEnd() == range.GetEnd())

         {
         {

-            wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetEnd()+1);
-            if (nextPara)
+            wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetStart()+1);
+            if (nextPara && nextPara != para)

             {
             {

-                wxRichTextParagraph* para = (wxRichTextParagraph*) action->GetOldParagraphs().GetChild(0);
-                para->SetAttributes(nextPara->GetAttributes());
+                action->GetOldParagraphs().GetChildren().GetFirst()->GetData()->SetAttributes(nextPara->GetAttributes());
+                action->GetOldParagraphs().GetAttributes().SetFlags(action->GetOldParagraphs().GetAttributes().GetFlags() | wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE);

             }
         }
     }
             }
         }
     }


@@ -4935,7 +5926,7 @@ bool wxRichTextBuffer::BeginBatchUndo(const wxString& cmdName)
         wxASSERT(m_batchedCommand == NULL);
         if (m_batchedCommand)
         {
         wxASSERT(m_batchedCommand == NULL);
         if (m_batchedCommand)
         {

-            GetCommandProcessor()->Submit(m_batchedCommand);
+            GetCommandProcessor()->Store(m_batchedCommand);

         }
         m_batchedCommand = new wxRichTextCommand(cmdName);
     }
         }
         m_batchedCommand = new wxRichTextCommand(cmdName);
     }


@@ -4955,7 +5946,7 @@ bool wxRichTextBuffer::EndBatchUndo()
 
     if (m_batchedCommandDepth == 0)
     {
 
     if (m_batchedCommandDepth == 0)
     {

-        GetCommandProcessor()->Submit(m_batchedCommand);
+        GetCommandProcessor()->Store(m_batchedCommand);

         m_batchedCommand = NULL;
     }
 
         m_batchedCommand = NULL;
     }
 


@@ -4966,7 +5957,15 @@ bool wxRichTextBuffer::EndBatchUndo()
 bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
 {
     if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
 bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
 {
     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);
         m_batchedCommand->AddAction(action);

+    }

     else
     {
         wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
     else
     {
         wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());


@@ -4996,20 +5995,18 @@ bool wxRichTextBuffer::EndSuppressUndo()
 }
 
 /// Begin using a style
 }
 
 /// Begin using a style

-bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style)
+bool wxRichTextBuffer::BeginStyle(const wxRichTextAttr& style)

 {
 {

-    wxTextAttrEx newStyle(GetDefaultStyle());
+    wxRichTextAttr newStyle(GetDefaultStyle());

 
     // Save the old default style
 
     // Save the old default style

-    m_attributeStack.Append((wxObject*) new wxTextAttrEx(GetDefaultStyle()));
+    m_attributeStack.Append((wxObject*) new wxRichTextAttr(GetDefaultStyle()));

 
     wxRichTextApplyStyle(newStyle, style);
     newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
 
     SetDefaultStyle(newStyle);
 
 
     wxRichTextApplyStyle(newStyle, style);
     newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
 
     SetDefaultStyle(newStyle);
 

-    // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize());
-

     return true;
 }
 
     return true;
 }
 


@@ -5023,7 +6020,7 @@ bool wxRichTextBuffer::EndStyle()
     }
 
     wxList::compatibility_iterator node = m_attributeStack.GetLast();
     }
 
     wxList::compatibility_iterator node = m_attributeStack.GetLast();

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

     m_attributeStack.Erase(node);
 
     SetDefaultStyle(*attr);
     m_attributeStack.Erase(node);
 
     SetDefaultStyle(*attr);


@@ -5044,18 +6041,15 @@ bool wxRichTextBuffer::EndAllStyles()
 void wxRichTextBuffer::ClearStyleStack()
 {
     for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())
 void wxRichTextBuffer::ClearStyleStack()
 {
     for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())

-        delete (wxTextAttrEx*) node->GetData();
+        delete (wxRichTextAttr*) node->GetData();

     m_attributeStack.Clear();
 }
 
 /// Begin using bold
 bool wxRichTextBuffer::BeginBold()
 {
     m_attributeStack.Clear();
 }
 
 /// Begin using bold
 bool wxRichTextBuffer::BeginBold()
 {

-    wxFont font(GetBasicStyle().GetFont());
-    font.SetWeight(wxBOLD);
-
-    wxTextAttrEx attr;
-    attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT);
+    wxRichTextAttr attr;
+    attr.SetFontWeight(wxFONTWEIGHT_BOLD);

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


@@ -5063,11 +6057,8 @@ bool wxRichTextBuffer::BeginBold()
 /// Begin using italic
 bool wxRichTextBuffer::BeginItalic()
 {
 /// Begin using italic
 bool wxRichTextBuffer::BeginItalic()
 {

-    wxFont font(GetBasicStyle().GetFont());
-    font.SetStyle(wxITALIC);
-
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC);
+    wxRichTextAttr attr;
+    attr.SetFontStyle(wxFONTSTYLE_ITALIC);

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


@@ -5075,11 +6066,8 @@ bool wxRichTextBuffer::BeginItalic()
 /// Begin using underline
 bool wxRichTextBuffer::BeginUnderline()
 {
 /// Begin using underline
 bool wxRichTextBuffer::BeginUnderline()
 {

-    wxFont font(GetBasicStyle().GetFont());
-    font.SetUnderlined(true);
-
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE);
+    wxRichTextAttr attr;
+    attr.SetFontUnderlined(true);

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


@@ -5087,11 +6075,8 @@ bool wxRichTextBuffer::BeginUnderline()
 /// Begin using point size
 bool wxRichTextBuffer::BeginFontSize(int pointSize)
 {
 /// Begin using point size
 bool wxRichTextBuffer::BeginFontSize(int pointSize)
 {

-    wxFont font(GetBasicStyle().GetFont());
-    font.SetPointSize(pointSize);
-
-    wxTextAttrEx attr;
-    attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE);
+    wxRichTextAttr attr;
+    attr.SetFontSize(pointSize);

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


@@ -5099,8 +6084,7 @@ bool wxRichTextBuffer::BeginFontSize(int pointSize)
 /// Begin using this font
 bool wxRichTextBuffer::BeginFont(const wxFont& font)
 {
 /// Begin using this font
 bool wxRichTextBuffer::BeginFont(const wxFont& font)
 {

-    wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_FONT);
+    wxRichTextAttr attr;

     attr.SetFont(font);
 
     return BeginStyle(attr);
     attr.SetFont(font);
 
     return BeginStyle(attr);


@@ -5109,7 +6093,7 @@ bool wxRichTextBuffer::BeginFont(const wxFont& font)
 /// Begin using this colour
 bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
 {
 /// Begin using this colour
 bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
     attr.SetTextColour(colour);
 
     attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
     attr.SetTextColour(colour);
 


@@ -5119,7 +6103,7 @@ bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
 /// Begin using alignment
 bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
 {
 /// Begin using alignment
 bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
     attr.SetAlignment(alignment);
 
     attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
     attr.SetAlignment(alignment);
 


@@ -5129,7 +6113,7 @@ bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
 /// Begin left indent
 bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
 {
 /// Begin left indent
 bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
 
     attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
 


@@ -5139,7 +6123,7 @@ bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
 /// Begin right indent
 bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
 {
 /// Begin right indent
 bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
     attr.SetRightIndent(rightIndent);
 
     attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
     attr.SetRightIndent(rightIndent);
 


@@ -5155,7 +6139,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after)
     if (after != 0)
         flags |= wxTEXT_ATTR_PARA_SPACING_AFTER;
 
     if (after != 0)
         flags |= wxTEXT_ATTR_PARA_SPACING_AFTER;
 

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(flags);
     attr.SetParagraphSpacingBefore(before);
     attr.SetParagraphSpacingAfter(after);
     attr.SetFlags(flags);
     attr.SetParagraphSpacingBefore(before);
     attr.SetParagraphSpacingAfter(after);


@@ -5166,7 +6150,7 @@ bool wxRichTextBuffer::BeginParagraphSpacing(int before, int after)
 /// Begin line spacing
 bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
 {
 /// Begin line spacing
 bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
     attr.SetLineSpacing(lineSpacing);
 
     attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
     attr.SetLineSpacing(lineSpacing);
 


@@ -5176,7 +6160,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
 /// Begin numbered bullet
 bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
 {
 /// Begin numbered bullet
 bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetBulletNumber(bulletNumber);
     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetBulletNumber(bulletNumber);


@@ -5188,7 +6172,7 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int
 /// Begin symbol bullet
 bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)
 {
 /// Begin symbol bullet
 bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);


@@ -5200,7 +6184,7 @@ bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent,
 /// Begin standard bullet
 bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
 {
 /// Begin standard bullet
 bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
     attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);


@@ -5217,7 +6201,7 @@ bool wxRichTextBuffer::BeginCharacterStyle(const wxString& characterStyle)
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
         if (def)
         {
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
         if (def)
         {

-            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
+            wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());

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


@@ -5232,7 +6216,7 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle)
         wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle);
         if (def)
         {
         wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle);
         if (def)
         {

-            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
+            wxRichTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());

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


@@ -5247,7 +6231,7 @@ bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int
         wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
         if (def)
         {
         wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
         if (def)
         {

-            wxTextAttrEx attr(def->GetCombinedStyleForLevel(level));
+            wxRichTextAttr attr(def->GetCombinedStyleForLevel(level));

 
             attr.SetBulletNumber(number);
 
 
             attr.SetBulletNumber(number);
 


@@ -5260,7 +6244,7 @@ bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int
 /// Begin URL
 bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
 {
 /// Begin URL
 bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
 {

-    wxTextAttrEx attr;
+    wxRichTextAttr attr;

 
     if (!characterStyle.IsEmpty() && GetStyleSheet())
     {
 
     if (!characterStyle.IsEmpty() && GetStyleSheet())
     {


@@ -5302,14 +6286,15 @@ bool wxRichTextBuffer::RemoveHandler(const wxString& name)
 }
 
 /// Finds a handler by filename or, if supplied, type
 }
 
 /// Finds a handler by filename or, if supplied, type

-wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType)
+wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename,
+                                                                   wxRichTextFileType imageType)

 {
     if (imageType != wxRICHTEXT_TYPE_ANY)
         return FindHandler(imageType);
     else if (!filename.IsEmpty())
     {
         wxString path, file, ext;
 {
     if (imageType != wxRICHTEXT_TYPE_ANY)
         return FindHandler(imageType);
     else if (!filename.IsEmpty())
     {
         wxString path, file, ext;

-        wxSplitPath(filename, & path, & file, & ext);
+        wxFileName::SplitPath(filename, & path, & file, & ext);

         return FindHandler(ext, imageType);
     }
     else
         return FindHandler(ext, imageType);
     }
     else


@@ -5332,7 +6317,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& name)
 }
 
 /// Finds a handler by extension and type
 }
 
 /// Finds a handler by extension and type

-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type)
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type)

 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)


@@ -5347,7 +6332,7 @@ wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension,
 }
 
 /// Finds a handler by type
 }
 
 /// Finds a handler by type

-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type)
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type)

 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)
 {
     wxList::compatibility_iterator node = sm_handlers.GetFirst();
     while (node)


@@ -5391,7 +6376,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t
     while (node)
     {
         wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
     while (node)
     {
         wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();

-        if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad()))
+        if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad())))

         {
             if (combine)
             {
         {
             if (combine)
             {


@@ -5425,12 +6410,12 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t
 }
 
 /// Load a file
 }
 
 /// Load a file

-bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
+bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type)

 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
     {
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
     {

-        SetDefaultStyle(wxTextAttrEx());
+        SetDefaultStyle(wxRichTextAttr());

         handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, filename);
         Invalidate(wxRICHTEXT_ALL);
         handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, filename);
         Invalidate(wxRICHTEXT_ALL);


@@ -5441,7 +6426,7 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
 }
 
 /// Save a file
 }
 
 /// Save a file

-bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
+bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type)

 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)


@@ -5454,12 +6439,12 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
 }
 
 /// Load from a stream
 }
 
 /// Load from a stream

-bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
+bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type)

 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
     {
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
     {

-        SetDefaultStyle(wxTextAttrEx());
+        SetDefaultStyle(wxRichTextAttr());

         handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, stream);
         Invalidate(wxRICHTEXT_ALL);
         handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, stream);
         Invalidate(wxRICHTEXT_ALL);


@@ -5470,7 +6455,7 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
 }
 
 /// Save to a stream
 }
 
 /// Save to a stream

-bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
+bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type)

 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)


@@ -5544,18 +6529,38 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                 wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
                 if (richTextBuffer)
                 {
                 wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
                 if (richTextBuffer)
                 {

-                    InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+                    InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0);
+                    if (GetRichTextCtrl())
+                        GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd());

                     delete richTextBuffer;
                 }
             }
                     delete richTextBuffer;
                 }
             }

-            else if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_UNICODETEXT))
+            else if (wxTheClipboard->IsSupported(wxDF_TEXT)
+#if wxUSE_UNICODE
+                        || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
+#endif // wxUSE_UNICODE
+                    )

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

-                text.Replace(_T("\r\n"), _T("\n"));
+#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
+                InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);

 
 

-                InsertTextWithUndo(position+1, text, GetRichTextCtrl());
+                if (GetRichTextCtrl())
+                    GetRichTextCtrl()->ShowPosition(position + text2.Length());

 
                 success = true;
             }
 
                 success = true;
             }


@@ -5573,10 +6578,10 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);
 
                 if (action->GetNewParagraphs().GetChildCount() == 1)
                     action->GetNewParagraphs().SetPartialParagraph(true);
 

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

 
                 // Set the range we'll need to delete in Undo
 
                 // Set the range we'll need to delete in Undo

-                action->SetRange(wxRichTextRange(position, position));
+                action->SetRange(wxRichTextRange(position+1, position+1));

 
                 SubmitAction(action);
 
 
                 SubmitAction(action);
 


@@ -5598,9 +6603,12 @@ bool wxRichTextBuffer::CanPasteFromClipboard() const
 #if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
     if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
     {
 #if wxUSE_CLIPBOARD && wxUSE_DATAOBJ
     if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open())
     {

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

         {
             canPaste = true;
         }
         {
             canPaste = true;
         }


@@ -5639,7 +6647,7 @@ bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHand
         m_eventHandlers.Erase(node);
         if (deleteHandler)
             delete handler;
         m_eventHandlers.Erase(node);
         if (deleteHandler)
             delete handler;

-        
+

         return true;
     }
     else
         return true;
     }
     else


@@ -5674,17 +6682,17 @@ bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll)
 bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet)
 {
     wxRichTextStyleSheet* oldSheet = GetStyleSheet();
 bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet)
 {
     wxRichTextStyleSheet* oldSheet = GetStyleSheet();

-    
+

     wxWindowID id = wxID_ANY;
     if (GetRichTextCtrl())
         id = GetRichTextCtrl()->GetId();
     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();
     wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id);
     event.SetEventObject(GetRichTextCtrl());
     event.SetOldStyleSheet(oldSheet);
     event.SetNewStyleSheet(sheet);
     event.Allow();

-    
+

     if (SendEvent(event) && !event.IsAllowed())
     {
         if (sheet != oldSheet)
     if (SendEvent(event) && !event.IsAllowed())
     {
         if (sheet != oldSheet)


@@ -5713,48 +6721,50 @@ void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer)
     sm_renderer = renderer;
 }
 
     sm_renderer = renderer;
 }
 

-bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect)
+bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& bulletAttr, const wxRect& rect)

 {
     if (bulletAttr.GetTextColour().Ok())
     {
 {
     if (bulletAttr.GetTextColour().Ok())
     {

-        dc.SetPen(wxPen(bulletAttr.GetTextColour()));
-        dc.SetBrush(wxBrush(bulletAttr.GetTextColour()));
+        wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour()));
+        wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour()));

     }
     else
     {
     }
     else
     {

-        dc.SetPen(*wxBLACK_PEN);
-        dc.SetBrush(*wxBLACK_BRUSH);
+        wxCheckSetPen(dc, *wxBLACK_PEN);
+        wxCheckSetBrush(dc, *wxBLACK_BRUSH);

     }
 
     wxFont font;
     }
 
     wxFont font;

-    if (bulletAttr.GetFont().Ok())
-        font = bulletAttr.GetFont();
+    if (bulletAttr.HasFont())
+    {
+        font = paragraph->GetBuffer()->GetFontTable().FindFont(bulletAttr);
+    }

     else
         font = (*wxNORMAL_FONT);
 
     else
         font = (*wxNORMAL_FONT);
 

-    dc.SetFont(font);
+    wxCheckSetFont(dc, font);

 
     int charHeight = dc.GetCharHeight();
 
     int charHeight = dc.GetCharHeight();

-                
+

     int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion());
     int bulletHeight = bulletWidth;
 
     int x = rect.x;
     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 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;
     // 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());
     // 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.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);
     if (bulletAttr.GetBulletName() == wxT("standard/square"))
     {
         dc.DrawRectangle(x, y, bulletWidth, bulletHeight);


@@ -5766,7 +6776,7 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w
         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;
         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"))
         dc.DrawPolygon(4, pts);
     }
     else if (bulletAttr.GetBulletName() == wxT("standard/triangle"))


@@ -5775,39 +6785,43 @@ bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, w
         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;
         pts[0].x = x;                   pts[0].y = y;
         pts[1].x = x + bulletWidth;     pts[1].y = y + bulletHeight/2;
         pts[2].x = x;                   pts[2].y = y + bulletHeight;

-                    
+

         dc.DrawPolygon(3, pts);
     }
     else // "standard/circle", and catch-all
     {
         dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
         dc.DrawPolygon(3, pts);
     }
     else // "standard/circle", and catch-all
     {
         dc.DrawEllipse(x, y, bulletWidth, bulletHeight);

-    }                
- 
+    }
+

     return true;
 }
 
     return true;
 }
 

-bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect, const wxString& text)
+bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text)

 {
     if (!text.empty())
     {
         wxFont font;
 {
     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();
+        if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont())
+        {
+            wxRichTextAttr fontAttr;
+            fontAttr.SetFontSize(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);
 
         else
             font = (*wxNORMAL_FONT);
 

-        dc.SetFont(font);
+        wxCheckSetFont(dc, font);

 
         if (attr.GetTextColour().Ok())
             dc.SetTextForeground(attr.GetTextColour());
 
 
         if (attr.GetTextColour().Ok())
             dc.SetTextForeground(attr.GetTextColour());
 

-        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

 
         int charHeight = dc.GetCharHeight();
         wxCoord tw, th;
 
         int charHeight = dc.GetCharHeight();
         wxCoord tw, th;


@@ -5816,25 +6830,25 @@ bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC&
         int x = rect.x;
 
         // Calculate the top position of the character (as opposed to the whole line height)
         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);    
+        int y = rect.y + (rect.height - charHeight);

 
         // The margin between a bullet and text.
         int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
 
         // 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);
         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;
 }
 
         return true;
     }
     else
         return false;
 }
 

-bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect))
+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.
 {
     // 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.


@@ -5844,16 +6858,78 @@ bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(parag
 /// Enumerate the standard bullet names currently supported
 bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)
 {
 /// Enumerate the standard bullet names currently supported
 bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)
 {

-    bulletNames.Add(wxT("standard/circle"));
-    bulletNames.Add(wxT("standard/square"));
-    bulletNames.Add(wxT("standard/diamond"));
-    bulletNames.Add(wxT("standard/triangle"));
+    bulletNames.Add(wxTRANSLATE("standard/circle"));
+    bulletNames.Add(wxTRANSLATE("standard/square"));
+    bulletNames.Add(wxTRANSLATE("standard/diamond"));
+    bulletNames.Add(wxTRANSLATE("standard/triangle"));

 
     return true;
 }
 
 
     return true;
 }
 

-/*
- * Module to initialise and clean up handlers
+/*!
+ * wxRichTextBox
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextBox, wxRichTextCompositeObject)
+
+wxRichTextBox::wxRichTextBox(wxRichTextObject* parent):
+    wxRichTextCompositeObject(parent)
+{
+}
+
+/// Draw the item
+bool wxRichTextBox::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int descent, int style)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+
+        wxRect childRect = wxRect(child->GetPosition(), child->GetCachedSize());
+        child->Draw(dc, range, selectionRange, childRect, descent, style);
+
+        node = node->GetNext();
+    }
+    return true;
+}
+
+/// Lay the item out
+bool wxRichTextBox::Layout(wxDC& dc, const wxRect& rect, int style)
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        child->Layout(dc, rect, style);
+
+        node = node->GetNext();
+    }
+    m_dirty = false;
+    return true;
+
+}
+
+/// Copy
+void wxRichTextBox::Copy(const wxRichTextBox& obj)
+{
+    wxRichTextCompositeObject::Copy(obj);
+}
+
+/// 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, wxArrayInt* partialExtents) const
+{
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    if (node)
+    {
+        wxRichTextObject* child = node->GetData();
+        return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents);
+    }
+    else
+        return false;
+}
+
+/*
+ * Module to initialise and clean up handlers

  */
 
 class wxRichTextModule: public wxModule
  */
 
 class wxRichTextModule: public wxModule


@@ -5867,7 +6943,7 @@ public:
         wxRichTextBuffer::InitStandardHandlers();
         wxRichTextParagraph::InitDefaultTabs();
         return true;
         wxRichTextBuffer::InitStandardHandlers();
         wxRichTextParagraph::InitDefaultTabs();
         return true;

-    };
+    }

     void OnExit()
     {
         wxRichTextBuffer::CleanUpHandlers();
     void OnExit()
     {
         wxRichTextBuffer::CleanUpHandlers();


@@ -5875,7 +6951,7 @@ public:
         wxRichTextParagraph::ClearDefaultTabs();
         wxRichTextCtrl::ClearAvailableFontNames();
         wxRichTextBuffer::SetRenderer(NULL);
         wxRichTextParagraph::ClearDefaultTabs();
         wxRichTextCtrl::ClearAvailableFontNames();
         wxRichTextBuffer::SetRenderer(NULL);

-    };
+    }

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


@@ -5969,6 +7045,58 @@ wxRichTextAction::~wxRichTextAction()
 {
 }
 
 {
 }
 

+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
+    // 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(GetRange().GetStart());
+        wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
+        while (node)
+        {
+            wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
+            wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+            while (node2)
+            {
+                wxRichTextLine* line = node2->GetData();
+                wxPoint pt = line->GetAbsolutePosition();
+                wxRichTextRange range = line->GetAbsoluteRange();
+
+                if (pt.y > lastY)
+                {
+                    node2 = wxRichTextLineList::compatibility_iterator();
+                    node = wxRichTextObjectList::compatibility_iterator();
+                }
+                else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y)
+                {
+                    optimizationLineCharPositions.Add(range.GetStart());
+                    optimizationLineYPositions.Add(pt.y);
+                }
+
+                if (node2)
+                    node2 = node2->GetNext();
+            }
+
+            if (node)
+                node = node->GetNext();
+        }
+    }
+#endif
+}
+

 bool wxRichTextAction::Do()
 {
     m_buffer->Modify(true);
 bool wxRichTextAction::Do()
 {
     m_buffer->Modify(true);


@@ -5983,54 +7111,12 @@ bool wxRichTextAction::Do()
             wxArrayInt optimizationLineYPositions;
 
 #if wxRICHTEXT_USE_OPTIMIZED_DRAWING
             wxArrayInt optimizationLineYPositions;
 
 #if wxRICHTEXT_USE_OPTIMIZED_DRAWING

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

 #endif
 
 #endif
 

-            m_buffer->InsertFragment(GetPosition(), m_newParagraphs);
+            m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs);

             m_buffer->UpdateRanges();
             m_buffer->UpdateRanges();

-            m_buffer->Invalidate(GetRange());
+            m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd()));

 
             long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();
 
 
             long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();
 


@@ -6041,38 +7127,46 @@ bool wxRichTextAction::Do()
             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;
             else
             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;
             else

-                if (m_newParagraphs.GetChildren().GetCount() > 0)
+                if (m_newParagraphs.GetChildren().GetCount() > 1)

                 {
                     wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData();
                     if (p->GetRange().GetLength() == 1)
                         newCaretPosition --;
                 }
 
                 {
                     wxRichTextObject* p = (wxRichTextObject*) m_newParagraphs.GetChildren().GetLast()->GetData();
                     if (p->GetRange().GetLength() == 1)
                         newCaretPosition --;
                 }
 

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

 
 

-            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());
             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);
 
             break;
         }
     case wxRICHTEXT_DELETE:
         {
             m_buffer->SendEvent(cmdEvent);
 
             break;
         }
     case wxRICHTEXT_DELETE:
         {

+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+

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

-            UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
+            long caretPos = GetRange().GetStart()-1;
+            if (caretPos >= m_buffer->GetRange().GetEnd())
+                caretPos --;
+
+            UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);

 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,


@@ -6080,7 +7174,7 @@ bool wxRichTextAction::Do()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());

-            
+

             m_buffer->SendEvent(cmdEvent);
 
             break;
             m_buffer->SendEvent(cmdEvent);
 
             break;


@@ -6098,7 +7192,7 @@ bool wxRichTextAction::Do()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());

-            
+

             m_buffer->SendEvent(cmdEvent);
 
             break;
             m_buffer->SendEvent(cmdEvent);
 
             break;


@@ -6118,13 +7212,20 @@ bool wxRichTextAction::Undo()
     {
     case wxRICHTEXT_INSERT:
         {
     {
     case wxRICHTEXT_INSERT:
         {

+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+

             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();
             m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
 
             long newCaretPosition = GetPosition() - 1;
             m_buffer->DeleteRange(GetRange());
             m_buffer->UpdateRanges();
             m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
 
             long newCaretPosition = GetPosition() - 1;

-            
-            UpdateAppearance(newCaretPosition, true /* send update event */);
+
+            UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);

 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,


@@ -6132,18 +7233,25 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());

-            
+

             m_buffer->SendEvent(cmdEvent);
 
             break;
         }
     case wxRICHTEXT_DELETE:
         {
             m_buffer->SendEvent(cmdEvent);
 
             break;
         }
     case wxRICHTEXT_DELETE:
         {

+            wxArrayInt optimizationLineCharPositions;
+            wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+            CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+

             m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
             m_buffer->UpdateRanges();
             m_buffer->Invalidate(GetRange());
 
             m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
             m_buffer->UpdateRanges();
             m_buffer->Invalidate(GetRange());
 

-            UpdateAppearance(GetPosition(), true /* send update event */);
+            UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);

 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
 
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,


@@ -6151,7 +7259,7 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());

-            
+

             m_buffer->SendEvent(cmdEvent);
 
             break;
             m_buffer->SendEvent(cmdEvent);
 
             break;


@@ -6169,7 +7277,7 @@ bool wxRichTextAction::Undo()
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());
             cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
             cmdEvent.SetRange(GetRange());
             cmdEvent.SetPosition(GetRange().GetStart());

-            
+

             m_buffer->SendEvent(cmdEvent);
 
             break;
             m_buffer->SendEvent(cmdEvent);
 
             break;


@@ -6182,7 +7290,7 @@ bool wxRichTextAction::Undo()
 }
 
 /// Update the control appearance
 }
 
 /// Update the control appearance

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

 {
     if (m_ctrl)
     {
 {
     if (m_ctrl)
     {


@@ -6190,103 +7298,14 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent
         if (!m_ctrl->IsFrozen())
         {
             m_ctrl->LayoutContent();
         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();
-
-                // find the first line which is being drawn at the same position as it was
-                // before. Since we're talking about a simple insertion, we can assume
-                // that the rest of the window does not need to be redrawn.
-                
-                wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition());
-                wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
-                while (node)
-                {
-                    wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData();
-                    wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
-                    while (node2)
-                    {
-                        wxRichTextLine* line = node2->GetData();
-                        wxPoint pt = line->GetAbsolutePosition();
-                        wxRichTextRange range = line->GetAbsoluteRange();
-                        
-                        // we want to find the first line that is in the same position
-                        // as before. This will mean we're at the end of the changed text.
-                        
-                        if (pt.y > lastY) // going past the end of the window, no more info
-                        {
-                            node2 = wxRichTextLineList::compatibility_iterator();
-                            node = wxRichTextObjectList::compatibility_iterator();
-                        }
-                        else
-                        {
-                            if (!foundStart)
-                            {
-                                firstY = pt.y - firstVisiblePt.y;
-                                foundStart = true;
-                            }
-
-                            // search for this line being at the same position as before                            
-                            for (i = 0; i < optimizationLineCharPositions->GetCount(); i++)
-                            {
-                                if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) &&
-                                    ((*optimizationLineYPositions)[i] == pt.y))
-                                {
-                                    // Stop, we're now the same as we were
-                                    foundEnd = true;
-                                    lastY = pt.y - firstVisiblePt.y;
-
-                                    node2 = wxRichTextLineList::compatibility_iterator();
-                                    node = wxRichTextObjectList::compatibility_iterator();
-
-                                    break;
-                                }                    
-                            }
-                        }
+            // TODO Refresh the whole client area now
+            m_ctrl->Refresh(false);

 
 

-                        if (node2)
-                            node2 = node2->GetNext();
-                    }
-                
-                    if (node)
-                        node = node->GetNext();
-                }
-                
-                if (!foundStart)
-                    firstY = firstVisiblePt.y;
-                if (!foundEnd)
-                    lastY = firstVisiblePt.y + clientSize.y;
-
-                wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY);
-                m_ctrl->RefreshRect(rect);
-                
-                // TODO: we need to make sure that lines are only drawn if in the update region. The rect
-                // passed to Draw is currently used in different ways (to pass the position the content should
-                // be drawn at as well as the relevant region).
-            }
-            else            
+#if wxRICHTEXT_USE_OWN_CARET
+            m_ctrl->PositionCaret();

 #endif
 #endif

-                m_ctrl->Refresh(false);
-

             if (sendUpdateEvent)
             if (sendUpdateEvent)

-                m_ctrl->SendTextUpdatedEvent();
+                wxTextCtrl::SendTextUpdatedEvent(m_ctrl);

         }
     }
 }
         }
     }
 }


@@ -6348,62 +7367,92 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
 

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

     wxRichTextObject(parent)
 {
     wxRichTextObject(parent)
 {

-    m_image = image;
+    m_imageBlock.MakeImageBlockDefaultQuality(image, wxBITMAP_TYPE_PNG);

     if (charStyle)
         SetAttributes(*charStyle);
 }
 
     if (charStyle)
         SetAttributes(*charStyle);
 }
 

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

     wxRichTextObject(parent)
 {
     m_imageBlock = imageBlock;
     wxRichTextObject(parent)
 {
     m_imageBlock = imageBlock;

-    m_imageBlock.Load(m_image);

     if (charStyle)
         SetAttributes(*charStyle);
 }
 
     if (charStyle)
         SetAttributes(*charStyle);
 }
 

-/// Load wxImage from the block
-bool wxRichTextImage::LoadFromBlock()
+/// Create a cached image at the required size
+bool wxRichTextImage::LoadImageCache(wxDC& dc, bool resetCache)

 {
 {

-    m_imageBlock.Load(m_image);
-    return m_imageBlock.Ok();
-}
+    if (resetCache || !m_imageCache.IsOk() /* || m_imageCache.GetWidth() != size.x || m_imageCache.GetHeight() != size.y */)
+    {
+        if (!m_imageBlock.IsOk())
+            return false;

 
 

-/// Make block from the wxImage
-bool wxRichTextImage::MakeBlock()
-{
-    if (m_imageBlock.GetImageType() == wxBITMAP_TYPE_ANY || m_imageBlock.GetImageType() == -1)
-        m_imageBlock.SetImageType(wxBITMAP_TYPE_PNG);
+        wxImage image;
+        m_imageBlock.Load(image);
+        if (!image.IsOk())
+            return false;

 
 

-    m_imageBlock.MakeImageBlock(m_image, m_imageBlock.GetImageType());
-    return m_imageBlock.Ok();
-}
+        int width = image.GetWidth();
+        int height = image.GetHeight();
+
+        if (GetAttributes().GetTextBoxAttr().GetWidth().IsPresent() && GetAttributes().GetTextBoxAttr().GetWidth().GetValue() > 0)
+        {
+            if (GetAttributes().GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+                width = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetWidth().GetValue());
+            else
+                width = GetAttributes().GetTextBoxAttr().GetWidth().GetValue();
+        }
+        if (GetAttributes().GetTextBoxAttr().GetHeight().IsPresent() && GetAttributes().GetTextBoxAttr().GetHeight().GetValue() > 0)
+        {
+            if (GetAttributes().GetTextBoxAttr().GetHeight().GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+                height = ConvertTenthsMMToPixels(dc, GetAttributes().GetTextBoxAttr().GetHeight().GetValue());
+            else
+                height = GetAttributes().GetTextBoxAttr().GetHeight().GetValue();
+        }

 
 

+        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);
+        }
+    }
+
+    return m_imageCache.IsOk();
+}

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

-    if (!m_image.Ok() && m_imageBlock.Ok())
-        LoadFromBlock();
-
-    if (!m_image.Ok())
+    // Don't need cached size AFAIK
+    // wxSize size = GetCachedSize();
+    if (!LoadImageCache(dc))

         return false;
 
         return false;
 

-    if (m_image.Ok() && !m_bitmap.Ok())
-        m_bitmap = wxBitmap(m_image);
+    int y = rect.y + (rect.height - m_imageCache.GetHeight());

 
 

-    int y = rect.y + (rect.height - m_image.GetHeight());
-
-    if (m_bitmap.Ok())
-        dc.DrawBitmap(m_bitmap, rect.x, y, true);
+    dc.DrawBitmap(m_imageCache, rect.x, y, true);

 
     if (selectionRange.Contains(range.GetStart()))
     {
 
     if (selectionRange.Contains(range.GetStart()))
     {

-        dc.SetBrush(*wxBLACK_BRUSH);
-        dc.SetPen(*wxBLACK_PEN);
+        wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+        wxCheckSetPen(dc, *wxBLACK_PEN);

         dc.SetLogicalFunction(wxINVERT);
         dc.DrawRectangle(rect);
         dc.SetLogicalFunction(wxCOPY);
         dc.SetLogicalFunction(wxINVERT);
         dc.DrawRectangle(rect);
         dc.SetLogicalFunction(wxCOPY);


@@ -6413,32 +7462,40 @@ bool wxRichTextImage::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichT
 }
 
 /// Lay the item out
 }
 
 /// Lay the item out

-bool wxRichTextImage::Layout(wxDC& WXUNUSED(dc), const wxRect& rect, int WXUNUSED(style))
+bool wxRichTextImage::Layout(wxDC& dc, const wxRect& rect, int WXUNUSED(style))

 {
 {

-    if (!m_image.Ok())
-        LoadFromBlock();
+    if (!LoadImageCache(dc))
+        return false;

 
 

-    if (m_image.Ok())
-    {
-        SetCachedSize(wxSize(m_image.GetWidth(), m_image.GetHeight()));
-        SetPosition(rect.GetPosition());
-    }
+    SetCachedSize(wxSize(m_imageCache.GetWidth(), m_imageCache.GetHeight()));
+    SetPosition(rect.GetPosition());

 
     return true;
 }
 
 /// Get/set the object size for the given range. Returns false if the range
 /// is invalid for this object.
 
     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
+bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& dc, int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const

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

-    if (!m_image.Ok())
+    if (!((wxRichTextImage*)this)->LoadImageCache(dc))
+    {
+        size.x = 0; size.y = 0;
+        if (partialExtents)
+            partialExtents->Add(0);

         return false;
         return false;

+    }
+
+    int width = m_imageCache.GetWidth();
+    int height = m_imageCache.GetHeight();

 
 

-    size.x = m_image.GetWidth();
-    size.y = m_image.GetHeight();
+    if (partialExtents)
+        partialExtents->Add(width);
+
+    size.x = width;
+    size.y = height;

 
     return true;
 }
 
     return true;
 }


@@ -6448,1888 +7505,1860 @@ void wxRichTextImage::Copy(const wxRichTextImage& obj)
 {
     wxRichTextObject::Copy(obj);
 
 {
     wxRichTextObject::Copy(obj);
 

-    m_image = obj.m_image;

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

+/// Edit properties via a GUI
+bool wxRichTextImage::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
+{
+    wxRichTextImageDialog imageDlg(wxGetTopLevelParent(parent));
+    imageDlg.SetImageObject(this, buffer);
+
+    if (imageDlg.ShowModal() == wxID_OK)
+    {
+        imageDlg.ApplyImageAttr();
+        return true;
+    }
+    else
+        return false;
+}
+

 /*!
  * Utilities
  *
  */
 
 /// Compare two attribute objects
 /*!
  * Utilities
  *
  */
 
 /// Compare two attribute objects

-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
+bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2)

 {
     return (attr1 == attr2);
 }
 
 {
     return (attr1 == attr2);
 }
 

-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
+// Partial equality test taking flags into account
+bool wxTextAttrEqPartial(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2)

 {
 {

-    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())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetWeight() != attr2.GetFont().GetWeight())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetStyle() != attr2.GetFont().GetStyle())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
-        attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
-        return false;
-
-    if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
-        ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
-        (attr1.GetRightIndent() != attr2.GetRightIndent()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
-        (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
-        (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
-        (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
-        (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
-        (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
-        (attr1.GetListStyleName() != attr2.GetListStyleName()))
-        return false;
-
-    if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
-        (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
-         return false;
-
-    if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
-        (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
-         return false;
-
-    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
-        (attr1.GetBulletText() != attr2.GetBulletText()) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
-         return false;
-
-    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
-        (attr1.GetBulletName() != attr2.GetBulletName()))
-         return false;
+    return attr1.EqPartial(attr2);
+}

 
 

-    if ((flags & wxTEXT_ATTR_TABS) &&
-        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))
+/// Compare tabs
+bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
+{
+    if (tabs1.GetCount() != tabs2.GetCount())

         return false;
 
         return false;
 

-    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
-        (attr1.HasPageBreak() != attr2.HasPageBreak()))
-         return false;
-
-    if (flags & wxTEXT_ATTR_EFFECTS)
+    size_t i;
+    for (i = 0; i < tabs1.GetCount(); i++)

     {
     {

-        if (attr1.HasTextEffects() != attr2.HasTextEffects())
-            return false;
-        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
+        if (tabs1[i] != tabs2[i])

             return false;
     }
             return false;
     }

-
-    if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
-        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
-         return false;
-

     return true;
 }
 
     return true;
 }
 

-bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, int flags)
+bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)

 {
 {

-    if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour())
-        return false;
+    return destStyle.Apply(style, compareWith);
+}

 
 

-    if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour())
-        return false;
+// Remove attributes
+bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style)
+{
+    return destStyle.RemoveStyle(style);
+}

 
 

-    if ((flags & (wxTEXT_ATTR_FONT)) && !attr1.GetFont().Ok())
-        return false;
+/// 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);
+}

 
 

-    if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetFaceName() != attr2.GetFontFaceName())
-        return false;
+/// Compare two bitlists
+bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
+{
+    return wxRichTextAttr::BitlistsEqPartial(valueA, valueB, flags);
+}

 
 

-    if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetPointSize() != attr2.GetFontSize())
-        return false;
+/// Split into paragraph and character styles
+bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle)
+{
+    return wxRichTextAttr::SplitParaCharStyles(style, parStyle, charStyle);
+}

 
 

-    if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetWeight() != attr2.GetFontWeight())
-        return false;
+/// Convert a decimal to Roman numerals
+wxString wxRichTextDecimalToRoman(long n)
+{
+    static wxArrayInt decimalNumbers;
+    static wxArrayString romanNumbers;

 
 

-    if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetStyle() != attr2.GetFontStyle())
-        return false;
+    // Clean up arrays
+    if (n == -1)
+    {
+        decimalNumbers.Clear();
+        romanNumbers.Clear();
+        return wxEmptyString;
+    }

 
 

-    if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() &&
-        attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined())
-        return false;
+    if (decimalNumbers.GetCount() == 0)
+    {
+        #define wxRichTextAddDecRom(n, r) decimalNumbers.Add(n); romanNumbers.Add(r);

 
 

-    if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
-        return false;
+        wxRichTextAddDecRom(1000, wxT("M"));
+        wxRichTextAddDecRom(900, wxT("CM"));
+        wxRichTextAddDecRom(500, wxT("D"));
+        wxRichTextAddDecRom(400, wxT("CD"));
+        wxRichTextAddDecRom(100, wxT("C"));
+        wxRichTextAddDecRom(90, wxT("XC"));
+        wxRichTextAddDecRom(50, wxT("L"));
+        wxRichTextAddDecRom(40, wxT("XL"));
+        wxRichTextAddDecRom(10, wxT("X"));
+        wxRichTextAddDecRom(9, wxT("IX"));
+        wxRichTextAddDecRom(5, wxT("V"));
+        wxRichTextAddDecRom(4, wxT("IV"));
+        wxRichTextAddDecRom(1, wxT("I"));
+    }

 
 

-    if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
-        ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
-        return false;
+    int i = 0;
+    wxString roman;

 
 

-    if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
-        (attr1.GetRightIndent() != attr2.GetRightIndent()))
-        return false;
+    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;
+}

 
 

-    if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
-        (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
-        return false;
+/*!
+ * wxRichTextFileHandler
+ * Base class for file handlers
+ */

 
 

-    if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
-        (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
-        return false;
+IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)

 
 

-    if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
-        (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
-        return false;
+#if wxUSE_FFILE && wxUSE_STREAMS
+bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
+{
+    wxFFileInputStream stream(filename);
+    if (stream.Ok())
+        return LoadFile(buffer, stream);

 
 

-    if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
-        (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
-        return false;
+    return false;
+}

 
 

-    if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
-        (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
-        return false;
+bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
+{
+    wxFFileOutputStream stream(filename);
+    if (stream.Ok())
+        return SaveFile(buffer, stream);

 
 

-    if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
-        (attr1.GetListStyleName() != attr2.GetListStyleName()))
-        return false;
+    return false;
+}
+#endif // wxUSE_FFILE && wxUSE_STREAMS

 
 

-    if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
-        (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
-         return false;
+/// Can we handle this filename (if using files)? By default, checks the extension.
+bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
+{
+    wxString path, file, ext;
+    wxFileName::SplitPath(filename, & path, & file, & ext);

 
 

-    if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
-        (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
-         return false;
+    return (ext.Lower() == GetExtension());
+}

 
 

-    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
-        (attr1.GetBulletText() != attr2.GetBulletText()) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
-         return false;
+/*!
+ * wxRichTextTextHandler
+ * Plain text handler
+ */

 
 

-    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
-        (attr1.GetBulletName() != attr2.GetBulletName()))
-         return false;
+IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)

 
 

-    if ((flags & wxTEXT_ATTR_TABS) &&
-        !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()))
+#if wxUSE_STREAMS
+bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+{
+    if (!stream.IsOk())

         return false;
 
         return false;
 

-    if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
-        (attr1.HasPageBreak() != attr2.HasPageBreak()))
-         return false;
+    wxString str;
+    int lastCh = 0;

 
 

-    if (flags & wxTEXT_ATTR_EFFECTS)
+    while (!stream.Eof())

     {
     {

-        if (attr1.HasTextEffects() != attr2.HasTextEffects())
-            return false;
-        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
-            return false;
+        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 ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
-        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
-         return false;
+    buffer->ResetAndClearCommands();
+    buffer->Clear();
+    buffer->AddParagraphs(str);
+    buffer->UpdateRanges();

 
     return true;
 }
 
 
     return true;
 }
 

-/// Compare tabs
-bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
+bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)

 {
 {

-    if (tabs1.GetCount() != tabs2.GetCount())
+    if (!stream.IsOk())

         return false;
 
         return false;
 

-    size_t i;
-    for (i = 0; i < tabs1.GetCount(); i++)
-    {
-        if (tabs1[i] != tabs2[i])
-            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;
 }
     return true;
 }

+#endif // wxUSE_STREAMS
+
+/*
+ * Stores information about an image, in binary in-memory form
+ */

 
 

-/// Apply one style to another
-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
+wxRichTextImageBlock::wxRichTextImageBlock()

 {
 {

-    // 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();
+    Init();
+}

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
-            font.SetFaceName(style.GetFont().GetFaceName());
-        }
+wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject()
+{
+    Init();
+    Copy(block);
+}

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-            font.SetPointSize(style.GetFont().GetPointSize());
-        }
+wxRichTextImageBlock::~wxRichTextImageBlock()
+{
+    wxDELETEA(m_data);
+}

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
-            font.SetStyle(style.GetFont().GetStyle());
-        }
+void wxRichTextImageBlock::Init()
+{
+    m_data = NULL;
+    m_dataSize = 0;
+    m_imageType = wxBITMAP_TYPE_INVALID;
+}

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
-            font.SetWeight(style.GetFont().GetWeight());
-        }
+void wxRichTextImageBlock::Clear()
+{
+    wxDELETEA(m_data);
+    m_dataSize = 0;
+    m_imageType = wxBITMAP_TYPE_INVALID;
+}

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
-        {
-            destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
-            font.SetUnderlined(style.GetFont().GetUnderlined());
-        }

 
 

-        if (font != destStyle.GetFont())
-        {
-            int oldFlags = destStyle.GetFlags();
+// 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, wxBitmapType imageType,
+                                          wxImage& image, bool convertToJPEG)
+{
+    m_imageType = imageType;

 
 

-            destStyle.SetFont(font);
+    wxString filenameToRead(filename);
+    bool removeFile = false;

 
 

-            destStyle.SetFlags(oldFlags);
-        }
-    }
+    if (imageType == wxBITMAP_TYPE_INVALID)
+        return false; // Could not determine image type

 
 

-    if ( style.GetTextColour().Ok() && style.HasTextColour())
-        destStyle.SetTextColour(style.GetTextColour());
+    if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
+    {
+        wxString tempFile =
+            wxFileName::CreateTempFileName(_("image"));

 
 

-    if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-        destStyle.SetBackgroundColour(style.GetBackgroundColour());
+        wxASSERT(!tempFile.IsEmpty());

 
 

-    if (style.HasAlignment())
-        destStyle.SetAlignment(style.GetAlignment());
+        image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
+        filenameToRead = tempFile;
+        removeFile = true;

 
 

-    if (style.HasTabs())
-        destStyle.SetTabs(style.GetTabs());
+        m_imageType = wxBITMAP_TYPE_JPEG;
+    }
+    wxFile file;
+    if (!file.Open(filenameToRead))
+        return false;

 
 

-    if (style.HasLeftIndent())
-        destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    m_dataSize = (size_t) file.Length();
+    file.Close();

 
 

-    if (style.HasRightIndent())
-        destStyle.SetRightIndent(style.GetRightIndent());
+    if (m_data)
+        delete[] m_data;
+    m_data = ReadBlock(filenameToRead, m_dataSize);

 
 

-    if (style.HasParagraphSpacingAfter())
-        destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    if (removeFile)
+        wxRemoveFile(filenameToRead);

 
 

-    if (style.HasParagraphSpacingBefore())
-        destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    return (m_data != NULL);
+}

 
 

-    if (style.HasLineSpacing())
-        destStyle.SetLineSpacing(style.GetLineSpacing());
+// 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);

 
 

-    if (style.HasCharacterStyleName())
-        destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+    if (imageType == wxBITMAP_TYPE_INVALID)
+        return false; // Could not determine image type

 
 

-    if (style.HasParagraphStyleName())
-        destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    return DoMakeImageBlock(image, imageType);
+}

 
 

-    if (style.HasListStyleName())
-        destStyle.SetListStyleName(style.GetListStyleName());
+// 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 (style.HasBulletStyle())
-        destStyle.SetBulletStyle(style.GetBulletStyle());
+    return DoMakeImageBlock(image, imageType);
+}

 
 

-    if (style.HasBulletText())
+// Makes the image block
+bool wxRichTextImageBlock::DoMakeImageBlock(const wxImage& image, wxBitmapType imageType)
+{
+    wxMemoryOutputStream memStream;
+    if (!image.SaveFile(memStream, imageType))

     {
     {

-        destStyle.SetBulletText(style.GetBulletText());
-        destStyle.SetBulletFont(style.GetBulletFont());
+        return false;

     }
 
     }
 

-    if (style.HasBulletName())
-        destStyle.SetBulletName(style.GetBulletName());
-
-    if (style.HasBulletNumber())
-        destStyle.SetBulletNumber(style.GetBulletNumber());
-
-    if (style.HasURL())
-        destStyle.SetURL(style.GetURL());
+    unsigned char* block = new unsigned char[memStream.GetSize()];
+    if (!block)
+        return NULL;

 
 

-    if (style.HasPageBreak())
-        destStyle.SetPageBreak();
+    if (m_data)
+        delete[] m_data;
+    m_data = block;

 
 

-    if (style.HasTextEffects())
-    {
-        int destBits = destStyle.GetTextEffects();
-        int destFlags = destStyle.GetTextEffectFlags();
+    m_imageType = imageType;
+    m_dataSize = memStream.GetSize();

 
 

-        int srcBits = style.GetTextEffects();
-        int srcFlags = style.GetTextEffectFlags();
-            
-        wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
-        destStyle.SetTextEffects(destBits);
-        destStyle.SetTextEffectFlags(destFlags);
-    }
+    memStream.CopyTo(m_data, m_dataSize);

 
 

-    if (style.HasOutlineLevel())
-        destStyle.SetOutlineLevel(style.GetOutlineLevel());
+    return (m_data != NULL);
+}

 
 

-    return true;
+// Write to a file
+bool wxRichTextImageBlock::Write(const wxString& filename)
+{
+    return WriteBlock(filename, m_data, m_dataSize);

 }
 
 }
 

-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
+void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block)

 {
 {

-    wxTextAttrEx destStyle2 = destStyle;
-    wxRichTextApplyStyle(destStyle2, style);
-    destStyle = destStyle2;
-    return true;
+    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];

 }
 
 }
 

-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+//// Operators
+void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block)

 {
 {

-    destStyle = destStyle.Combine(style, compareWith);
-    return true;
+    Copy(block);

 }
 
 }
 

-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+// Load a wxImage from the block
+bool wxRichTextImageBlock::Load(wxImage& image)

 {
 {

-    // 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)
-    {
-        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 (!m_data)
+        return false;

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
-        {
-            if (compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())
-            {
-                // The same as currently displayed, so don't set
-            }
-            else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
-                font.SetFaceName(style.GetFontFaceName());
-            }
-        }
+    // 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 (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
-        {
-            if (compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize())
-            {
-                // The same as currently displayed, so don't set
-            }
-            else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
-                font.SetPointSize(style.GetFontSize());
-            }
-        }
+    if (!WriteBlock(tempFile, m_data, m_dataSize))
+    {
+        return false;
+    }
+    success = image.LoadFile(tempFile, GetImageType());
+    wxRemoveFile(tempFile);
+#endif

 
 

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

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
-        {
-            if (compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight())
-            {
-                // The same as currently displayed, so don't set
-            }
-            else
-            {
-                destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
-                font.SetWeight(style.GetFontWeight());
-            }
-        }
+// Write data in hex to a stream
+bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
+{
+    const int bufSize = 512;
+    char buf[bufSize+1];

 
 

-        if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
+    int left = m_dataSize;
+    int n, i, j;
+    j = 0;
+    while (left > 0)
+    {
+        if (left*2 > bufSize)

         {
         {

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

         }
         }

-
-        if (font != destStyle.GetFont())
+        else

         {
         {

-            int oldFlags = destStyle.GetFlags();
-
-            destStyle.SetFont(font);
-
-            destStyle.SetFlags(oldFlags);
+            n = left*2; left = 0;

         }
         }

-    }
-
-    if (style.GetTextColour().Ok() && style.HasTextColour())
-    {
-        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
-            destStyle.SetTextColour(style.GetTextColour());
-    }
-
-    if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-    {
-        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
-            destStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
-
-    if (style.HasAlignment())
-    {
-        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
-            destStyle.SetAlignment(style.GetAlignment());
-    }
-
-    if (style.HasTabs())
-    {
-        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
-            destStyle.SetTabs(style.GetTabs());
-    }

 
 

-    if (style.HasLeftIndent())
-    {
-        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
-                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
-            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
-
-    if (style.HasRightIndent())
-    {
-        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
-            destStyle.SetRightIndent(style.GetRightIndent());
-    }
-
-    if (style.HasParagraphSpacingAfter())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
-            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
-    }
-
-    if (style.HasParagraphSpacingBefore())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
-            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
-    }
-
-    if (style.HasLineSpacing())
-    {
-        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
-            destStyle.SetLineSpacing(style.GetLineSpacing());
-    }
-
-    if (style.HasCharacterStyleName())
-    {
-        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
-            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
-    }
-
-    if (style.HasParagraphStyleName())
-    {
-        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
-            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
-    }
-
-    if (style.HasListStyleName())
-    {
-        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
-            destStyle.SetListStyleName(style.GetListStyleName());
-    }
-
-    if (style.HasBulletStyle())
-    {
-        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
-            destStyle.SetBulletStyle(style.GetBulletStyle());
-    }
-
-    if (style.HasBulletText())
-    {
-        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
+        char* b = buf;
+        for (i = 0; i < (n/2); i++)

         {
         {

-            destStyle.SetBulletText(style.GetBulletText());
-            destStyle.SetBulletFont(style.GetBulletFont());
+            wxDecToHex(m_data[j], b, b+1);
+            b += 2; j ++;

         }
         }

-    }

 
 

-    if (style.HasBulletNumber())
-    {
-        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
-            destStyle.SetBulletNumber(style.GetBulletNumber());
+        buf[n] = 0;
+        stream.Write((const char*) buf, n);

     }
     }

+    return true;
+}

 
 

-    if (style.HasBulletName())
-    {
-        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
-            destStyle.SetBulletName(style.GetBulletName());
-    }
+// Read data in hex from a stream
+bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType)
+{
+    int dataSize = length/2;

 
 

-    if (style.HasURL())
-    {
-        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
-            destStyle.SetURL(style.GetURL());
-    }
+    if (m_data)
+        delete[] m_data;

 
 

-    if (style.HasPageBreak())
-    {
-        if (!(compareWith && compareWith->HasPageBreak()))
-            destStyle.SetPageBreak();
-    }
+    // create a null terminated temporary string:
+    char str[3];
+    str[2] = '\0';

 
 

-    if (style.HasTextEffects())
+    m_data = new unsigned char[dataSize];
+    int i;
+    for (i = 0; i < dataSize; i ++)

     {
     {

-        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
-        {
-            int destBits = destStyle.GetTextEffects();
-            int destFlags = destStyle.GetTextEffectFlags();
+        str[0] = (char)stream.GetC();
+        str[1] = (char)stream.GetC();

 
 

-            int srcBits = style.GetTextEffects();
-            int srcFlags = style.GetTextEffectFlags();
-            
-            wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-            
-            destStyle.SetTextEffects(destBits);
-            destStyle.SetTextEffectFlags(destFlags);
-        }
+        m_data[i] = (unsigned char)wxHexToDec(str);

     }
 
     }
 

-    if (style.HasOutlineLevel())
-    {
-        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
-            destStyle.SetOutlineLevel(style.GetOutlineLevel());
-    }
+    m_dataSize = dataSize;
+    m_imageType = imageType;

 
     return true;
 }
 
 
     return true;
 }
 

-/// Combine two bitlists, specifying the bits of interest with separate flags.
-bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
+// Allocate and read from stream as a block of memory
+unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)

 {
 {

-    // 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);
-    
-    return true;
+    unsigned char* block = new unsigned char[size];
+    if (!block)
+        return NULL;
+
+    stream.Read(block, size);
+
+    return block;

 }
 
 }
 

-/// Compare two bitlists
-bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
+unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size)

 {
 {

-    int relevantBitsA = valueA & flags;
-    int relevantBitsB = valueB & flags;
-    return (relevantBitsA != relevantBitsB);
+    wxFileInputStream stream(filename);
+    if (!stream.Ok())
+        return NULL;
+
+    return ReadBlock(stream, size);

 }
 
 }
 

-/// Split into paragraph and character styles
-bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle)
+// Write memory block to stream
+bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size)

 {
 {

-    wxTextAttrEx defaultCharStyle1(style);
-    wxTextAttrEx defaultParaStyle1(style);
-    defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER);
-    defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH);
+    stream.Write((void*) block, size);
+    return stream.IsOk();

 
 

-    wxRichTextApplyStyle(charStyle, defaultCharStyle1);
-    wxRichTextApplyStyle(parStyle, defaultParaStyle1);
-    
-    return true;

 }
 
 }
 

-void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font)
+// Write memory block to file
+bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size)

 {
 {

-    long flags = attr.GetFlags();
-    attr.SetFont(font);
-    attr.SetFlags(flags);
+    wxFileOutputStream outStream(filename);
+    if (!outStream.Ok())
+        return false;
+
+    return WriteBlock(outStream, block, size);

 }
 
 }
 

-/// Convert a decimal to Roman numerals
-wxString wxRichTextDecimalToRoman(long n)
+// Gets the extension for the block's type
+wxString wxRichTextImageBlock::GetExtension() const

 {
 {

-    static wxArrayInt decimalNumbers;
-    static wxArrayString romanNumbers;
-
-    // Clean up arrays
-    if (n == -1)
-    {
-        decimalNumbers.Clear();
-        romanNumbers.Clear();
+    wxImageHandler* handler = wxImage::FindHandler(GetImageType());
+    if (handler)
+        return handler->GetExtension();
+    else

         return wxEmptyString;
         return wxEmptyString;

-    }
-
-    if (decimalNumbers.GetCount() == 0)
-    {
-        #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"));
-    }
-
-    int i = 0;
-    wxString roman;
-
-    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;

 }
 
 }
 

+#if wxUSE_DATAOBJ
+

 /*!
 /*!

- * wxRichTextAttr stores attributes without a wxFont object, so is a much more
- * efficient way to query styles.
+ * The data object for a wxRichTextBuffer

  */
 
  */
 

-// ctors
-wxRichTextAttr::wxRichTextAttr(const wxColour& colText,
-               const wxColour& colBack,
-               wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack)
-{
-    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;
-}
+const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape");

 
 

-wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr)
+wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer)

 {
 {

-    Init();
+    m_richTextBuffer = richTextBuffer;

 
 

-    (*this) = attr;
-}
+    // this string should uniquely identify our format, but is otherwise
+    // arbitrary
+    m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId());

 
 

-wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr)
-{
-    Copy(attr);
+    SetFormat(m_formatRichTextBuffer);

 }
 
 }
 

-// operations
-void wxRichTextAttr::Init()
-{
-    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)
+wxRichTextBufferDataObject::~wxRichTextBufferDataObject()

 {
 {

-    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;
+    delete m_richTextBuffer;

 }
 
 }
 

-// Equality test
-bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
+// after a call to this function, the richTextBuffer is owned by the caller and it
+// is responsible for deleting it!
+wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer()

 {
 {

-    return  GetFlags() == attr.GetFlags() &&
-
-            GetTextColour() == attr.GetTextColour() &&
-            GetBackgroundColour() == attr.GetBackgroundColour() &&
-
-            GetAlignment() == attr.GetAlignment() &&
-            GetLeftIndent() == attr.GetLeftIndent() &&
-            GetLeftSubIndent() == attr.GetLeftSubIndent() &&
-            GetRightIndent() == attr.GetRightIndent() &&
-            wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
-
-            GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
-            GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
-            GetLineSpacing() == attr.GetLineSpacing() &&
-            GetCharacterStyleName() == attr.GetCharacterStyleName() &&
-            GetParagraphStyleName() == attr.GetParagraphStyleName() &&
-            GetListStyleName() == attr.GetListStyleName() &&
-
-            GetBulletStyle() == attr.GetBulletStyle() &&
-            GetBulletText() == attr.GetBulletText() &&
-            GetBulletNumber() == attr.GetBulletNumber() &&
-            GetBulletFont() == attr.GetBulletFont() &&
-            GetBulletName() == attr.GetBulletName() &&
-
-            GetTextEffects() == attr.GetTextEffects() &&
-            GetTextEffectFlags() == attr.GetTextEffectFlags() &&
-
-            GetOutlineLevel() == attr.GetOutlineLevel() &&
+    wxRichTextBuffer* richTextBuffer = m_richTextBuffer;
+    m_richTextBuffer = NULL;

 
 

-            GetFontSize() == attr.GetFontSize() &&
-            GetFontStyle() == attr.GetFontStyle() &&
-            GetFontWeight() == attr.GetFontWeight() &&
-            GetFontUnderlined() == attr.GetFontUnderlined() &&
-            GetFontFaceName() == attr.GetFontFaceName() &&
-            
-            GetURL() == attr.GetURL();
+    return richTextBuffer;

 }
 
 }
 

-// Create font from font attributes.
-wxFont wxRichTextAttr::CreateFont() const
+wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const

 {
 {

-    wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName);
-#ifdef __WXMAC__
-    font.SetNoAntiAliasing(true);
-#endif
-    return font;
+    return m_formatRichTextBuffer;

 }
 
 }
 

-// Get attributes from font.
-bool wxRichTextAttr::GetFontAttributes(const wxFont& font)
+size_t wxRichTextBufferDataObject::GetDataSize() const

 {
 {

-    if (!font.Ok())
-        return false;
-
-    m_fontSize = font.GetPointSize();
-    m_fontStyle = font.GetStyle();
-    m_fontWeight = font.GetWeight();
-    m_fontUnderlined = font.GetUnderlined();
-    m_fontFaceName = font.GetFaceName();
+    if (!m_richTextBuffer)
+        return 0;

 
 

-    return true;
-}
+    wxString bufXML;

 
 

-wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& style, const wxRichTextAttr* compareWith) const
-{
-    wxRichTextAttr destStyle = (*this);
-    destStyle.Apply(style, compareWith);
-    
-    return destStyle;
-}
-
-bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith)
-{
-    wxRichTextAttr& destStyle = (*this);
-    
-    if (style.HasFontWeight())
-    {
-        if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight()))
-            destStyle.SetFontWeight(style.GetFontWeight());
-    }
-
-    if (style.HasFontSize())

     {
     {

-        if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
-            destStyle.SetFontSize(style.GetFontSize());
+        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 (style.HasFontItalic())
-    {
-        if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle()))
-            destStyle.SetFontStyle(style.GetFontStyle());
-    }
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
+    return strlen(buffer) + 1;
+#else
+    return bufXML.Length()+1;
+#endif
+}

 
 

-    if (style.HasFontUnderlined())
-    {
-        if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()))
-            destStyle.SetFontUnderlined(style.GetFontUnderlined());
-    }
+bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const
+{
+    if (!pBuf || !m_richTextBuffer)
+        return false;

 
 

-    if (style.HasFontFaceName())
-    {
-        if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
-            destStyle.SetFontFaceName(style.GetFontFaceName());
-    }
+    wxString bufXML;

 
 

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

     {
     {

-        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
-            destStyle.SetTextColour(style.GetTextColour());
+        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 (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
-    {
-        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
-            destStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
+#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

 
 

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

 
 

-    if (style.HasTabs())
-    {
-        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
-            destStyle.SetTabs(style.GetTabs());
-    }
+bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+    wxDELETE(m_richTextBuffer);

 
 

-    if (style.HasLeftIndent())
-    {
-        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
-                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
-            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
+    wxString bufXML((const char*) buf, wxConvUTF8);

 
 

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

 
 

-    if (style.HasParagraphSpacingAfter())
+    wxStringInputStream stream(bufXML);
+    if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML))

     {
     {

-        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
-            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
-    }
+        wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler."));

 
 

-    if (style.HasParagraphSpacingBefore())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
-            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
-    }
+        wxDELETE(m_richTextBuffer);

 
 

-    if (style.HasLineSpacing())
-    {
-        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
-            destStyle.SetLineSpacing(style.GetLineSpacing());
+        return false;

     }
     }

+    return true;
+}

 
 

-    if (style.HasCharacterStyleName())
-    {
-        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
-            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
-    }
+#endif
+    // wxUSE_DATAOBJ

 
 

-    if (style.HasParagraphStyleName())
-    {
-        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
-            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
-    }

 
 

-    if (style.HasListStyleName())
-    {
-        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
-            destStyle.SetListStyleName(style.GetListStyleName());
-    }
+/*
+ * wxRichTextFontTable
+ * Manages quick access to a pool of fonts for rendering rich text
+ */

 
 

-    if (style.HasBulletStyle())
-    {
-        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
-            destStyle.SetBulletStyle(style.GetBulletStyle());
-    }
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxFont, wxRichTextFontTableHashMap, class WXDLLIMPEXP_RICHTEXT);

 
 

-    if (style.HasBulletText())
-    {
-        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
-        {
-            destStyle.SetBulletText(style.GetBulletText());
-            destStyle.SetBulletFont(style.GetBulletFont());
-        }
-    }
+class wxRichTextFontTableData: public wxObjectRefData
+{
+public:
+    wxRichTextFontTableData() {}

 
 

-    if (style.HasBulletNumber())
-    {
-        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
-            destStyle.SetBulletNumber(style.GetBulletNumber());
-    }
+    wxFont FindFont(const wxRichTextAttr& fontSpec);

 
 

-    if (style.HasBulletName())
-    {
-        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
-            destStyle.SetBulletName(style.GetBulletName());
-    }
+    wxRichTextFontTableHashMap  m_hashMap;
+};

 
 

-    if (style.HasURL())
-    {
-        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
-            destStyle.SetURL(style.GetURL());
-    }
+wxFont wxRichTextFontTableData::FindFont(const wxRichTextAttr& fontSpec)
+{
+    wxString facename(fontSpec.GetFontFaceName());
+    wxString spec(wxString::Format(wxT("%d-%d-%d-%d-%s-%d"), fontSpec.GetFontSize(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), facename.c_str(), (int) fontSpec.GetFontEncoding()));
+    wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec);

 
 

-    if (style.HasPageBreak())
+    if ( entry == m_hashMap.end() )

     {
     {

-        if (!(compareWith && compareWith->HasPageBreak()))
-            destStyle.SetPageBreak();
+        wxFont font(fontSpec.GetFontSize(), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str());
+        m_hashMap[spec] = font;
+        return font;

     }
     }

-
-    if (style.HasTextEffects())
+    else

     {
     {

-        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
-        {
-            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);
-        }
+        return entry->second;

     }
     }

+}

 
 

-    if (style.HasOutlineLevel())
-    {
-        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
-            destStyle.SetOutlineLevel(style.GetOutlineLevel());
-    }
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject)

 
 

-    return true;
+wxRichTextFontTable::wxRichTextFontTable()
+{
+    m_refData = new wxRichTextFontTableData;

 }
 
 }
 

-/*!
- * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
- */
+wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table)
+    : wxObject()
+{
+    (*this) = table;
+}

 
 

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

 {
 {

-    Copy(attr);
+    UnRef();

 }
 
 }
 

-// Initialise this object.
-void wxTextAttrEx::Init()
+bool wxRichTextFontTable::operator == (const wxRichTextFontTable& table) const

 {
 {

-    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;
+    return (m_refData == table.m_refData);

 }
 
 }
 

-// Copy
-void wxTextAttrEx::Copy(const wxTextAttrEx& attr)
+void wxRichTextFontTable::operator= (const wxRichTextFontTable& table)

 {
 {

-    wxTextAttr::operator= (attr);
+    Ref(table);
+}

 
 

-    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;
+wxFont wxRichTextFontTable::FindFont(const wxRichTextAttr& fontSpec)
+{
+    wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+    if (data)
+        return data->FindFont(fontSpec);
+    else
+        return wxFont();

 }
 
 }
 

-// Assignment from a wxTextAttrEx object
-void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
+void wxRichTextFontTable::Clear()

 {
 {

-    Copy(attr);
+    wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+    if (data)
+        data->m_hashMap.clear();

 }
 
 }
 

-// Assignment from a wxTextAttr object.
-void wxTextAttrEx::operator= (const wxTextAttr& attr)
+// wxTextBoxAttr
+
+
+void wxTextBoxAttr::Reset()

 {
 {

-    wxTextAttr::operator= (attr);
+    m_flags = 0;
+    m_floatMode = 0;
+    m_clearMode = 0;
+    m_collapseMode = 0;
+
+    m_margins.Reset();
+    m_padding.Reset();
+    m_position.Reset();
+
+    m_width.Reset();
+    m_height.Reset();
+
+    m_border.Reset();
+    m_outline.Reset();

 }
 
 // Equality test
 }
 
 // Equality test

-bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
+bool wxTextBoxAttr::operator== (const wxTextBoxAttr& attr) const

 {
     return (
 {
     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
-    {
-        // First find the basic, default font
-        long flags = 0;
+        m_flags == attr.m_flags &&
+        m_floatMode == attr.m_floatMode &&
+        m_clearMode == attr.m_clearMode &&
+        m_collapseMode == attr.m_collapseMode &&

 
 

-        wxFont font;
-        if (attrDef.HasFont())
-        {
-            flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT);
-            font = attrDef.GetFont();
-        }
-        else
-        {
-            if (text)
-                font = text->GetFont();
+        m_margins == attr.m_margins &&
+        m_padding == attr.m_padding &&
+        m_position == attr.m_position &&

 
 

-            // We leave flags at 0 because no font attributes have been specified yet
-        }
-        if (!font.Ok())
-            font = *wxNORMAL_FONT;
+        m_width == attr.m_width &&
+        m_height == attr.m_height &&

 
 

-        // Otherwise, if there are font attributes in attr, apply them
-        if (attr.GetFlags() & wxTEXT_ATTR_FONT)
-        {
-            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())
-            {
-                flags |= wxTEXT_ATTR_FONT_UNDERLINE;
-                font.SetUnderlined(attr.GetFont().GetUnderlined());
-            }
-            newAttr.SetFont(font);
-            newAttr.SetFlags(newAttr.GetFlags()|flags);
-        }
-    }
+        m_border == attr.m_border &&
+        m_outline == attr.m_outline
+        );
+}

 
 

-    // TODO: should really check we are specifying these in the flags,
-    // before setting them, as per above; or we will set them willy-nilly.
-    // However, we should also check whether this is the intention
-    // as per wxTextAttr::Combine, i.e. always to have valid colours
-    // in the style.
-    wxColour colFg = attr.GetTextColour();
-    if ( !colFg.Ok() )
-    {
-        colFg = attrDef.GetTextColour();
+// Partial equality test
+bool wxTextBoxAttr::EqPartial(const wxTextBoxAttr& attr) const
+{
+    if (attr.HasFloatMode() && HasFloatMode() && (GetFloatMode() != attr.GetFloatMode()))
+        return false;

 
 

-        if ( text && !colFg.Ok() )
-            colFg = text->GetForegroundColour();
-    }
+    if (attr.HasClearMode() && HasClearMode() && (GetClearMode() != attr.GetClearMode()))
+        return false;

 
 

-    wxColour colBg = attr.GetBackgroundColour();
-    if ( !colBg.Ok() )
-    {
-        colBg = attrDef.GetBackgroundColour();
+    if (attr.HasCollapseBorders() && HasCollapseBorders() && (attr.GetCollapseBorders() != GetCollapseBorders()))
+        return false;

 
 

-        if ( text && !colBg.Ok() )
-            colBg = text->GetBackgroundColour();
-    }
+    // Position
+
+    if (!m_position.EqPartial(attr.m_position))
+        return false;
+
+    // Margins
+
+    if (!m_margins.EqPartial(attr.m_margins))
+        return false;
+
+    // Padding
+
+    if (!m_padding.EqPartial(attr.m_padding))
+        return false;
+
+    // Border

 
 

-    newAttr.SetTextColour(colFg);
-    newAttr.SetBackgroundColour(colBg);
+    if (!GetBorder().EqPartial(attr.GetBorder()))
+        return false;
+
+    // Outline
+
+    if (!GetOutline().EqPartial(attr.GetOutline()))
+        return false;

 
 

-    if (attr.HasAlignment())
-        newAttr.SetAlignment(attr.GetAlignment());
-    else if (attrDef.HasAlignment())
-        newAttr.SetAlignment(attrDef.GetAlignment());
+    return true;
+}
+
+// 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())
+    {
+        if (!(compareWith && compareWith->HasFloatMode() && compareWith->GetFloatMode() == attr.GetFloatMode()))
+            SetFloatMode(attr.GetFloatMode());
+    }

 
 

-    if (attr.HasTabs())
-        newAttr.SetTabs(attr.GetTabs());
-    else if (attrDef.HasTabs())
-        newAttr.SetTabs(attrDef.GetTabs());
+    if (attr.HasClearMode())
+    {
+        if (!(compareWith && compareWith->HasClearMode() && compareWith->GetClearMode() == attr.GetClearMode()))
+            SetClearMode(attr.GetClearMode());
+    }

 
 

-    if (attr.HasLeftIndent())
-        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
-    else if (attrDef.HasLeftIndent())
-        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+    if (attr.HasCollapseBorders())
+    {
+        if (!(compareWith && compareWith->HasCollapseBorders() && compareWith->GetCollapseBorders() == attr.GetCollapseBorders()))
+            SetCollapseBorders(true);
+    }

 
 

-    if (attr.HasRightIndent())
-        newAttr.SetRightIndent(attr.GetRightIndent());
-    else if (attrDef.HasRightIndent())
-        newAttr.SetRightIndent(attrDef.GetRightIndent());
+    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);

 
 

-    // NEW ATTRIBUTES
+    m_width.Apply(attr.m_width, compareWith ? (& attr.m_width) : (const wxTextAttrDimension*) NULL);
+    m_height.Apply(attr.m_height, compareWith ? (& attr.m_height) : (const wxTextAttrDimension*) NULL);

 
 

-    if (attr.HasParagraphSpacingAfter())
-        newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
+    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);

 
 

-    if (attr.HasParagraphSpacingBefore())
-        newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
+    return true;
+}

 
 

-    if (attr.HasLineSpacing())
-        newAttr.SetLineSpacing(attr.GetLineSpacing());
+// Remove specified attributes from this object
+bool wxTextBoxAttr::RemoveStyle(const wxTextBoxAttr& attr)
+{
+    if (attr.HasFloatMode())
+        RemoveFlag(wxTEXT_BOX_ATTR_FLOAT);

 
 

-    if (attr.HasCharacterStyleName())
-        newAttr.SetCharacterStyleName(attr.GetCharacterStyleName());
+    if (attr.HasClearMode())
+        RemoveFlag(wxTEXT_BOX_ATTR_CLEAR);

 
 

-    if (attr.HasParagraphStyleName())
-        newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
+    if (attr.HasCollapseBorders())
+        RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);

 
 

-    if (attr.HasListStyleName())
-        newAttr.SetListStyleName(attr.GetListStyleName());
+    m_margins.RemoveStyle(attr.m_margins);
+    m_padding.RemoveStyle(attr.m_padding);
+    m_position.RemoveStyle(attr.m_position);

 
 

-    if (attr.HasBulletStyle())
-        newAttr.SetBulletStyle(attr.GetBulletStyle());
+    if (attr.m_width.IsPresent())
+        m_width.Reset();
+    if (attr.m_height.IsPresent())
+        m_height.Reset();

 
 

-    if (attr.HasBulletNumber())
-        newAttr.SetBulletNumber(attr.GetBulletNumber());
+    m_border.RemoveStyle(attr.m_border);
+    m_outline.RemoveStyle(attr.m_outline);

 
 

-    if (attr.HasBulletName())
-        newAttr.SetBulletName(attr.GetBulletName());
+    return true;
+}

 
 

-    if (attr.HasBulletText())
+// 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)
+{
+    if (attr.HasFloatMode())

     {
     {

-        newAttr.SetBulletText(attr.GetBulletText());
-        newAttr.SetBulletFont(attr.GetBulletFont());
+        if (!clashingAttr.HasFloatMode() && !absentAttr.HasFloatMode())
+        {
+            if (HasFloatMode())
+            {
+                if (GetFloatMode() != attr.GetFloatMode())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT);
+                    RemoveFlag(wxTEXT_BOX_ATTR_FLOAT);
+                }
+            }
+            else
+                SetFloatMode(attr.GetFloatMode());
+        }

     }
     }

+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_FLOAT);

 
 

-    if (attr.HasURL())
-        newAttr.SetURL(attr.GetURL());
+    if (attr.HasClearMode())
+    {
+        if (!clashingAttr.HasClearMode() && !absentAttr.HasClearMode())
+        {
+            if (HasClearMode())
+            {
+                if (GetClearMode() != attr.GetClearMode())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR);
+                    RemoveFlag(wxTEXT_BOX_ATTR_CLEAR);
+                }
+            }
+            else
+                SetClearMode(attr.GetClearMode());
+        }
+    }
+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_CLEAR);

 
 

-    if (attr.HasTextEffects())
+    if (attr.HasCollapseBorders())

     {
     {

-        newAttr.SetTextEffects(attr.GetTextEffects());
-        newAttr.SetTextEffectFlags(attr.GetTextEffectFlags());
+        if (!clashingAttr.HasCollapseBorders() && !absentAttr.HasCollapseBorders())
+        {
+            if (HasCollapseBorders())
+            {
+                if (GetCollapseBorders() != attr.GetCollapseBorders())
+                {
+                    clashingAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+                    RemoveFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);
+                }
+            }
+            else
+                SetCollapseBorders(attr.GetCollapseBorders());
+        }

     }
     }

+    else
+        absentAttr.AddFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS);

 
 

-    if (attr.HasOutlineLevel())
-        newAttr.SetOutlineLevel(attr.GetOutlineLevel());
+    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);

 
 

-    return newAttr;
+    m_width.CollectCommonAttributes(attr.m_width, clashingAttr.m_width, absentAttr.m_width);
+    m_height.CollectCommonAttributes(attr.m_height, clashingAttr.m_height, absentAttr.m_height);
+
+    m_border.CollectCommonAttributes(attr.m_border, clashingAttr.m_border, absentAttr.m_border);
+    m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline);

 }
 
 }
 

+// wxRichTextAttr

 
 

-/*!
- * wxRichTextFileHandler
- * Base class for file handlers
- */
+void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
+{
+    wxTextAttr::Copy(attr);

 
 

-IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
+    m_textBoxAttr = attr.m_textBoxAttr;
+}

 
 

-#if wxUSE_STREAMS
-bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
+bool wxRichTextAttr::operator==(const wxRichTextAttr& attr) const

 {
 {

-    wxFFileInputStream stream(filename);
-    if (stream.Ok())
-        return LoadFile(buffer, stream);
+    if (!(wxTextAttr::operator==(attr)))
+        return false;

 
 

-    return false;
+    return (m_textBoxAttr == attr.m_textBoxAttr);

 }
 
 }
 

-bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename)
+// Partial equality test taking comparison object into account
+bool wxRichTextAttr::EqPartial(const wxRichTextAttr& attr) const

 {
 {

-    wxFFileOutputStream stream(filename);
-    if (stream.Ok())
-        return SaveFile(buffer, stream);
+    if (!(wxTextAttr::EqPartial(attr)))
+        return false;

 
 

-    return false;
+    return m_textBoxAttr.EqPartial(attr.m_textBoxAttr);

 }
 }

-#endif // wxUSE_STREAMS

 
 

-/// Can we handle this filename (if using files)? By default, checks the extension.
-bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
+// 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)

 {
 {

-    wxString path, file, ext;
-    wxSplitPath(filename, & path, & file, & ext);
+    wxTextAttr::Apply(style, compareWith);

 
 

-    return (ext.Lower() == GetExtension());
+    return m_textBoxAttr.Apply(style.m_textBoxAttr, compareWith ? (& compareWith->m_textBoxAttr) : (const wxTextBoxAttr*) NULL);

 }
 
 }
 

-/*!
- * wxRichTextTextHandler
- * Plain text handler
- */
+// Remove specified attributes from this object
+bool wxRichTextAttr::RemoveStyle(const wxRichTextAttr& attr)
+{
+    wxTextAttr::RemoveStyle(*this, attr);

 
 

-IMPLEMENT_CLASS(wxRichTextPlainTextHandler, wxRichTextFileHandler)
+    return m_textBoxAttr.RemoveStyle(attr.m_textBoxAttr);
+}

 
 

-#if wxUSE_STREAMS
-bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
+// 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)

 {
 {

-    if (!stream.IsOk())
+    wxTextAttrCollectCommonAttributes(*this, attr, clashingAttr, absentAttr);
+
+    m_textBoxAttr.CollectCommonAttributes(attr.m_textBoxAttr, clashingAttr.m_textBoxAttr, absentAttr.m_textBoxAttr);
+}
+
+// Partial equality test
+bool wxTextAttrBorder::EqPartial(const wxTextAttrBorder& border) const
+{
+    if (border.HasStyle() && !HasStyle() && (border.GetStyle() != GetStyle()))

         return false;
 
         return false;
 

-    wxString str;
-    int lastCh = 0;
+    if (border.HasColour() && !HasColour() && (border.GetColourLong() != GetColourLong()))
+        return false;

 
 

-    while (!stream.Eof())
-    {
-        int ch = stream.GetC();
+    if (border.HasWidth() && !HasWidth() && !(border.GetWidth() == GetWidth()))
+        return false;

 
 

-        if (!stream.Eof())
-        {
-            if (ch == 10 && lastCh != 13)
-                str += wxT('\n');
+    return true;
+}

 
 

-            if (ch > 0 && ch != 10)
-                str += wxChar(ch);
+// 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 && (border.GetStyle() == compareWith->GetStyle())))
+            SetStyle(border.GetStyle());
+    }
+    if (border.HasColour())
+    {
+        if (!(compareWith && (border.GetColourLong() == compareWith->GetColourLong())))
+            SetColour(border.GetColourLong());
+    }
+    if (border.HasWidth())
+    {
+        if (!(compareWith && (border.GetWidth() == compareWith->GetWidth())))
+            SetWidth(border.GetWidth());
+    }

 
 

-            lastCh = ch;
+    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 (!clashingAttr.HasStyle() && !absentAttr.HasStyle())
+        {
+            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);

 
 

-    buffer->ResetAndClearCommands();
-    buffer->Clear();
-    buffer->AddParagraphs(str);
-    buffer->UpdateRanges();
+    if (attr.HasColour())
+    {
+        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) const
+{
+    return m_left.EqPartial(borders.m_left) && m_right.EqPartial(borders.m_right) &&
+            m_top.EqPartial(borders.m_top) && m_bottom.EqPartial(borders.m_bottom);
+}
+
+// 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;
 }
 
     return true;
 }
 

-bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
+// Remove specified attributes from this object
+bool wxTextAttrBorders::RemoveStyle(const wxTextAttrBorders& attr)

 {
 {

-    if (!stream.IsOk())
-        return false;
+    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;
+}

 
 

-    wxString text = buffer->GetText();
+// 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)
+{
+    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);
+}

 
 

-    wxString newLine = wxRichTextLineBreakChar;
-    text.Replace(newLine, wxT("\n"));
-    
-    wxCharBuffer buf = text.ToAscii();
+// Set style of all borders
+void wxTextAttrBorders::SetStyle(int style)
+{
+    m_left.SetStyle(style);
+    m_right.SetStyle(style);
+    m_top.SetStyle(style);
+    m_bottom.SetStyle(style);
+}

 
 

-    stream.Write((const char*) buf, text.length());
-    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);

 }
 }

-#endif // wxUSE_STREAMS

 
 

-/*
- * Stores information about an image, in binary in-memory form
- */
+void wxTextAttrBorders::SetColour(const wxColour& colour)
+{
+    m_left.SetColour(colour);
+    m_right.SetColour(colour);
+    m_top.SetColour(colour);
+    m_bottom.SetColour(colour);
+}

 
 

-wxRichTextImageBlock::wxRichTextImageBlock()
+// Set width of all borders
+void wxTextAttrBorders::SetWidth(const wxTextAttrDimension& width)

 {
 {

-    Init();
+    m_left.SetWidth(width);
+    m_right.SetWidth(width);
+    m_top.SetWidth(width);
+    m_bottom.SetWidth(width);

 }
 
 }
 

-wxRichTextImageBlock::wxRichTextImageBlock(const wxRichTextImageBlock& block):wxObject()
+// Partial equality test
+bool wxTextAttrDimension::EqPartial(const wxTextAttrDimension& dim) const

 {
 {

-    Init();
-    Copy(block);
+    if (dim.IsPresent() && IsPresent() && !((*this) == dim))
+        return false;
+    else
+        return true;

 }
 
 }
 

-wxRichTextImageBlock::~wxRichTextImageBlock()
+bool wxTextAttrDimension::Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith)

 {
 {

-    if (m_data)
+    if (dim.IsPresent())

     {
     {

-        delete[] m_data;
-        m_data = NULL;
+        if (!(compareWith && dim == (*compareWith)))
+            (*this) = dim;

     }
     }

+
+    return true;

 }
 
 }
 

-void wxRichTextImageBlock::Init()
+// 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)

 {
 {

-    m_data = NULL;
-    m_dataSize = 0;
-    m_imageType = -1;
+    if (attr.IsPresent())
+    {
+        if (!clashingAttr.IsPresent() && !absentAttr.IsPresent())
+        {
+            if (IsPresent())
+            {
+                if (!((*this) == attr))
+                {
+                    clashingAttr.SetPresent(true);
+                    SetPresent(false);
+                }
+            }
+            else
+                (*this) = attr;
+        }
+    }
+    else
+        absentAttr.SetPresent(true);

 }
 
 }
 

-void wxRichTextImageBlock::Clear()
+wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize)

 {
 {

-    delete[] m_data;
-    m_data = NULL;
-    m_dataSize = 0;
-    m_imageType = -1;
+    m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize;

 }
 
 }
 

+wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(int ppi, double scale, const wxSize& parentSize)
+{
+    m_ppi = ppi; m_scale = scale; m_parentSize = parentSize;
+}

 
 

-// 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)
+int wxTextAttrDimensionConverter::ConvertTenthsMMToPixels(int units) const

 {
 {

-    m_imageType = imageType;
+    return wxRichTextObject::ConvertTenthsMMToPixels(m_ppi, units, m_scale);
+}

 
 

-    wxString filenameToRead(filename);
-    bool removeFile = false;
+int wxTextAttrDimensionConverter::ConvertPixelsToTenthsMM(int pixels) const
+{
+    return wxRichTextObject::ConvertPixelsToTenthsMM(m_ppi, pixels, m_scale);
+}

 
 

-    if (imageType == -1)
-        return false; // Could not determine image type
+int wxTextAttrDimensionConverter::GetPixels(const wxTextAttrDimension& dim, int direction) const
+{
+    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;
+    }
+}

 
 

-    if ((imageType != wxBITMAP_TYPE_JPEG) && convertToJPEG)
+int wxTextAttrDimensionConverter::GetTenthsMM(const wxTextAttrDimension& dim) const
+{
+    if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM)
+        return dim.GetValue();
+    else if (dim.GetUnits() == wxTEXT_ATTR_UNITS_PIXELS)
+        return ConvertPixelsToTenthsMM(dim.GetValue());
+    else

     {
     {

-        wxString tempFile;
-        bool success = wxGetTempFileName(_("image"), tempFile) ;
+        wxASSERT(false);
+        return 0;
+    }
+}

 
 

-        wxASSERT(success);
+// Partial equality test
+bool wxTextAttrDimensions::EqPartial(const wxTextAttrDimensions& dims) const
+{
+    if (!m_left.EqPartial(dims.m_left))
+        return false;

 
 

-        wxUnusedVar(success);
+    if (!m_right.EqPartial(dims.m_right))
+        return false;

 
 

-        image.SaveFile(tempFile, wxBITMAP_TYPE_JPEG);
-        filenameToRead = tempFile;
-        removeFile = true;
+    if (!m_top.EqPartial(dims.m_top))
+        return false;

 
 

-        m_imageType = wxBITMAP_TYPE_JPEG;
-    }
-    wxFile file;
-    if (!file.Open(filenameToRead))
+    if (!m_bottom.EqPartial(dims.m_bottom))

         return false;
 
         return false;
 

-    m_dataSize = (size_t) file.Length();
-    file.Close();
+    return true;
+}

 
 

-    if (m_data)
-        delete[] m_data;
-    m_data = ReadBlock(filenameToRead, m_dataSize);
+// 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);

 
 

-    if (removeFile)
-        wxRemoveFile(filenameToRead);
+    return true;
+}

 
 

-    return (m_data != NULL);
+// Remove specified attributes from this object
+bool wxTextAttrDimensions::RemoveStyle(const wxTextAttrDimensions& attr)
+{
+    if (attr.m_left.IsPresent())
+        m_left.Reset();
+    if (attr.m_right.IsPresent())
+        m_right.Reset();
+    if (attr.m_top.IsPresent())
+        m_top.Reset();
+    if (attr.m_bottom.IsPresent())
+        m_bottom.Reset();
+
+    return true;

 }
 
 }
 

-// Make an image block from the wxImage in the given
-// format.
-bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality)
+// 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)

 {
 {

-    m_imageType = imageType;
-    image.SetOption(wxT("quality"), quality);
+    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);
+}

 
 

-    if (imageType == -1)
-        return false; // Could not determine image type
+// 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));
+
+    long forbiddenFlags = clashingAttr.GetFlags()|absentAttr.GetFlags();

 
 

-    wxString tempFile;
-    bool success = wxGetTempFileName(_("image"), tempFile) ;
+    if (attr.HasFont())
+    {
+        if (attr.HasFontSize() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_FONT_SIZE))
+        {
+            if (currentStyle.HasFontSize())
+            {
+                if (currentStyle.GetFontSize() != attr.GetFontSize())
+                {
+                    // Clash of attr - mark as such
+                    clashingAttr.AddFlag(wxTEXT_ATTR_FONT_SIZE);
+                    currentStyle.RemoveFlag(wxTEXT_ATTR_FONT_SIZE);
+                }
+            }
+            else
+                currentStyle.SetFontSize(attr.GetFontSize());
+        }
+
+        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 (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 (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 (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.HasTextColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TEXT_COLOUR))
+    {
+        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 (attr.HasBackgroundColour() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BACKGROUND_COLOUR))
+    {
+        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 (attr.HasAlignment() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_ALIGNMENT))
+    {
+        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 (attr.HasTabs() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_TABS))
+    {
+        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 (attr.HasLeftIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LEFT_INDENT))
+    {
+        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 (attr.HasRightIndent() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_RIGHT_INDENT))
+    {
+        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 (attr.HasParagraphSpacingAfter() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_AFTER))
+    {
+        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 (attr.HasParagraphSpacingBefore() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARA_SPACING_BEFORE))
+    {
+        if (currentStyle.HasParagraphSpacingBefore())
+        {
+            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 (attr.HasLineSpacing() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LINE_SPACING))
+    {
+        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 (attr.HasCharacterStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
+    {
+        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 (attr.HasParagraphStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
+    {
+        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 (attr.HasListStyleName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_LIST_STYLE_NAME))
+    {
+        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 (attr.HasBulletStyle() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_STYLE))
+    {
+        if (currentStyle.HasBulletStyle())
+        {
+            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 (attr.HasBulletNumber() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NUMBER))
+    {
+        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());
+    }
+
+    if (attr.HasBulletText() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_TEXT))
+    {
+        if (currentStyle.HasBulletText())
+        {
+            if (currentStyle.GetBulletText() != attr.GetBulletText())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_TEXT);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_TEXT);
+            }
+        }
+        else
+        {
+            currentStyle.SetBulletText(attr.GetBulletText());
+            currentStyle.SetBulletFont(attr.GetBulletFont());
+        }
+    }

 
 

-    wxASSERT(success);
-    wxUnusedVar(success);
+    if (attr.HasBulletName() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_BULLET_NAME))
+    {
+        if (currentStyle.HasBulletName())
+        {
+            if (currentStyle.GetBulletName() != attr.GetBulletName())
+            {
+                // Clash of attr - mark as such
+                clashingAttr.AddFlag(wxTEXT_ATTR_BULLET_NAME);
+                currentStyle.RemoveFlag(wxTEXT_ATTR_BULLET_NAME);
+            }
+        }
+        else
+        {
+            currentStyle.SetBulletName(attr.GetBulletName());
+        }
+    }

 
 

-    if (!image.SaveFile(tempFile, m_imageType))
+    if (attr.HasURL() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_URL))

     {
     {

-        if (wxFileExists(tempFile))
-            wxRemoveFile(tempFile);
-        return false;
+        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());
+        }

     }
 
     }
 

-    wxFile file;
-    if (!file.Open(tempFile))
-        return false;
+    if (attr.HasTextEffects() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_EFFECTS))
+    {
+        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.

 
 

-    m_dataSize = (size_t) file.Length();
-    file.Close();
+            // 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 (m_data)
-        delete[] m_data;
-    m_data = ReadBlock(tempFile, m_dataSize);
+            int currentRelevantTextEffects = currentStyle.GetTextEffects() & attr.GetTextEffectFlags();
+            int newRelevantTextEffects = attr.GetTextEffects() & attr.GetTextEffectFlags();

 
 

-    wxRemoveFile(tempFile);
+            if (currentRelevantTextEffects != newRelevantTextEffects)
+            {
+                // Find the text effects that were different, using XOR
+                int differentEffects = currentRelevantTextEffects ^ newRelevantTextEffects;

 
 

-    return (m_data != NULL);
-}
+                // 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());
+        }

 
 

+        // 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());

 
 

-// Write to a file
-bool wxRichTextImageBlock::Write(const wxString& filename)
-{
-    return WriteBlock(filename, m_data, m_dataSize);
-}
+        if (currentStyle.GetTextEffectFlags() == 0)
+            currentStyle.RemoveFlag(wxTEXT_ATTR_EFFECTS);
+    }

 
 

-void wxRichTextImageBlock::Copy(const wxRichTextImageBlock& block)
-{
-    m_imageType = block.m_imageType;
-    if (m_data)
+    if (attr.HasOutlineLevel() && !wxHasStyle(forbiddenFlags, wxTEXT_ATTR_OUTLINE_LEVEL))

     {
     {

-        delete[] m_data;
-        m_data = NULL;
+        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());

     }
     }

-    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];

 }
 
 }
 

-//// Operators
-void wxRichTextImageBlock::operator=(const wxRichTextImageBlock& block)
-{
-    Copy(block);
-}
+WX_DEFINE_OBJARRAY(wxRichTextVariantArray);

 
 

-// Load a wxImage from the block
-bool wxRichTextImageBlock::Load(wxImage& image)
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextProperties, wxObject)
+
+bool wxRichTextProperties::operator==(const wxRichTextProperties& props) const

 {
 {

-    if (!m_data)
+    if (m_properties.GetCount() != props.GetCount())

         return false;
 
         return false;
 

-    // 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);
-
-    if (!WriteBlock(tempFile, m_data, m_dataSize))
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)

     {
     {

-        return false;
+        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;

     }
     }

-    success = image.LoadFile(tempFile, GetImageType());
-    wxRemoveFile(tempFile);
-#endif

 
 

-    return success;
+    return true;

 }
 
 }
 

-// Write data in hex to a stream
-bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
+wxArrayString wxRichTextProperties::GetPropertyNames() const

 {
 {

-    wxString hex;
-    int i;
-    for (i = 0; i < (int) m_dataSize; i++)
+    wxArrayString arr;
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)

     {
     {

-        hex = wxDecToHex(m_data[i]);
-        wxCharBuffer buf = hex.ToAscii();
-
-        stream.Write((const char*) buf, hex.length());
+        arr.Add(m_properties[i].GetName());

     }
     }

-
-    return true;
+    return arr;

 }
 
 }
 

-// Read data in hex from a stream
-bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType)
+int wxRichTextProperties::Find(const wxString& name) const

 {
 {

-    int dataSize = length/2;
-
-    if (m_data)
-        delete[] m_data;
-
-    wxString str(wxT("  "));
-    m_data = new unsigned char[dataSize];
-    int i;
-    for (i = 0; i < dataSize; i ++)
+    size_t i;
+    for (i = 0; i < m_properties.GetCount(); i++)

     {
     {

-        str[0] = stream.GetC();
-        str[1] = stream.GetC();
-
-        m_data[i] = (unsigned char)wxHexToDec(str);
+        if (m_properties[i].GetName() == name)
+            return (int) i;

     }
     }

-
-    m_dataSize = dataSize;
-    m_imageType = imageType;
-
-    return true;
+    return -1;

 }
 
 }
 

-// Allocate and read from stream as a block of memory
-unsigned char* wxRichTextImageBlock::ReadBlock(wxInputStream& stream, size_t size)
+wxVariant* wxRichTextProperties::FindOrCreateProperty(const wxString& name)

 {
 {

-    unsigned char* block = new unsigned char[size];
-    if (!block)
+    int idx = Find(name);
+    if (idx == wxNOT_FOUND)
+        SetProperty(name, wxString());
+    idx = Find(name);
+    if (idx != wxNOT_FOUND)
+    {
+        return & (*this)[idx];
+    }
+    else

         return NULL;
         return NULL;

-
-    stream.Read(block, size);
-
-    return block;

 }
 
 }
 

-unsigned char* wxRichTextImageBlock::ReadBlock(const wxString& filename, size_t size)
+const wxVariant& wxRichTextProperties::GetProperty(const wxString& name) const

 {
 {

-    wxFileInputStream stream(filename);
-    if (!stream.Ok())
-        return NULL;
-
-    return ReadBlock(stream, size);
+    static const wxVariant nullVariant;
+    int idx = Find(name);
+    if (idx != -1)
+        return m_properties[idx];
+    else
+        return nullVariant;

 }
 
 }
 

-// Write memory block to stream
-bool wxRichTextImageBlock::WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size)
+wxString wxRichTextProperties::GetPropertyString(const wxString& name) const

 {
 {

-    stream.Write((void*) block, size);
-    return stream.IsOk();
-
+    return GetProperty(name).GetString();

 }
 
 }
 

-// Write memory block to file
-bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* block, size_t size)
+long wxRichTextProperties::GetPropertyLong(const wxString& name) const

 {
 {

-    wxFileOutputStream outStream(filename);
-    if (!outStream.Ok())
-        return false;
-
-    return WriteBlock(outStream, block, size);
+    return GetProperty(name).GetLong();

 }
 
 }
 

-// Gets the extension for the block's type
-wxString wxRichTextImageBlock::GetExtension() const
+bool wxRichTextProperties::GetPropertyBool(const wxString& name) const

 {
 {

-    wxImageHandler* handler = wxImage::FindHandler(GetImageType());
-    if (handler)
-        return handler->GetExtension();
-    else
-        return wxEmptyString;
+    return GetProperty(name).GetBool();

 }
 
 }
 

-#if wxUSE_DATAOBJ
-
-/*!
- * The data object for a wxRichTextBuffer
- */
-
-const wxChar *wxRichTextBufferDataObject::ms_richTextBufferFormatId = wxT("wxShape");
-
-wxRichTextBufferDataObject::wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer)
+double wxRichTextProperties::GetPropertyDouble(const wxString& name) const

 {
 {

-    m_richTextBuffer = richTextBuffer;
-
-    // this string should uniquely identify our format, but is otherwise
-    // arbitrary
-    m_formatRichTextBuffer.SetId(GetRichTextBufferFormatId());
-
-    SetFormat(m_formatRichTextBuffer);
+    return GetProperty(name).GetDouble();

 }
 
 }
 

-wxRichTextBufferDataObject::~wxRichTextBufferDataObject()
+void wxRichTextProperties::SetProperty(const wxVariant& variant)

 {
 {

-    delete m_richTextBuffer;
+    wxASSERT(!variant.GetName().IsEmpty());
+
+    int idx = Find(variant.GetName());
+
+    if (idx == -1)
+        m_properties.Add(variant);
+    else
+        m_properties[idx] = variant;

 }
 
 }
 

-// after a call to this function, the richTextBuffer is owned by the caller and it
-// is responsible for deleting it!
-wxRichTextBuffer* wxRichTextBufferDataObject::GetRichTextBuffer()
+void wxRichTextProperties::SetProperty(const wxString& name, const wxVariant& variant)

 {
 {

-    wxRichTextBuffer* richTextBuffer = m_richTextBuffer;
-    m_richTextBuffer = NULL;
+    int idx = Find(name);
+    wxVariant var(variant);
+    var.SetName(name);

 
 

-    return richTextBuffer;
+    if (idx == -1)
+        m_properties.Add(var);
+    else
+        m_properties[idx] = var;

 }
 
 }
 

-wxDataFormat wxRichTextBufferDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
+void wxRichTextProperties::SetProperty(const wxString& name, const wxString& value)

 {
 {

-    return m_formatRichTextBuffer;
+    SetProperty(name, wxVariant(value, name));

 }
 
 }
 

-size_t wxRichTextBufferDataObject::GetDataSize() const
+void wxRichTextProperties::SetProperty(const wxString& name, long value)

 {
 {

-    if (!m_richTextBuffer)
-        return 0;
-
-    wxString bufXML;
-
-    {
-        wxStringOutputStream stream(& bufXML);
-        if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML))
-        {
-            wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler."));
-            return 0;
-        }
-    }
-
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
-    return strlen(buffer) + 1;
-#else
-    return bufXML.Length()+1;
-#endif
+    SetProperty(name, wxVariant(value, name));

 }
 
 }
 

-bool wxRichTextBufferDataObject::GetDataHere(void *pBuf) const
+void wxRichTextProperties::SetProperty(const wxString& name, double value)

 {
 {

-    if (!pBuf || !m_richTextBuffer)
-        return false;
-
-    wxString bufXML;
-
-    {
-        wxStringOutputStream stream(& bufXML);
-        if (!m_richTextBuffer->SaveFile(stream, wxRICHTEXT_TYPE_XML))
-        {
-            wxLogError(wxT("Could not write the buffer to an XML stream.\nYou may have forgotten to add the XML file handler."));
-            return 0;
-        }
-    }
-
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = bufXML.mb_str(wxConvUTF8);
-    size_t len = strlen(buffer);
-    memcpy((char*) pBuf, (const char*) buffer, len);
-    ((char*) pBuf)[len] = 0;
-#else
-    size_t len = bufXML.Length();
-    memcpy((char*) pBuf, (const char*) bufXML.c_str(), len);
-    ((char*) pBuf)[len] = 0;
-#endif
-
-    return true;
+    SetProperty(name, wxVariant(value, name));

 }
 
 }
 

-bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+void wxRichTextProperties::SetProperty(const wxString& name, bool value)

 {
 {

-    delete m_richTextBuffer;
-    m_richTextBuffer = NULL;
-
-    wxString bufXML((const char*) buf, wxConvUTF8);
-
-    m_richTextBuffer = new wxRichTextBuffer;
-
-    wxStringInputStream stream(bufXML);
-    if (!m_richTextBuffer->LoadFile(stream, wxRICHTEXT_TYPE_XML))
-    {
-        wxLogError(wxT("Could not read the buffer from an XML stream.\nYou may have forgotten to add the XML file handler."));
-
-        delete m_richTextBuffer;
-        m_richTextBuffer = NULL;
-
-        return false;
-    }
-    return true;
+    SetProperty(name, wxVariant(value, name));

 }
 
 }
 

-#endif
-    // wxUSE_DATAOBJ
-

 #endif
     // wxUSE_RICHTEXT
 #endif
     // wxUSE_RICHTEXT