]> git.saurik.com Git - wxWidgets.git/blobdiff - src/richtext/richtextbuffer.cpp
compilation fix for !wxUSE_MIMETYPE
[wxWidgets.git] / src / richtext / richtextbuffer.cpp
index 0921ba0ff1a6007f22d410a54d970ba7ff925123..39129eb982fc68f8ef6e92458874950d0beb2f04 100644 (file)
@@ -103,11 +103,21 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin
     m_bottomMargin = bottomMargin;
 }
 
-// Convert units in tends of a millimetre to device units
+// Convert units in tenths of a millimetre to device units
 int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units)
 {
-    int ppi = dc.GetPPI().x;
+    int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units);
 
+    // Unscale
+    wxRichTextBuffer* buffer = GetBuffer();
+    if (buffer)
+        p = (int) ((double)p / buffer->GetScale());
+    return p;
+}
+
+// Convert units in tenths of a millimetre to device units
+int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units)
+{
     // There are ppi pixels in 254.1 "1/10 mm"
 
     double pixels = ((double) units * (double)ppi) / 254.1;
@@ -123,6 +133,14 @@ void wxRichTextObject::Dump(wxTextOutputStream& stream)
     stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n");
 }
 
+/// Gets the containing buffer
+wxRichTextBuffer* wxRichTextObject::GetBuffer() const
+{
+    const wxRichTextObject* obj = this;
+    while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer)))
+        obj = obj->GetParent();
+    return wxDynamicCast(obj, wxRichTextBuffer);
+}
 
 /*!
  * wxRichTextCompositeObject
@@ -508,12 +526,12 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range,
         {
             wxRect childRect(child->GetPosition(), child->GetCachedSize());
 
-            if (childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop())
+            if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop())
             {
                 // Skip
             }
             else
-                child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style);
+                child->Draw(dc, range, selectionRange, childRect, descent, style);
         }
 
         node = node->GetNext();
@@ -528,7 +546,10 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl
     bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
 
     // If only laying out a specific area, the passed rect has a different meaning:
-    // the visible part of the buffer.
+    // the visible part of the buffer. This is used in wxRichTextCtrl::OnSize,
+    // so that during a size, only the visible part will be relaid out, or
+    // it would take too long causing flicker. As an approximation, we assume that
+    // everything up to the start of the visible area is laid out correctly.
     if (formatRect)
     {
         availableSpace = wxRect(0 + m_leftMargin,
@@ -932,7 +953,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
     size_t i = 0;
     size_t len = text.length();
     wxString line;
-    wxRichTextParagraph* para = new wxRichTextParagraph(wxT(""), this, & style);
+    wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, & style);
     if (paraStyle)
         para->SetAttributes(*paraStyle);
 
@@ -949,7 +970,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
             wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
             plainText->SetText(line);
 
-            para = new wxRichTextParagraph(wxT(""), this, & style);
+            para = new wxRichTextParagraph(wxEmptyString, this, & style);
             if (paraStyle)
                 para->SetAttributes(*paraStyle);
 
@@ -2108,6 +2129,21 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             currentStyle.SetParagraphStyleName(style.GetParagraphStyleName());
     }
 
+    if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME))
+    {
+        if (currentStyle.HasListStyleName())
+        {
+            if (currentStyle.HasListStyleName() != style.HasListStyleName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_LIST_STYLE_NAME);
+            }
+        }
+        else
+            currentStyle.SetListStyleName(style.GetListStyleName());
+    }
+
     if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE))
     {
         if (currentStyle.HasBulletStyle())
@@ -2138,24 +2174,58 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             currentStyle.SetBulletNumber(style.GetBulletNumber());
     }
 
-    if (style.HasBulletSymbol() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_SYMBOL))
+    if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT))
     {
-        if (currentStyle.HasBulletSymbol())
+        if (currentStyle.HasBulletText())
         {
-            if (currentStyle.HasBulletSymbol() != style.HasBulletSymbol())
+            if (currentStyle.HasBulletText() != style.HasBulletText())
             {
                 // Clash of style - mark as such
-                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_SYMBOL;
-                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_SYMBOL);
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT);
             }
         }
         else
         {
-            currentStyle.SetBulletSymbol(style.GetBulletSymbol());
+            currentStyle.SetBulletText(style.GetBulletText());
             currentStyle.SetBulletFont(style.GetBulletFont());
         }
     }
 
+    if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME))
+    {
+        if (currentStyle.HasBulletName())
+        {
+            if (currentStyle.HasBulletName() != style.HasBulletName())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME);
+            }
+        }
+        else
+        {
+            currentStyle.SetBulletName(style.GetBulletName());
+        }
+    }
+
+    if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL))
+    {
+        if (currentStyle.HasURL())
+        {
+            if (currentStyle.HasURL() != style.HasURL())
+            {
+                // Clash of style - mark as such
+                multipleStyleAttributes |= wxTEXT_ATTR_URL;
+                currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL);
+            }
+        }
+        else
+        {
+            currentStyle.SetURL(style.GetURL());
+        }
+    }
+
     return true;
 }
 
@@ -2350,6 +2420,8 @@ void wxRichTextParagraphLayoutBox::Reset()
     Clear();
 
     AddParagraph(wxEmptyString);
+    
+    Invalidate(wxRICHTEXT_ALL);
 }
 
 /// Invalidate the buffer. With no argument, invalidates whole buffer.
@@ -2410,7 +2482,57 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
 
         if (para)
         {
-            if (!para->GetAttributes().GetParagraphStyleName().IsEmpty())
+            // Combine paragraph and list styles. If there is a list style in the original attributes,
+            // the current indentation overrides anything else and is used to find the item indentation.
+            // Also, for applying paragraph styles, consider having 2 modes: (1) we merge with what we have,
+            // thereby taking into account all user changes, (2) reset the style completely (except for indentation/list
+            // exception as above).
+            // Problem: when changing from one list style to another, there's a danger that the level info will get lost.
+            // So when changing a list style interactively, could retrieve level based on current style, then
+            // set appropriate indent and apply new style.
+
+            if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                int currentIndent = para->GetAttributes().GetLeftIndent();
+
+                wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+                if (paraDef && !listDef)
+                {
+                    para->GetAttributes() = paraDef->GetStyle();
+                    foundCount ++;
+                }
+                else if (listDef && !paraDef)
+                {
+                    // Set overall style defined for the list style definition
+                    para->GetAttributes() = listDef->GetStyle();
+
+                    // Apply the style for this level
+                    wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+                    foundCount ++;
+                }
+                else if (listDef && paraDef)
+                {
+                    // Combines overall list style, style for level, and paragraph style
+                    para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyle());
+                    foundCount ++;
+                }
+            }
+            else if (para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
+            {
+                int currentIndent = para->GetAttributes().GetLeftIndent();
+
+                wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
+
+                // Overall list definition style
+                para->GetAttributes() = listDef->GetStyle();
+
+                // Style for this level
+                wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
+
+                foundCount ++;
+            }
+            else if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && para->GetAttributes().GetListStyleName().IsEmpty())
             {
                 wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
                 if (def)
@@ -2426,6 +2548,421 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
     return foundCount != 0;
 }
 
+/// Set list style
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+    bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
+    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
+
+    // Current number, if numbering
+    int n = startFrom;
+
+    wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
+
+    bool haveControl = (GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Change List Style"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+    }
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para && para->GetChildCount() > 0)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
+
+            if (!para->GetRange().IsOutside(range))
+            {
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
+
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
+
+                if (def)
+                {
+                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
+                    int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent);
+
+                    // How is numbering going to work?
+                    // If we are renumbering, or numbering for the first time, we need to keep
+                    // track of the number for each level. But we might be simply applying a different
+                    // list style.
+                    // In Word, applying a style to several paragraphs, even if at different levels,
+                    // reverts the level back to the same one. So we could do the same here.
+                    // Renumbering will need to be done when we promote/demote a paragraph.
+
+                    // Apply the overall list style, and item style for this level
+                    wxTextAttrEx listStyle(def->GetCombinedStyleForLevel(thisLevel));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+
+                    // Now we need to do numbering
+                    if (renumber)
+                    {
+                        newPara->GetAttributes().SetBulletNumber(n);
+                    }
+
+                    n ++;
+                }
+                else if (!newPara->GetAttributes().GetListStyleName().IsEmpty())
+                {
+                    // if def is NULL, remove list style, applying any associated paragraph style
+                    // to restore the attributes
+
+                    newPara->GetAttributes().SetListStyleName(wxEmptyString);
+                    newPara->GetAttributes().SetLeftIndent(0, 0);
+                    newPara->GetAttributes().SetBulletText(wxEmptyString);
+
+                    // Eliminate the main list-related attributes
+                    newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_TEXT & wxTEXT_ATTR_LIST_STYLE_NAME);
+
+                    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+                    if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty())
+                    {
+                        wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName());
+                        if (def)
+                        {
+                            newPara->GetAttributes() = def->GetStyle();
+                        }
+                    }
+                }
+            }
+        }
+
+        node = node->GetNext();
+    }
+
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+
+    return true;
+}
+
+bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(defName);
+        if (def)
+            return SetListStyle(range, def, flags, startFrom, specifiedLevel);
+    }
+    return false;
+}
+
+/// Clear list for given range
+bool wxRichTextParagraphLayoutBox::ClearListStyle(const wxRichTextRange& range, int flags)
+{
+    return SetListStyle(range, NULL, flags);
+}
+
+/// Number/renumber any list elements in the given range
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    return DoNumberList(range, range, 0, def, flags, startFrom, specifiedLevel);
+}
+
+/// Number/renumber any list elements in the given range. Also do promotion or demotion of items, if specified
+bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy,
+                                                wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
+{
+    bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
+    // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
+    bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
+
+    bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0);
+
+    // Max number of levels
+    const int maxLevels = 10;
+
+    // The level we're looking at now
+    int currentLevel = -1;
+
+    // The item number for each level
+    int levels[maxLevels];
+    int i;
+
+    // Reset all numbering
+    for (i = 0; i < maxLevels; i++)
+    {
+        if (startFrom != -1)
+            levels[i] = startFrom-1;
+        else if (renumber) // start again
+            levels[i] = 0;
+        else
+            levels[i] = -1; // start from the number we found, if any
+    }
+
+    wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0)));
+
+    // If we are associated with a control, make undoable; otherwise, apply immediately
+    // to the data.
+
+    bool haveControl = (GetRichTextCtrl() != NULL);
+
+    wxRichTextAction* action = NULL;
+
+    if (haveControl && withUndo)
+    {
+        action = new wxRichTextAction(NULL, _("Renumber List"), wxRICHTEXT_CHANGE_STYLE, & GetRichTextCtrl()->GetBuffer(), GetRichTextCtrl());
+        action->SetRange(range);
+        action->SetPosition(GetRichTextCtrl()->GetCaretPosition());
+    }
+
+    wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
+        wxASSERT (para != NULL);
+
+        if (para && para->GetChildCount() > 0)
+        {
+            // Stop searching if we're beyond the range of interest
+            if (para->GetRange().GetStart() > range.GetEnd())
+                break;
+
+            if (!para->GetRange().IsOutside(range))
+            {
+                // We'll be using a copy of the paragraph to make style changes,
+                // not updating the buffer directly.
+                wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL);
+
+                if (haveControl && withUndo)
+                {
+                    newPara = new wxRichTextParagraph(*para);
+                    action->GetNewParagraphs().AppendChild(newPara);
+
+                    // Also store the old ones for Undo
+                    action->GetOldParagraphs().AppendChild(new wxRichTextParagraph(*para));
+                }
+                else
+                    newPara = para;
+
+                wxRichTextListStyleDefinition* defToUse = def;
+                if (!defToUse)
+                {
+                    wxRichTextStyleSheet* sheet = GetStyleSheet();
+
+                    if (sheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
+                        defToUse = sheet->FindListStyle(newPara->GetAttributes().GetListStyleName());
+                }
+
+                if (defToUse)
+                {
+                    int thisIndent = newPara->GetAttributes().GetLeftIndent();
+                    int thisLevel = defToUse->FindLevelForIndent(thisIndent);
+
+                    // If we've specified a level to apply to all, change the level.
+                    if (specifiedLevel != -1)
+                        thisLevel = specifiedLevel;
+
+                    // Do promotion if specified
+                    if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange))
+                    {
+                        thisLevel = thisLevel - promoteBy;
+                        if (thisLevel < 0)
+                            thisLevel = 0;
+                        if (thisLevel > 9)
+                            thisLevel = 9;
+                    }
+
+                    // Apply the overall list style, and item style for this level
+                    wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel));
+                    wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
+
+                    // OK, we've (re)applied the style, now let's get the numbering right.
+
+                    if (currentLevel == -1)
+                        currentLevel = thisLevel;
+
+                    // Same level as before, do nothing except increment level's number afterwards
+                    if (currentLevel == thisLevel)
+                    {
+                    }
+                    // A deeper level: start renumbering all levels after current level
+                    else if (thisLevel > currentLevel)
+                    {
+                        for (i = currentLevel+1; i <= thisLevel; i++)
+                        {
+                            levels[i] = 0;
+                        }
+                        currentLevel = thisLevel;
+                    }
+                    else if (thisLevel < currentLevel)
+                    {
+                        currentLevel = thisLevel;
+                    }
+
+                    // Use the current numbering if -1 and we have a bullet number already
+                    if (levels[currentLevel] == -1)
+                    {
+                        if (newPara->GetAttributes().HasBulletNumber())
+                            levels[currentLevel] = newPara->GetAttributes().GetBulletNumber();
+                        else
+                            levels[currentLevel] = 1;
+                    }
+                    else
+                    {
+                        levels[currentLevel] ++;
+                    }
+
+                    newPara->GetAttributes().SetBulletNumber(levels[currentLevel]);
+
+                    // Create the bullet text if an outline list
+                    if (listStyle.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
+                    {
+                        wxString text;
+                        for (i = 0; i <= currentLevel; i++)
+                        {
+                            if (!text.IsEmpty())
+                                text += wxT(".");
+                            text += wxString::Format(wxT("%d"), levels[i]);
+                        }
+                        newPara->GetAttributes().SetBulletText(text);
+                    }
+                }
+            }
+        }
+
+        node = node->GetNext();
+    }
+
+    // Do action, or delay it until end of batch.
+    if (haveControl && withUndo)
+        GetRichTextCtrl()->GetBuffer().SubmitAction(action);
+
+    return true;
+}
+
+bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = GetStyleSheet()->FindListStyle(defName);
+        return NumberList(range, def, flags, startFrom, specifiedLevel);
+    }
+    return false;
+}
+
+/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1
+bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel)
+{
+    // TODO
+    // One strategy is to first work out the range within which renumbering must occur. Then could pass these two ranges
+    // to NumberList with a flag indicating promotion is required within one of the ranges.
+    // Find first and last paragraphs in range. Then for first, calculate new indentation and look back until we find
+    // a paragraph that either has no list style, or has one that is different or whose indentation is less.
+    // We start renumbering from the para after that different para we found. We specify that the numbering of that
+    // list position will start from 1.
+    // Similarly, we look after the last para in the promote range for an indentation that is less (or no list style).
+    // We can end the renumbering at this point.
+
+    // For now, only renumber within the promotion range.
+
+    return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel);
+}
+
+bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = NULL;
+        if (!defName.IsEmpty())
+            def = GetStyleSheet()->FindListStyle(defName);
+        return PromoteList(promoteBy, range, def, flags, specifiedLevel);
+    }
+    return false;
+}
+
+/// Fills in the attributes for numbering a paragraph after previousParagraph. It also finds the
+/// position of the paragraph that it had to start looking from.
+bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const
+{
+#if 0
+    wxRichTextObjectList::compatibility_iterator node = m_children.Find(previousParagraph);
+    
+    if (!node)
+        return false;
+#endif
+    
+    if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
+        return false;
+    
+    wxRichTextStyleSheet* sheet = GetStyleSheet();
+    if (sheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
+    {
+        wxRichTextListStyleDefinition* def = sheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
+        if (def)
+        {
+            // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
+            // int thisLevel = def->FindLevelForIndent(thisIndent);
+            
+            bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0;
+
+            attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME));
+            if (previousParagraph->GetAttributes().HasBulletName())
+                attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName());
+            attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle());
+            attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName());
+            
+            int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1;
+            attr.SetBulletNumber(nextNumber);
+            
+            if (isOutline)
+            {
+                wxString text = previousParagraph->GetAttributes().GetBulletText();
+                if (!text.IsEmpty())
+                {
+                    int pos = text.Find(wxT('.'), true);
+                    if (pos != wxNOT_FOUND)
+                    {
+                        text = text.Mid(0, text.Length() - pos - 1);
+                    }
+                    else
+                        text = wxEmptyString;
+                    if (!text.IsEmpty())
+                        text += wxT(".");
+                    text += wxString::Format(wxT("%d"), nextNumber);
+                    attr.SetBulletText(text);
+                }
+            }
+            
+            return true;
+        }
+        else
+            return false;
+    }
+    else
+        return false;
+}
+
 /*!
  * wxRichTextParagraph
  * This object represents a single paragraph (or in a straight text editor, a line).
@@ -2461,7 +2998,7 @@ wxRichTextParagraph::~wxRichTextParagraph()
 }
 
 /// Draw the item
-bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
+bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
 {
 #if wxRICHTEXT_USE_DYNAMIC_STYLES
     wxTextAttrEx attr = GetCombinedAttributes();
@@ -2477,62 +3014,51 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
             int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
             int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
 
-            if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)
+            wxTextAttrEx bulletAttr(GetCombinedAttributes());
+
+            // Get line height from first line, if any
+            wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
+
+            wxPoint linePos;
+            int lineHeight wxDUMMY_INITIALIZE(0);
+            if (line)
             {
-                // TODO
+                lineHeight = line->GetSize().y;
+                linePos = line->GetPosition() + GetPosition();
             }
             else
             {
-                wxString bulletText = GetBulletText();
-                if (!bulletText.empty())
-                {
-                    // Get the combined font, or if a font is specified for a symbol bullet,
-                    // create the font
-
-                    wxTextAttrEx bulletAttr(GetCombinedAttributes());
-                    wxFont font;
-                    if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && bulletAttr.GetFont().Ok())
-                    {
-                        font = (*wxTheFontList->FindOrCreateFont(bulletAttr.GetFont().GetPointSize(), bulletAttr.GetFont().GetFamily(),
-                                                bulletAttr.GetFont().GetStyle(), bulletAttr.GetFont().GetWeight(), bulletAttr.GetFont().GetUnderlined(),
-                                                attr.GetBulletFont()));
-                    }
-                    else if (bulletAttr.GetFont().Ok())
-                        font = bulletAttr.GetFont();
-                    else
-                        font = (*wxNORMAL_FONT);
-
-                    dc.SetFont(font);
-
-                    if (bulletAttr.GetTextColour().Ok())
-                        dc.SetTextForeground(bulletAttr.GetTextColour());
-
-                    dc.SetBackgroundMode(wxTRANSPARENT);
-
-                    // Get line height from first line, if any
-                    wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL;
+                wxFont font;
+                if (bulletAttr.GetFont().Ok())
+                    font = bulletAttr.GetFont();
+                else
+                    font = (*wxNORMAL_FONT);
 
-                    wxPoint linePos;
-                    int lineHeight wxDUMMY_INITIALIZE(0);
-                    if (line)
-                    {
-                        lineHeight = line->GetSize().y;
-                        linePos = line->GetPosition() + GetPosition();
-                    }
-                    else
-                    {
-                        lineHeight = dc.GetCharHeight();
-                        linePos = GetPosition();
-                        linePos.y += spaceBeforePara;
-                    }
+                dc.SetFont(font);
 
-                    int charHeight = dc.GetCharHeight();
+                lineHeight = dc.GetCharHeight();
+                linePos = GetPosition();
+                linePos.y += spaceBeforePara;
+            }
 
-                    int x = GetPosition().x + leftIndent;
-                    int y = linePos.y + (lineHeight - charHeight);
+            wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight);
 
-                    dc.DrawText(bulletText, x, y);
-                }
+            if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP)
+            {
+                if (wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect);
+            }
+            else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)                
+            {                
+                if (wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect);
+            }
+            else
+            {
+                wxString bulletText = GetBulletText();
+                
+                if (!bulletText.empty() && wxRichTextBuffer::GetRenderer())
+                    wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText);
             }
         }
     }
@@ -2557,7 +3083,8 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range),
         while (node2)
         {
             wxRichTextObject* child = node2->GetData();
-            if (!child->GetRange().IsOutside(lineRange))
+            
+            if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
             {
                 // Draw this part of the line at the correct position
                 wxRichTextRange objectRange(child->GetRange());
@@ -2825,7 +3352,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wx
         }
         else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
         {
-            pos.x = rect.GetRight() - size.x;
+            pos.x = pos.x + rect.GetWidth() - size.x;
             line->SetPosition(pos);
         }
 
@@ -3376,7 +3903,7 @@ wxString wxRichTextParagraph::GetBulletText()
     int number = GetAttributes().GetBulletNumber();
 
     wxString text;
-    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC)
+    if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE))
     {
         text.Printf(wxT("%d"), number);
     }
@@ -3401,13 +3928,28 @@ wxString wxRichTextParagraph::GetBulletText()
     }
     else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
     {
-        text = GetAttributes().GetBulletSymbol();
+        text = GetAttributes().GetBulletText();
+    }
+    
+    if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)
+    {
+        // The outline style relies on the text being computed statically,
+        // since it depends on other levels points (e.g. 1.2.1.1). So normally the bullet text
+        // should be stored in the attributes; if not, just use the number for this
+        // level, as previously computed.
+        if (!GetAttributes().GetBulletText().IsEmpty())
+            text = GetAttributes().GetBulletText();
     }
 
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES)
     {
         text = wxT("(") + text + wxT(")");
     }
+    else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS)
+    {
+        text = text + wxT(")");
+    }
+
     if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD)
     {
         text += wxT(".");
@@ -3627,12 +4169,12 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 // Compensate for kerning difference
                 wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1));
                 wxString stringFragment3(m_text.Mid(r1 - offset + fragmentLen, 1));
-                
+
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);
                 dc.GetTextExtent(stringFragment2, & w2, & h2);
                 dc.GetTextExtent(stringFragment3, & w3, & h3);
-                
+
                 int kerningDiff = (w1 + w3) - w2;
                 x = x - kerningDiff;
             }
@@ -3658,12 +4200,12 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
                 // Compensate for kerning difference
                 wxString stringFragment2(m_text.Mid(s1 - offset, fragmentLen+1));
                 wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1));
-                
+
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);
                 dc.GetTextExtent(stringFragment2, & w2, & h2);
                 dc.GetTextExtent(stringFragment3, & w3, & h3);
-                
+
                 int kerningDiff = (w1 + w3) - w2;
                 x = x - kerningDiff;
             }
@@ -3840,14 +4382,14 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
             tabArray = textAttr.GetTabs();
 
         int tabCount = tabArray.GetCount();
-        
+
         for (int i = 0; i < tabCount; ++i)
         {
             int pos = tabArray[i];
             pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos);
             tabArray[i] = pos;
         }
-        
+
         int nextTabPos = -1;
 
         while (stringChunk.Find(wxT('\t')) >= 0)
@@ -3977,7 +4519,10 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox)
 
-wxList wxRichTextBuffer::sm_handlers;
+wxList                  wxRichTextBuffer::sm_handlers;
+wxRichTextRenderer*     wxRichTextBuffer::sm_renderer = NULL;
+int                     wxRichTextBuffer::sm_bulletRightMargin = 20;
+float                   wxRichTextBuffer::sm_bulletProportion = (float) 0.3;
 
 /// Initialisation
 void wxRichTextBuffer::Init()
@@ -3988,6 +4533,8 @@ void wxRichTextBuffer::Init()
     m_batchedCommandDepth = 0;
     m_batchedCommand = NULL;
     m_suppressUndo = 0;
+    m_handlerFlags = 0;
+    m_scale = 1.0;
 }
 
 /// Initialisation
@@ -3997,21 +4544,15 @@ wxRichTextBuffer::~wxRichTextBuffer()
     delete m_batchedCommand;
 
     ClearStyleStack();
+    ClearEventHandlers();
 }
 
-void wxRichTextBuffer::Clear()
+void wxRichTextBuffer::ResetAndClearCommands()
 {
-    DeleteChildren();
+    Reset();
+    
     GetCommandProcessor()->ClearCommands();
-    Modify(false);
-    Invalidate(wxRICHTEXT_ALL);
-}
 
-void wxRichTextBuffer::Reset()
-{
-    DeleteChildren();
-    AddParagraph(wxEmptyString);
-    GetCommandProcessor()->ClearCommands();
     Modify(false);
     Invalidate(wxRICHTEXT_ALL);
 }
@@ -4020,11 +4561,37 @@ void wxRichTextBuffer::Copy(const wxRichTextBuffer& obj)
 {
     wxRichTextParagraphLayoutBox::Copy(obj);
 
-    m_styleSheet = obj.m_styleSheet;
-    m_modified = obj.m_modified;
-    m_batchedCommandDepth = obj.m_batchedCommandDepth;
-    m_batchedCommand = obj.m_batchedCommand;
-    m_suppressUndo = obj.m_suppressUndo;
+    m_styleSheet = obj.m_styleSheet;
+    m_modified = obj.m_modified;
+    m_batchedCommandDepth = obj.m_batchedCommandDepth;
+    m_batchedCommand = obj.m_batchedCommand;
+    m_suppressUndo = obj.m_suppressUndo;
+}
+
+/// Push style sheet to top of stack
+bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet)
+{
+    if (m_styleSheet)
+        styleSheet->InsertSheet(m_styleSheet);
+
+    SetStyleSheet(styleSheet);
+
+    return true;
+}
+
+/// Pop style sheet from top of stack
+wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet()
+{
+    if (m_styleSheet)
+    {
+        wxRichTextStyleSheet* oldSheet = m_styleSheet;
+        m_styleSheet = oldSheet->GetNextSheet();
+        oldSheet->Unlink();
+
+        return oldSheet;
+    }
+    else
+        return NULL;
 }
 
 /// Submit command to insert paragraphs
@@ -4201,24 +4768,52 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
     wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
     if (para)
     {
+        wxRichTextAttr attr;
+        bool foundAttributes = false;
+        
+        // Look for a matching paragraph style
         if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet())
         {
             wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
-            if (paraDef && !paraDef->GetNextStyle().IsEmpty())
+            if (paraDef)
             {
-                wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
-                if (nextParaDef)
-                    return nextParaDef->GetStyle();
+                if (!paraDef->GetNextStyle().IsEmpty())
+                {
+                    wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
+                    if (nextParaDef)
+                    {
+                        foundAttributes = true;
+                        attr = nextParaDef->GetStyle();
+                    }
+                }
+                
+                // If we didn't find the 'next style', use this style instead.
+                if (!foundAttributes)
+                {
+                    foundAttributes = true;
+                    attr = paraDef->GetStyle();
+                }
             }
         }
-        wxRichTextAttr attr(para->GetAttributes());
-        int flags = attr.GetFlags();
+        if (!foundAttributes)
+        {
+            attr = para->GetAttributes();
+            int flags = attr.GetFlags();
 
-        // Eliminate character styles
-        flags &= ( (~ wxTEXT_ATTR_FONT) |
+            // Eliminate character styles
+            flags &= ( (~ wxTEXT_ATTR_FONT) |
                     (~ wxTEXT_ATTR_TEXT_COLOUR) |
                     (~ wxTEXT_ATTR_BACKGROUND_COLOUR) );
-        attr.SetFlags(flags);
+            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;
     }
@@ -4514,7 +5109,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
 bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
 {
     wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetBulletNumber(bulletNumber);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
@@ -4523,13 +5118,25 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int
 }
 
 /// Begin symbol bullet
-bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle)
+bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)
+{
+    wxTextAttrEx attr;
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetBulletStyle(bulletStyle);
+    attr.SetLeftIndent(leftIndent, leftSubIndent);
+    attr.SetBulletText(symbol);
+
+    return BeginStyle(attr);
+}
+
+/// Begin standard bullet
+bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
 {
     wxTextAttrEx attr;
-    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT);
+    attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
     attr.SetBulletStyle(bulletStyle);
     attr.SetLeftIndent(leftIndent, leftSubIndent);
-    attr.SetBulletSymbol(symbol);
+    attr.SetBulletName(bulletName);
 
     return BeginStyle(attr);
 }
@@ -4566,6 +5173,42 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle)
     return false;
 }
 
+/// Begin named list style
+bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number)
+{
+    if (GetStyleSheet())
+    {
+        wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
+        if (def)
+        {
+            wxTextAttrEx attr(def->GetCombinedStyleForLevel(level));
+
+            attr.SetBulletNumber(number);
+
+            return BeginStyle(attr);
+        }
+    }
+    return false;
+}
+
+/// Begin URL
+bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
+{
+    wxTextAttrEx attr;
+
+    if (!characterStyle.IsEmpty() && GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
+        if (def)
+        {
+            def->GetStyle().CopyTo(attr);
+        }
+    }
+    attr.SetURL(url);
+
+    return BeginStyle(attr);
+}
+
 /// Adds a handler to the end
 void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler)
 {
@@ -4722,7 +5365,7 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
     if (handler)
     {
         SetDefaultStyle(wxTextAttrEx());
-
+        handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, filename);
         Invalidate(wxRICHTEXT_ALL);
         return success;
@@ -4736,7 +5379,10 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
 {
     wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
     if (handler)
+    {
+        handler->SetFlags(GetHandlerFlags());
         return handler->SaveFile(this, filename);
+    }
     else
         return false;
 }
@@ -4748,6 +5394,7 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
     if (handler)
     {
         SetDefaultStyle(wxTextAttrEx());
+        handler->SetFlags(GetHandlerFlags());
         bool success = handler->LoadFile(this, stream);
         Invalidate(wxRICHTEXT_ALL);
         return success;
@@ -4761,7 +5408,10 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
 {
     wxRichTextFileHandler* handler = FindHandler(type);
     if (handler)
+    {
+        handler->SetFlags(GetHandlerFlags());
         return handler->SaveFile(this, stream);
+    }
     else
         return false;
 }
@@ -4907,6 +5557,234 @@ void wxRichTextBuffer::Dump()
     wxLogDebug(text);
 }
 
+/// Add an event handler
+bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler)
+{
+    m_eventHandlers.Append(handler);
+    return true;
+}
+
+/// Remove an event handler
+bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler)
+{
+    wxList::compatibility_iterator node = m_eventHandlers.Find(handler);
+    if (node)
+    {
+        m_eventHandlers.Erase(node);
+        if (deleteHandler)
+            delete handler;
+        
+        return true;
+    }
+    else
+        return false;
+}
+
+/// Clear event handlers
+void wxRichTextBuffer::ClearEventHandlers()
+{
+    m_eventHandlers.Clear();
+}
+
+/// Send event to event handlers. If sendToAll is true, will send to all event handlers,
+/// otherwise will stop at the first successful one.
+bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll)
+{
+    bool success = false;
+    for (wxList::compatibility_iterator node = m_eventHandlers.GetFirst(); node; node = node->GetNext())
+    {
+        wxEvtHandler* handler = (wxEvtHandler*) node->GetData();
+        if (handler->ProcessEvent(event))
+        {
+            success = true;
+            if (!sendToAll)
+                return true;
+        }
+    }
+    return success;
+}
+
+/// Set style sheet and notify of the change
+bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet)
+{
+    wxRichTextStyleSheet* oldSheet = GetStyleSheet();
+    
+    wxWindowID id = wxID_ANY;
+    if (GetRichTextCtrl())
+        id = GetRichTextCtrl()->GetId();
+    
+    wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id);
+    event.SetEventObject(GetRichTextCtrl());
+    event.SetOldStyleSheet(oldSheet);
+    event.SetNewStyleSheet(sheet);
+    event.Allow();
+    
+    if (SendEvent(event) && !event.IsAllowed())
+    {
+        if (sheet != oldSheet)
+            delete sheet;
+
+        return false;
+    }
+
+    if (oldSheet && oldSheet != sheet)
+        delete oldSheet;
+
+    SetStyleSheet(sheet);
+
+    event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED);
+    event.SetOldStyleSheet(NULL);
+    event.Allow();
+
+    return SendEvent(event);
+}
+
+/// Set renderer, deleting old one
+void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer)
+{
+    if (sm_renderer)
+        delete sm_renderer;
+    sm_renderer = renderer;
+}
+
+bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect)
+{
+    if (bulletAttr.GetTextColour().Ok())
+    {
+        dc.SetPen(wxPen(bulletAttr.GetTextColour()));
+        dc.SetBrush(wxBrush(bulletAttr.GetTextColour()));
+    }
+    else
+    {
+        dc.SetPen(*wxBLACK_PEN);
+        dc.SetBrush(*wxBLACK_BRUSH);
+    }
+
+    wxFont font;
+    if (bulletAttr.GetFont().Ok())
+        font = bulletAttr.GetFont();
+    else
+        font = (*wxNORMAL_FONT);
+
+    dc.SetFont(font);
+
+    int charHeight = dc.GetCharHeight();
+                
+    int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion());
+    int bulletHeight = bulletWidth;
+
+    int x = rect.x;
+    
+    // Calculate the top position of the character (as opposed to the whole line height)
+    int y = rect.y + (rect.height - charHeight);
+    
+    // Calculate where the bullet should be positioned
+    y = y + (charHeight+1)/2 - (bulletHeight+1)/2;
+                
+    // The margin between a bullet and text.
+    int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
+                
+    if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
+        x = rect.x + rect.width - bulletWidth - margin;
+    else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
+        x = x + (rect.width)/2 - bulletWidth/2;
+                
+    if (bulletAttr.GetBulletName() == wxT("standard/square"))
+    {
+        dc.DrawRectangle(x, y, bulletWidth, bulletHeight);
+    }
+    else if (bulletAttr.GetBulletName() == wxT("standard/diamond"))
+    {
+        wxPoint pts[5];
+        pts[0].x = x;                   pts[0].y = y + bulletHeight/2;
+        pts[1].x = x + bulletWidth/2;   pts[1].y = y;
+        pts[2].x = x + bulletWidth;     pts[2].y = y + bulletHeight/2;
+        pts[3].x = x + bulletWidth/2;   pts[3].y = y + bulletHeight;
+                    
+        dc.DrawPolygon(4, pts);
+    }
+    else if (bulletAttr.GetBulletName() == wxT("standard/triangle"))
+    {
+        wxPoint pts[3];
+        pts[0].x = x;                   pts[0].y = y;
+        pts[1].x = x + bulletWidth;     pts[1].y = y + bulletHeight/2;
+        pts[2].x = x;                   pts[2].y = y + bulletHeight;
+                    
+        dc.DrawPolygon(3, pts);
+    }
+    else // "standard/circle", and catch-all
+    {
+        dc.DrawEllipse(x, y, bulletWidth, bulletHeight);
+    }                
+    return true;
+}
+
+bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect, const wxString& text)
+{
+    if (!text.empty())
+    {
+        wxFont font;
+        if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.GetFont().Ok())
+        {
+            font = (*wxTheFontList->FindOrCreateFont(attr.GetFont().GetPointSize(), attr.GetFont().GetFamily(),
+                        attr.GetFont().GetStyle(), attr.GetFont().GetWeight(), attr.GetFont().GetUnderlined(),
+                        attr.GetBulletFont()));
+        }
+        else if (attr.GetFont().Ok())
+            font = attr.GetFont();
+        else
+            font = (*wxNORMAL_FONT);
+
+        dc.SetFont(font);
+
+        if (attr.GetTextColour().Ok())
+            dc.SetTextForeground(attr.GetTextColour());
+
+        dc.SetBackgroundMode(wxTRANSPARENT);
+
+        int charHeight = dc.GetCharHeight();
+        wxCoord tw, th;
+        dc.GetTextExtent(text, & tw, & th);
+
+        int x = rect.x;
+
+        // Calculate the top position of the character (as opposed to the whole line height)
+        int y = rect.y + (rect.height - charHeight);    
+
+        // The margin between a bullet and text.
+        int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin());
+                
+        if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT)
+            x = (rect.x + rect.width) - tw - margin;
+        else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE)
+            x = x + (rect.width)/2 - tw/2;
+
+        dc.DrawText(text, x, y);
+        
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect))
+{
+    // Currently unimplemented. The intention is to store bitmaps by name in a media store associated
+    // with the buffer. The store will allow retrieval from memory, disk or other means.
+    return false;
+}
+
+/// Enumerate the standard bullet names currently supported
+bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames)
+{
+    bulletNames.Add(wxT("standard/circle"));
+    bulletNames.Add(wxT("standard/square"));
+    bulletNames.Add(wxT("standard/diamond"));
+    bulletNames.Add(wxT("standard/triangle"));
+
+    return true;
+}
 
 /*
  * Module to initialise and clean up handlers
@@ -4919,6 +5797,7 @@ public:
     wxRichTextModule() {}
     bool OnInit()
     {
+        wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer);
         wxRichTextBuffer::InitStandardHandlers();
         wxRichTextParagraph::InitDefaultTabs();
         return true;
@@ -4928,12 +5807,25 @@ public:
         wxRichTextBuffer::CleanUpHandlers();
         wxRichTextDecimalToRoman(-1);
         wxRichTextParagraph::ClearDefaultTabs();
+        wxRichTextCtrl::ClearAvailableFontNames();
+        wxRichTextBuffer::SetRenderer(NULL);
     };
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
 
 
+// If the richtext lib is dynamically loaded after the app has already started
+// (such as from wxPython) then the built-in module system will not init this
+// module.  Provide this function to do it manually.
+void wxRichTextModuleInit()
+{
+    wxModule* module = new wxRichTextModule;
+    module->Init();
+    wxModule::RegisterModule(module);
+}
+
+
 /*!
  * Commands for undo/redo
  *
@@ -5293,24 +6185,7 @@ void wxRichTextImage::Copy(const wxRichTextImage& obj)
 /// Compare two attribute objects
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
 {
-    return (
-        attr1.GetTextColour() == attr2.GetTextColour() &&
-        attr1.GetBackgroundColour() == attr2.GetBackgroundColour() &&
-        attr1.GetFont() == attr2.GetFont() &&
-        attr1.GetAlignment() == attr2.GetAlignment() &&
-        attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
-        attr1.GetRightIndent() == attr2.GetRightIndent() &&
-        attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&
-        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.GetBulletSymbol() == attr2.GetBulletSymbol() &&
-        attr1.GetBulletFont() == attr2.GetBulletFont() &&
-        attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
-        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName());
+    return (attr1 == attr2);
 }
 
 bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
@@ -5333,10 +6208,12 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
         attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() &&
         attr1.GetBulletStyle() == attr2.GetBulletStyle() &&
         attr1.GetBulletNumber() == attr2.GetBulletNumber() &&
-        attr1.GetBulletSymbol() == attr2.GetBulletSymbol() &&
+        attr1.GetBulletText() == attr2.GetBulletText() &&
+        attr1.GetBulletName() == attr2.GetBulletName() &&
         attr1.GetBulletFont() == attr2.GetBulletFont() &&
         attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
-        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName());
+        attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() &&
+        attr1.GetListStyleName() == attr2.GetListStyleName());
 }
 
 /// Compare two attribute objects, but take into account the flags
@@ -5400,6 +6277,10 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
         (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;
@@ -5408,12 +6289,13 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()))
+    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+        (attr1.GetBulletText() != attr2.GetBulletText()) &&
+        (attr1.GetBulletFont() != attr2.GetBulletFont()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
+    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
+        (attr1.GetBulletName() != attr2.GetBulletName()))
          return false;
 
     if ((flags & wxTEXT_ATTR_TABS) &&
@@ -5485,6 +6367,10 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
         (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;
@@ -5493,12 +6379,13 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
         (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletSymbol() != attr2.GetBulletSymbol()))
+    if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+        (attr1.GetBulletText() != attr2.GetBulletText()) &&
+        (attr1.GetBulletFont() != attr2.GetBulletFont()))
          return false;
 
-    if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) &&
-        (attr1.GetBulletFont() != attr2.GetBulletFont()))
+    if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
+        (attr1.GetBulletName() != attr2.GetBulletName()))
          return false;
 
     if ((flags & wxTEXT_ATTR_TABS) &&
@@ -5607,16 +6494,27 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
     if (style.HasParagraphStyleName())
         destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
 
+    if (style.HasListStyleName())
+        destStyle.SetListStyleName(style.GetListStyleName());
+
     if (style.HasBulletStyle())
-    {
         destStyle.SetBulletStyle(style.GetBulletStyle());
-        destStyle.SetBulletSymbol(style.GetBulletSymbol());
+
+    if (style.HasBulletText())
+    {
+        destStyle.SetBulletText(style.GetBulletText());
         destStyle.SetBulletFont(style.GetBulletFont());
     }
 
+    if (style.HasBulletName())
+        destStyle.SetBulletName(style.GetBulletName());
+
     if (style.HasBulletNumber())
         destStyle.SetBulletNumber(style.GetBulletNumber());
 
+    if (style.HasURL())
+        destStyle.SetURL(style.GetURL());
+
     return true;
 }
 
@@ -5629,6 +6527,14 @@ bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
     return true;
 }
 
+bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
+{
+    wxTextAttrEx attr(destStyle);
+    wxRichTextApplyStyle(attr, style, compareWith);
+    destStyle = attr;
+    return true;
+}
+
 bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
 {
     // Whole font. Avoiding setting individual attributes if possible, since
@@ -5784,17 +6690,23 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
             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.HasBulletSymbol())
+    if (style.HasBulletText())
     {
-        if (!(compareWith && compareWith->HasBulletSymbol() && compareWith->GetBulletSymbol() == style.GetBulletSymbol()))
+        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
         {
-            destStyle.SetBulletSymbol(style.GetBulletSymbol());
+            destStyle.SetBulletText(style.GetBulletText());
             destStyle.SetBulletFont(style.GetBulletFont());
         }
     }
@@ -5805,6 +6717,18 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
             destStyle.SetBulletNumber(style.GetBulletNumber());
     }
 
+    if (style.HasBulletName())
+    {
+        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
+            destStyle.SetBulletName(style.GetBulletName());
+    }
+
+    if (style.HasURL())
+    {
+        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
+            destStyle.SetURL(style.GetURL());
+    }
+
     return true;
 }
 
@@ -5868,7 +6792,6 @@ wxString wxRichTextDecimalToRoman(long n)
     return roman;
 }
 
-
 /*!
  * wxRichTextAttr stores attributes without a wxFont object, so is a much more
  * efficient way to query styles.
@@ -5894,6 +6817,11 @@ wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr)
     (*this) = attr;
 }
 
+wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr)
+{
+    Copy(attr);
+}
+
 // operations
 void wxRichTextAttr::Init()
 {
@@ -5913,11 +6841,10 @@ void wxRichTextAttr::Init()
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;
-    m_bulletSymbol = wxT('*');
 }
 
-// operators
-void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
+// Copy
+void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
 {
     m_colText = attr.m_colText;
     m_colBack = attr.m_colBack;
@@ -5939,10 +6866,20 @@ void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
     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_bulletSymbol = attr.m_bulletSymbol;
+    m_bulletText = attr.m_bulletText;
     m_bulletFont = attr.m_bulletFont;
+    m_bulletName = attr.m_bulletName;
+
+    m_urlTarget = attr.m_urlTarget;
+}
+
+// operators
+void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
+{    
+    Copy(attr);
 }
 
 // operators
@@ -5962,11 +6899,15 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
     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_bulletSymbol = attr.GetBulletSymbol();
+    m_bulletText = attr.GetBulletText();
+    m_bulletName = attr.GetBulletName();
     m_bulletFont = attr.GetBulletFont();
 
+    m_urlTarget = attr.GetURL();
+
     if (attr.GetFont().Ok())
         GetFontAttributes(attr.GetFont());
 }
@@ -5998,17 +6939,21 @@ bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
             GetLineSpacing() == attr.GetLineSpacing() &&
             GetCharacterStyleName() == attr.GetCharacterStyleName() &&
             GetParagraphStyleName() == attr.GetParagraphStyleName() &&
+            GetListStyleName() == attr.GetListStyleName() &&
 
             GetBulletStyle() == attr.GetBulletStyle() &&
-            GetBulletSymbol() == attr.GetBulletSymbol() &&
+            GetBulletText() == attr.GetBulletText() &&
             GetBulletNumber() == attr.GetBulletNumber() &&
             GetBulletFont() == attr.GetBulletFont() &&
+            GetBulletName() == attr.GetBulletName() &&
 
             m_fontSize == attr.m_fontSize &&
             m_fontStyle == attr.m_fontStyle &&
             m_fontWeight == attr.m_fontWeight &&
             m_fontUnderlined == attr.m_fontUnderlined &&
-            m_fontFaceName == attr.m_fontFaceName;
+            m_fontFaceName == attr.m_fontFaceName &&
+            
+            m_urlTarget == attr.m_urlTarget;
 }
 
 // Copy to a wxTextAttr
@@ -6027,10 +6972,14 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const
     attr.SetLineSpacing(m_lineSpacing);
     attr.SetBulletStyle(m_bulletStyle);
     attr.SetBulletNumber(m_bulletNumber);
-    attr.SetBulletSymbol(m_bulletSymbol);
+    attr.SetBulletText(m_bulletText);
+    attr.SetBulletName(m_bulletName);
     attr.SetBulletFont(m_bulletFont);
     attr.SetCharacterStyleName(m_characterStyleName);
     attr.SetParagraphStyleName(m_paragraphStyleName);
+    attr.SetListStyleName(m_listStyleName);
+
+    attr.SetURL(m_urlTarget);
 
     attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags
 }
@@ -6136,18 +7085,27 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr,
     if (attr.HasParagraphStyleName())
         newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
 
+    if (attr.HasListStyleName())
+        newAttr.SetListStyleName(attr.GetListStyleName());
+
     if (attr.HasBulletStyle())
         newAttr.SetBulletStyle(attr.GetBulletStyle());
 
     if (attr.HasBulletNumber())
         newAttr.SetBulletNumber(attr.GetBulletNumber());
 
-    if (attr.HasBulletSymbol())
+    if (attr.HasBulletName())
+        newAttr.SetBulletName(attr.GetBulletName());
+
+    if (attr.HasBulletText())
     {
-        newAttr.SetBulletSymbol(attr.GetBulletSymbol());
+        newAttr.SetBulletText(attr.GetBulletText());
         newAttr.SetBulletFont(attr.GetBulletFont());
     }
 
+    if (attr.HasURL())
+        newAttr.SetURL(attr.GetURL());
+
     return newAttr;
 }
 
@@ -6155,17 +7113,9 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr,
  * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
  */
 
-wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr)
+wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr)
 {
-    m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
-    m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
-    m_lineSpacing = attr.m_lineSpacing;
-    m_paragraphStyleName = attr.m_paragraphStyleName;
-    m_characterStyleName = attr.m_characterStyleName;
-    m_bulletStyle = attr.m_bulletStyle;
-    m_bulletNumber = attr.m_bulletNumber;
-    m_bulletSymbol = attr.m_bulletSymbol;
-    m_bulletFont = attr.m_bulletFont;
+    Copy(attr);
 }
 
 // Initialise this object.
@@ -6176,12 +7126,10 @@ void wxTextAttrEx::Init()
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     m_bulletNumber = 0;
-    m_bulletSymbol = 0;
-    m_bulletSymbol = wxT('*');
 }
 
-// Assignment from a wxTextAttrEx object
-void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
+// Copy
+void wxTextAttrEx::Copy(const wxTextAttrEx& attr)
 {
     wxTextAttr::operator= (attr);
 
@@ -6190,10 +7138,19 @@ void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
     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_bulletSymbol = attr.m_bulletSymbol;
+    m_bulletText = attr.m_bulletText;
     m_bulletFont = attr.m_bulletFont;
+    m_bulletName = attr.m_bulletName;
+    m_urlTarget = attr.m_urlTarget;
+}
+
+// Assignment from a wxTextAttrEx object
+void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
+{
+    Copy(attr);
 }
 
 // Assignment from a wxTextAttr object.
@@ -6202,6 +7159,32 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr)
     wxTextAttr::operator= (attr);
 }
 
+// Equality test
+bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
+{
+    return (
+        GetTextColour() == attr.GetTextColour() &&
+        GetBackgroundColour() == attr.GetBackgroundColour() &&
+        GetFont() == attr.GetFont() &&
+        GetAlignment() == attr.GetAlignment() &&
+        GetLeftIndent() == attr.GetLeftIndent() &&
+        GetRightIndent() == attr.GetRightIndent() &&
+        GetLeftSubIndent() == attr.GetLeftSubIndent() &&
+        wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
+        GetLineSpacing() == attr.GetLineSpacing() &&
+        GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
+        GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
+        GetBulletStyle() == attr.GetBulletStyle() &&
+        GetBulletNumber() == attr.GetBulletNumber() &&
+        GetBulletText() == attr.GetBulletText() &&
+        GetBulletName() == attr.GetBulletName() &&
+        GetBulletFont() == attr.GetBulletFont() &&
+        GetCharacterStyleName() == attr.GetCharacterStyleName() &&
+        GetParagraphStyleName() == attr.GetParagraphStyleName() &&
+        GetListStyleName() == attr.GetListStyleName() &&
+        GetURL() == attr.GetURL());
+}
+
 wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
                                const wxTextAttrEx& attrDef,
                                const wxTextCtrlBase *text)
@@ -6329,18 +7312,27 @@ wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
     if (attr.HasParagraphStyleName())
         newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
 
+    if (attr.HasListStyleName())
+        newAttr.SetListStyleName(attr.GetListStyleName());
+
     if (attr.HasBulletStyle())
         newAttr.SetBulletStyle(attr.GetBulletStyle());
 
     if (attr.HasBulletNumber())
         newAttr.SetBulletNumber(attr.GetBulletNumber());
 
-    if (attr.HasBulletSymbol())
+    if (attr.HasBulletName())
+        newAttr.SetBulletName(attr.GetBulletName());
+
+    if (attr.HasBulletText())
     {
-        newAttr.SetBulletSymbol(attr.GetBulletSymbol());
+        newAttr.SetBulletText(attr.GetBulletText());
         newAttr.SetBulletFont(attr.GetBulletFont());
     }
 
+    if (attr.HasURL())
+        newAttr.SetURL(attr.GetURL());
+
     return newAttr;
 }
 
@@ -6698,6 +7690,16 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b
     return WriteBlock(outStream, block, size);
 }
 
+// Gets the extension for the block's type
+wxString wxRichTextImageBlock::GetExtension() const
+{
+    wxImageHandler* handler = wxImage::FindHandler(GetImageType());
+    if (handler)
+        return handler->GetExtension();
+    else
+        return wxEmptyString;
+}
+
 #if wxUSE_DATAOBJ
 
 /*!
@@ -6818,4 +7820,3 @@ bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 
 #endif
     // wxUSE_RICHTEXT
-