wxRect2DDouble --> wxRect2D

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 064e792bad167417d640f0049e1337d6511ca236..8d7b93134cfbf6854afa25cde13dd12832e5cc92 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -46,6 +46,8 @@ 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
 

+const wxChar wxRichTextLineBreakChar = (wxChar) 29;
+

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


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

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

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


@@ -907,25 +903,14 @@ wxSize wxRichTextParagraphLayoutBox::GetLineSizeAtPosition(long pos, bool caretP
 /// Convenience function to add a paragraph of text
 wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)
 {
 /// Convenience function to add a paragraph of text
 wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
     
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
     
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;

-    wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
-#else
-    wxTextAttrEx style(GetAttributes());

 
 

-    // Apply default style. If the style has no attributes set,
-    // then the attributes will remain the 'basic style' (i.e. the
-    // layout box's style).
-    wxRichTextApplyStyle(style, GetDefaultStyle());
-
-    wxTextAttrEx defaultCharStyle = style;
-    wxTextAttrEx defaultParaStyle = style;
-#endif
+    wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);

     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;
 
     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;
 


@@ -942,7 +927,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text,
 /// Adds multiple paragraphs, based on newlines.
 wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)
 {
 /// Adds multiple paragraphs, based on newlines.
 wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
     // 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.


@@ -950,17 +934,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);

-#else
-    wxTextAttrEx style(GetAttributes());
-
-    // Apply default style. If the style has no attributes set,
-    // then the attributes will remain the 'basic style' (i.e. the
-    // layout box's style).
-    wxRichTextApplyStyle(style, GetDefaultStyle());
-
-    wxTextAttrEx defaultCharStyle = style;
-    wxTextAttrEx defaultParaStyle = style;
-#endif

 
     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;
 
     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;


@@ -1017,7 +990,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
 /// Convenience function to add an image
 wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)
 {
 /// Convenience function to add an image
 wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     // Don't use the base style, just the default style, and the base style will
     // be combined at display time.
     // Divide into paragraph and character styles.
     // 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.


@@ -1025,17 +997,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
     wxTextAttrEx defaultCharStyle;
     wxTextAttrEx defaultParaStyle;
     wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);

-#else
-    wxTextAttrEx style(GetAttributes());
-
-    // Apply default style. If the style has no attributes set,
-    // then the attributes will remain the 'basic style' (i.e. the
-    // layout box's style).
-    wxRichTextApplyStyle(style, GetDefaultStyle());
-
-    wxTextAttrEx defaultCharStyle = style;
-    wxTextAttrEx defaultParaStyle = style;
-#endif

 
     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;
 
     wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
     wxTextAttrEx* cStyle = & defaultCharStyle;


@@ -1599,11 +1560,29 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
     bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
     bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0);
     bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool parasOnly = ((flags & wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY) != 0);
     bool charactersOnly = ((flags & wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY) != 0);

+    bool resetExistingStyle = ((flags & wxRICHTEXT_SETSTYLE_RESET) != 0);
+
+    // Apply paragraph style first, if any
+    wxRichTextAttr wholeStyle(style);
+
+    if (wholeStyle.HasParagraphStyleName() && GetStyleSheet())
+    {
+        wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(wholeStyle.GetParagraphStyleName());
+        if (def)
+            wxRichTextApplyStyle(wholeStyle, def->GetStyleMergedWithBase(GetStyleSheet()));
+    }

 
     // Limit the attributes to be set to the content to only character attributes.
 
     // Limit the attributes to be set to the content to only character attributes.

-    wxRichTextAttr characterAttributes(style);
+    wxRichTextAttr characterAttributes(wholeStyle);

     characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 
     characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
 

+    if (characterAttributes.HasCharacterStyleName() && GetStyleSheet())
+    {
+        wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterAttributes.GetCharacterStyleName());
+        if (def)
+            wxRichTextApplyStyle(characterAttributes, def->GetStyleMergedWithBase(GetStyleSheet()));
+    }
+

     // If we are associated with a control, make undoable; otherwise, apply immediately
     // to the data.
 
     // If we are associated with a control, make undoable; otherwise, apply immediately
     // to the data.
 


@@ -1647,21 +1626,27 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
                 else
                     newPara = para;
 
                 else
                     newPara = para;
 

-                if (paragraphStyle && !charactersOnly)
+                // If we're specifying paragraphs only, then we really mean character formatting
+                // to be included in the paragraph style
+                if ((paragraphStyle || parasOnly) && !charactersOnly)

                 {
                 {

-                    if (applyMinimal)
+                    if (resetExistingStyle)
+                        newPara->GetAttributes() = wholeStyle;
+                    else

                     {
                     {

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

                     }
                     }

-                    else
-                        wxRichTextApplyStyle(newPara->GetAttributes(), style);

                 }
 
                 }
 

-#if wxRICHTEXT_USE_DYNAMIC_STYLES
-                // If applying paragraph styles dynamically, don't change the text objects' attributes
+                // When applying paragraph styles dynamically, don't change the text objects' attributes

                 // since they will computed as needed. Only apply the character styling if it's _only_
                 // character styling. This policy is subject to change and might be put under user control.
 
                 // since they will computed as needed. Only apply the character styling if it's _only_
                 // character styling. This policy is subject to change and might be put under user control.
 


@@ -1673,9 +1658,6 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
 
                 // if (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
                 if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
 
                 // if (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
                 if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())

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

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


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

-                        if (applyMinimal)
+                        if (resetExistingStyle)
+                            child->GetAttributes() = characterAttributes;
+                        else

                         {
                         {

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

                         }
                         }

-                        else
-                            wxRichTextApplyStyle(child->GetAttributes(), characterAttributes);

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


@@ -1807,7 +1794,6 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style
         obj = GetParagraphAtPosition(position);
         if (obj)
         {
         obj = GetParagraphAtPosition(position);
         if (obj)
         {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

             if (combineStyles)
             {
                 // Start with the base style
             if (combineStyles)
             {
                 // Start with the base style


@@ -1818,9 +1804,7 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style
             }
             else
                 style = obj->GetAttributes();
             }
             else
                 style = obj->GetAttributes();

-#else
-            style = obj->GetAttributes();
-#endif
+

             return true;
         }
     }
             return true;
         }
     }


@@ -1829,7 +1813,6 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style
         obj = GetLeafObjectAtPosition(position);
         if (obj)
         {
         obj = GetLeafObjectAtPosition(position);
         if (obj)
         {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

             if (combineStyles)
             {
                 wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);
             if (combineStyles)
             {
                 wxRichTextParagraph* para = wxDynamicCast(obj->GetParent(), wxRichTextParagraph);


@@ -1837,9 +1820,7 @@ bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style
             }
             else
                 style = obj->GetAttributes();
             }
             else
                 style = obj->GetAttributes();

-#else
-            style = obj->GetAttributes();
-#endif
+

             return true;
         }
     }
             return true;
         }
     }


@@ -1853,13 +1834,13 @@ 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)
+bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, const wxTextAttrEx& style, long& multipleStyleAttributes, int& multipleTextEffectAttributes)

 {
     if (style.HasFont())
     {
 {
     if (style.HasFont())
     {

-        if (style.HasSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
+        if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasSize())
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFontSize())

             {
                 if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize())
                 {
             {
                 if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize())
                 {


@@ -1880,9 +1861,9 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             }
         }
 
             }
         }
 

-        if (style.HasItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))
+        if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasItalic())
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFontItalic())

             {
                 if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle())
                 {
             {
                 if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle())
                 {


@@ -1902,9 +1883,9 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             }
         }
 
             }
         }
 

-        if (style.HasWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
+        if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasWeight())
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFontWeight())

             {
                 if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight())
                 {
             {
                 if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight())
                 {


@@ -1924,9 +1905,9 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             }
         }
 
             }
         }
 

-        if (style.HasFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))
+        if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasFaceName())
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFontFaceName())

             {
                 wxString faceName1(currentStyle.GetFont().GetFaceName());
                 wxString faceName2(style.GetFont().GetFaceName());
             {
                 wxString faceName1(currentStyle.GetFont().GetFaceName());
                 wxString faceName2(style.GetFont().GetFaceName());


@@ -1949,9 +1930,9 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
             }
         }
 
             }
         }
 

-        if (style.HasUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))
+        if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))

         {
         {

-            if (currentStyle.GetFont().Ok() && currentStyle.HasUnderlined())
+            if (currentStyle.GetFont().Ok() && currentStyle.HasFontUnderlined())

             {
                 if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined())
                 {
             {
                 if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined())
                 {


@@ -2066,7 +2047,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasParagraphSpacingAfter())
         {
     {
         if (currentStyle.HasParagraphSpacingAfter())
         {

-            if (currentStyle.HasParagraphSpacingAfter() != style.HasParagraphSpacingAfter())
+            if (currentStyle.GetParagraphSpacingAfter() != style.GetParagraphSpacingAfter())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_AFTER;


@@ -2081,7 +2062,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasParagraphSpacingBefore())
         {
     {
         if (currentStyle.HasParagraphSpacingBefore())
         {

-            if (currentStyle.HasParagraphSpacingBefore() != style.HasParagraphSpacingBefore())
+            if (currentStyle.GetParagraphSpacingBefore() != style.GetParagraphSpacingBefore())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARA_SPACING_BEFORE;


@@ -2096,7 +2077,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasLineSpacing())
         {
     {
         if (currentStyle.HasLineSpacing())
         {

-            if (currentStyle.HasLineSpacing() != style.HasLineSpacing())
+            if (currentStyle.GetLineSpacing() != style.GetLineSpacing())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_LINE_SPACING;


@@ -2111,7 +2092,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasCharacterStyleName())
         {
     {
         if (currentStyle.HasCharacterStyleName())
         {

-            if (currentStyle.HasCharacterStyleName() != style.HasCharacterStyleName())
+            if (currentStyle.GetCharacterStyleName() != style.GetCharacterStyleName())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_CHARACTER_STYLE_NAME;


@@ -2126,7 +2107,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasParagraphStyleName())
         {
     {
         if (currentStyle.HasParagraphStyleName())
         {

-            if (currentStyle.HasParagraphStyleName() != style.HasParagraphStyleName())
+            if (currentStyle.GetParagraphStyleName() != style.GetParagraphStyleName())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME;


@@ -2141,7 +2122,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasListStyleName())
         {
     {
         if (currentStyle.HasListStyleName())
         {

-            if (currentStyle.HasListStyleName() != style.HasListStyleName())
+            if (currentStyle.GetListStyleName() != style.GetListStyleName())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_LIST_STYLE_NAME;


@@ -2156,7 +2137,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasBulletStyle())
         {
     {
         if (currentStyle.HasBulletStyle())
         {

-            if (currentStyle.HasBulletStyle() != style.HasBulletStyle())
+            if (currentStyle.GetBulletStyle() != style.GetBulletStyle())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_STYLE;


@@ -2171,7 +2152,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasBulletNumber())
         {
     {
         if (currentStyle.HasBulletNumber())
         {

-            if (currentStyle.HasBulletNumber() != style.HasBulletNumber())
+            if (currentStyle.GetBulletNumber() != style.GetBulletNumber())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NUMBER;


@@ -2186,7 +2167,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasBulletText())
         {
     {
         if (currentStyle.HasBulletText())
         {

-            if (currentStyle.HasBulletText() != style.HasBulletText())
+            if (currentStyle.GetBulletText() != style.GetBulletText())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT;


@@ -2204,7 +2185,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasBulletName())
         {
     {
         if (currentStyle.HasBulletName())
         {

-            if (currentStyle.HasBulletName() != style.HasBulletName())
+            if (currentStyle.GetBulletName() != style.GetBulletName())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME;


@@ -2221,7 +2202,7 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
     {
         if (currentStyle.HasURL())
         {
     {
         if (currentStyle.HasURL())
         {

-            if (currentStyle.HasURL() != style.HasURL())
+            if (currentStyle.GetURL() != style.GetURL())

             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_URL;
             {
                 // Clash of style - mark as such
                 multipleStyleAttributes |= wxTEXT_ATTR_URL;


@@ -2234,6 +2215,48 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons
         }
     }
 
         }
     }
 

+    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;
 }
 
     return true;
 }
 


@@ -2247,7 +2270,8 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
 
     // The attributes that aren't valid because of multiple styles within the range
     long multipleStyleAttributes = 0;
 
     // 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)
     {
     wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
     while (node)
     {


@@ -2258,7 +2282,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
             {
                 wxTextAttrEx paraStyle = para->GetCombinedAttributes();
 
             {
                 wxTextAttrEx paraStyle = para->GetCombinedAttributes();
 

-                CollectStyle(style, paraStyle, multipleStyleAttributes);
+                CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);

             }
             else
             {
             }
             else
             {


@@ -2268,7 +2292,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
                 // First collect paragraph attributes only
                 wxTextAttrEx paraStyle = para->GetCombinedAttributes();
                 paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
                 // First collect paragraph attributes only
                 wxTextAttrEx paraStyle = para->GetCombinedAttributes();
                 paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);

-                CollectStyle(style, paraStyle, multipleStyleAttributes);
+                CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);

 
                 wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
 
 
                 wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
 


@@ -2282,7 +2306,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range
                         // 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);
+                        CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes);

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


@@ -2332,11 +2356,8 @@ bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange&
                     if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
                     {
                         foundCount ++;
                     if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
                     {
                         foundCount ++;

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

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

-#else
-                        const wxTextAttrEx& textAttr = child->GetAttributes();
-#endif
+

                         if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
                             matchingCount ++;
                     }
                         if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
                             matchingCount ++;
                     }


@@ -2381,14 +2402,10 @@ bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange&
 
             if (!para->GetRange().IsOutside(range))
             {
 
             if (!para->GetRange().IsOutside(range))
             {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

                 wxTextAttrEx textAttr = GetAttributes();
                 // Apply the paragraph style
                 wxRichTextApplyStyle(textAttr, para->GetAttributes());
 
                 wxTextAttrEx textAttr = GetAttributes();
                 // Apply the paragraph style
                 wxRichTextApplyStyle(textAttr, para->GetAttributes());
 

-#else
-                const wxTextAttrEx& textAttr = para->GetAttributes();
-#endif

                 foundCount ++;
                 if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
                     matchingCount ++;
                 foundCount ++;
                 if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
                     matchingCount ++;


@@ -2495,13 +2512,13 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
                 wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
                 if (paraDef && !listDef)
                 {
                 wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
                 if (paraDef && !listDef)
                 {

-                    para->GetAttributes() = paraDef->GetStyle();
+                    para->GetAttributes() = paraDef->GetStyleMergedWithBase(styleSheet);

                     foundCount ++;
                 }
                 else if (listDef && !paraDef)
                 {
                     // Set overall style defined for the list style definition
                     foundCount ++;
                 }
                 else if (listDef && !paraDef)
                 {
                     // Set overall style defined for the list style definition

-                    para->GetAttributes() = listDef->GetStyle();
+                    para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);

 
                     // Apply the style for this level
                     wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
 
                     // Apply the style for this level
                     wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));


@@ -2510,7 +2527,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
                 else if (listDef && paraDef)
                 {
                     // Combines overall list style, style for level, and paragraph style
                 else if (listDef && paraDef)
                 {
                     // Combines overall list style, style for level, and paragraph style

-                    para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyle());
+                    para->GetAttributes() = listDef->CombineWithParagraphStyle(currentIndent, paraDef->GetStyleMergedWithBase(styleSheet));

                     foundCount ++;
                 }
             }
                     foundCount ++;
                 }
             }


@@ -2521,7 +2538,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
                 wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
 
                 // Overall list definition style
                 wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName());
 
                 // Overall list definition style

-                para->GetAttributes() = listDef->GetStyle();
+                para->GetAttributes() = listDef->GetStyleMergedWithBase(styleSheet);

 
                 // Style for this level
                 wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));
 
                 // Style for this level
                 wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent)));


@@ -2533,7 +2550,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
                 wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
                 if (def)
                 {
                 wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
                 if (def)
                 {

-                    para->GetAttributes() = def->GetStyle();
+                    para->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);

                     foundCount ++;
                 }
             }
                     foundCount ++;
                 }
             }


@@ -2547,6 +2564,8 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
 /// Set list style
 bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
 /// Set list style
 bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {

+    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+    

     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);
     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
     bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0);


@@ -2614,7 +2633,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));
+                    wxTextAttrEx 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


@@ -2637,13 +2656,12 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx
                     // 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);
 
                     // 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)
                         {
                     if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty())
                     {
                         wxRichTextParagraphStyleDefinition* def = styleSheet->FindParagraphStyle(newPara->GetAttributes().GetParagraphStyleName());
                         if (def)
                         {

-                            newPara->GetAttributes() = def->GetStyle();
+                            newPara->GetAttributes() = def->GetStyleMergedWithBase(styleSheet);

                         }
                     }
                 }
                         }
                     }
                 }


@@ -2687,6 +2705,8 @@ bool wxRichTextParagraphLayoutBox::NumberList(const wxRichTextRange& range, wxRi
 bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy,
                                                 wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
 bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy,
                                                 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);
 #ifdef __WXDEBUG__
     bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0);
     // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0);
 #ifdef __WXDEBUG__


@@ -2764,10 +2784,8 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co
                 wxRichTextListStyleDefinition* defToUse = def;
                 if (!defToUse)
                 {
                 wxRichTextListStyleDefinition* defToUse = def;
                 if (!defToUse)
                 {

-                    wxRichTextStyleSheet* sheet = GetStyleSheet();
-
-                    if (sheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
-                        defToUse = sheet->FindListStyle(newPara->GetAttributes().GetListStyleName());
+                    if (styleSheet && !newPara->GetAttributes().GetListStyleName().IsEmpty())
+                        defToUse = styleSheet->FindListStyle(newPara->GetAttributes().GetListStyleName());

                 }
 
                 if (defToUse)
                 }
 
                 if (defToUse)


@@ -2790,7 +2808,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));
+                    wxTextAttrEx 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.


@@ -2906,10 +2924,10 @@ 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* sheet = GetStyleSheet();
-    if (sheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())
+    wxRichTextStyleSheet* styleSheet = GetStyleSheet();
+    if (styleSheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty())

     {
     {

-        wxRichTextListStyleDefinition* def = sheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());
+        wxRichTextListStyleDefinition* def = styleSheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName());

         if (def)
         {
             // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();
         if (def)
         {
             // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent();


@@ -2987,11 +3005,7 @@ wxRichTextParagraph::~wxRichTextParagraph()
 /// Draw the item
 bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style)
 {
 /// Draw the item
 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();
     wxTextAttrEx attr = GetCombinedAttributes();

-#else
-    const wxTextAttrEx& attr = GetAttributes();
-#endif

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


@@ -3103,11 +3117,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
 /// 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)
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxTextAttrEx attr = GetCombinedAttributes();
     wxTextAttrEx attr = GetCombinedAttributes();

-#else
-    const wxTextAttrEx& attr = GetAttributes();
-#endif

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


@@ -3176,6 +3186,7 @@ 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
         child->Layout(dc, rect, style);
 
         // Available width depends on whether we're on the first or subsequent lines


@@ -3186,18 +3197,32 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
         // 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());
+        
+        if (lineBreakInThisObject)
+            lastPosToUse = nextBreakPos;

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

-        if (lastEndPos == child->GetRange().GetStart() - 1)
+        
+        if ((nextBreakPos == -1) && (lastEndPos == child->GetRange().GetStart() - 1)) // i.e. we want to get the whole thing

         {
             childSize = child->GetCachedSize();
             childDescent = child->GetDescent();
         }
         else
         {
             childSize = child->GetCachedSize();
             childDescent = child->GetDescent();
         }
         else

-            GetRangeSize(wxRichTextRange(lastEndPos+1, child->GetRange().GetEnd()), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED,rect.GetPosition());
+            GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
+
+        // 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 (childSize.x + currentWidth > availableSpaceForText)
+        if ((lineBreakInThisObject && (childSize.x + currentWidth <= availableSpaceForText)) ||
+            (childSize.x + currentWidth > availableSpaceForText))

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


@@ -3867,11 +3892,19 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d
     wxString plainText;
     if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false))
     {
     wxString plainText;
     if (GetContiguousPlainText(plainText, wxRichTextRange(range.GetStart(), breakPosition), false))
     {

-        int spacePos = plainText.Find(wxT(' '), true);
-        if (spacePos != wxNOT_FOUND)
+        int newLinePos = plainText.Find(wxRichTextLineBreakChar);
+        if (newLinePos != wxNOT_FOUND)

         {
         {

-            int positionsFromEndOfString = plainText.length() - spacePos - 1;
-            breakPosition = breakPosition - positionsFromEndOfString;
+            breakPosition = wxMax(0, range.GetStart() + newLinePos);
+        }
+        else
+        {
+            int spacePos = plainText.Find(wxT(' '), true);
+            if (spacePos != wxNOT_FOUND)
+            {
+                int positionsFromEndOfString = plainText.length() - spacePos - 1;
+                breakPosition = breakPosition - positionsFromEndOfString;
+            }

         }
     }
 
         }
     }
 


@@ -4029,6 +4062,27 @@ 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)
+{
+    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


@@ -4093,19 +4147,22 @@ wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject*
 /// Draw the item
 bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {
 /// Draw the item
 bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& rect, int descent, int WXUNUSED(style))
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());

-#else
-    wxTextAttrEx textAttr(GetAttributes());
-#endif

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

+    // Replace line break characters with spaces
+    wxString str = m_text;
+    wxString toRemove = wxRichTextLineBreakChar;
+    str.Replace(toRemove, wxT(" "));
+    

     long len = range.GetLength();
     long len = range.GetLength();

-    wxString stringChunk = m_text.Mid(range.GetStart() - offset, (size_t) len);
+    wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len);
+    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+        stringChunk.MakeUpper();

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


@@ -4144,7 +4201,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             int fragmentLen = s1 - r1 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);
             int fragmentLen = s1 - r1 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(r1 - offset), (int)fragmentLen);

-            wxString stringFragment = m_text.Mid(r1 - offset, fragmentLen);
+            wxString stringFragment = str.Mid(r1 - offset, fragmentLen);

 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
 
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
 


@@ -4152,8 +4209,8 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
             {
                 // Compensate for kerning difference
             if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
             {
                 // Compensate for kerning difference

-                wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1));
-                wxString stringFragment3(m_text.Mid(r1 - offset + fragmentLen, 1));
+                wxString stringFragment2(str.Mid(r1 - offset, fragmentLen+1));
+                wxString stringFragment3(str.Mid(r1 - offset + fragmentLen, 1));

 
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);
 
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);


@@ -4175,7 +4232,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             int fragmentLen = s2 - s1 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);
             int fragmentLen = s2 - s1 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s1 - offset), (int)fragmentLen);

-            wxString stringFragment = m_text.Mid(s1 - offset, fragmentLen);
+            wxString stringFragment = str.Mid(s1 - offset, fragmentLen);

 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);
 
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, true);
 


@@ -4183,8 +4240,8 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
             {
                 // Compensate for kerning difference
             if (stringChunk.Find(wxT("\t")) == wxNOT_FOUND)
             {
                 // Compensate for kerning difference

-                wxString stringFragment2(m_text.Mid(s1 - offset, fragmentLen+1));
-                wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1));
+                wxString stringFragment2(str.Mid(s1 - offset, fragmentLen+1));
+                wxString stringFragment3(str.Mid(s1 - offset + fragmentLen, 1));

 
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);
 
                 wxCoord w1, h1, w2, h2, w3, h3;
                 dc.GetTextExtent(stringFragment,  & w1, & h1);


@@ -4206,7 +4263,7 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR
             int fragmentLen = r2 - s2 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);
             int fragmentLen = r2 - s2 + 1;
             if (fragmentLen < 0)
                 wxLogDebug(wxT("Mid(%d, %d"), (int)(s2 - offset), (int)fragmentLen);

-            wxString stringFragment = m_text.Mid(s2 - offset, fragmentLen);
+            wxString stringFragment = str.Mid(s2 - offset, fragmentLen);

 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
         }
 
             DrawTabbedString(dc, textAttr, rect, stringFragment, x, y, false);
         }


@@ -4278,6 +4335,15 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
                     dc.DrawRectangle(selRect);
                 }
                 dc.DrawText(stringChunk, x, y);
                     dc.DrawRectangle(selRect);
                 }
                 dc.DrawText(stringChunk, x, y);

+
+                if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
+                {
+                    wxPen oldPen = dc.GetPen();
+                    dc.SetPen(wxPen(attr.GetTextColour(), 1));
+                    dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
+                    dc.SetPen(oldPen);
+                }
+

                 x = nextTabPos;
             }
         }
                 x = nextTabPos;
             }
         }


@@ -4293,6 +4359,15 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
             dc.DrawRectangle(selRect);
         }
         dc.DrawText(str, x, y);
             dc.DrawRectangle(selRect);
         }
         dc.DrawText(str, x, y);

+
+        if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
+        {
+            wxPen oldPen = dc.GetPen();
+            dc.SetPen(wxPen(attr.GetTextColour(), 1));
+            dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
+            dc.SetPen(oldPen);
+        }
+

         x += w;
     }
     return true;
         x += w;
     }
     return true;


@@ -4302,20 +4377,23 @@ 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))
 {

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());

-#else
-    wxTextAttrEx textAttr(GetAttributes());
-#endif

 
     if (textAttr.GetFont().Ok())
         dc.SetFont(textAttr.GetFont());
 
 
     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;
     wxCoord w, h;

-    dc.GetTextExtent(m_text, & w, & h, & m_descent);
+    dc.GetTextExtent(str, & w, & h, & m_descent);

     m_size = wxSize(w, dc.GetCharHeight());
 
     return true;
     m_size = wxSize(w, dc.GetCharHeight());
 
     return true;


@@ -4336,14 +4414,10 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
     if (!range.IsWithin(GetRange()))
         return false;
 
     if (!range.IsWithin(GetRange()))
         return false;
 

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
     wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
     wxASSERT (para != NULL);
 
     wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());

-#else
-    wxTextAttrEx textAttr(GetAttributes());
-#endif

 
     // Always assume unformatted text, since at this level we have no knowledge
     // of line breaks - and we don't need it, since we'll calculate size within
 
     // 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


@@ -4354,7 +4428,16 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 
     int startPos = range.GetStart() - GetRange().GetStart();
     long len = range.GetLength();
 
     int startPos = range.GetStart() - GetRange().GetStart();
     long len = range.GetLength();

-    wxString stringChunk = m_text.Mid(startPos, (size_t) len);
+    
+    wxString str(m_text);
+    wxString toReplace = wxRichTextLineBreakChar;
+    str.Replace(toReplace, wxT(" "));
+
+    wxString stringChunk = str.Mid(startPos, (size_t) len);
+
+    if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+        stringChunk.MakeUpper();
+

     wxCoord w, h;
     int width = 0;
     if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND)
     wxCoord w, h;
     int width = 0;
     if (stringChunk.Find(wxT('\t')) != wxNOT_FOUND)


@@ -4409,7 +4492,8 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 /// the first part in 'this'.
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {
 /// the first part in 'this'.
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {

-    int index = pos - GetRange().GetStart();
+    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;
 


@@ -4423,7 +4507,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;
 }
 


@@ -4497,6 +4581,23 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream)
     stream << m_text << wxT("\n");
 }
 
     stream << m_text << wxT("\n");
 }
 

+/// Get the first position from pos that has a line break character.
+long wxRichTextPlainText::GetFirstLineBreakPosition(long pos)
+{
+    int i;
+    int len = m_text.length();
+    int startPos = pos - m_range.GetStart();
+    for (i = startPos; i < len; i++)
+    {
+        wxChar ch = m_text[i];
+        if (ch == wxRichTextLineBreakChar)
+        {
+            return i + m_range.GetStart();
+        }
+    }
+    return -1;
+}
+

 /*!
  * wxRichTextBuffer
  * This is a kind of box, used to represent the whole buffer
 /*!
  * wxRichTextBuffer
  * This is a kind of box, used to represent the whole buffer


@@ -4584,12 +4685,7 @@ 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);
 

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxTextAttrEx attr(GetDefaultStyle());
     wxTextAttrEx attr(GetDefaultStyle());

-#else
-    wxTextAttrEx attr(GetBasicStyle());
-    wxRichTextApplyStyle(attr, GetDefaultStyle());
-#endif

 
     wxTextAttrEx* p = NULL;
     wxTextAttrEx paraAttr;
 
     wxTextAttrEx* p = NULL;
     wxTextAttrEx paraAttr;


@@ -4634,7 +4730,8 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich
     wxTextAttrEx paraAttr;
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
     wxTextAttrEx paraAttr;
     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;
     }


@@ -4649,6 +4746,8 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich
         length --;
         action->GetNewParagraphs().SetPartialParagraph(true);
     }
         length --;
         action->GetNewParagraphs().SetPartialParagraph(true);
     }

+    else if (text.length() > 0 && text.Last() == wxT('\n'))
+        length --;

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


@@ -4669,17 +4768,12 @@ bool wxRichTextBuffer::InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int
     wxTextAttrEx paraAttr;
     if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
     {
     wxTextAttrEx paraAttr;
     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;
     }
 

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxTextAttrEx attr(GetDefaultStyle());
     wxTextAttrEx attr(GetDefaultStyle());

-#else
-    wxTextAttrEx attr(GetBasicStyle());
-    wxRichTextApplyStyle(attr, GetDefaultStyle());
-#endif

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


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

-#if wxRICHTEXT_USE_DYNAMIC_STYLES

     wxTextAttrEx attr(GetDefaultStyle());
     wxTextAttrEx attr(GetDefaultStyle());

-#else
-    wxTextAttrEx attr(GetBasicStyle());
-    wxRichTextApplyStyle(attr, GetDefaultStyle());
-#endif

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


@@ -4743,7 +4832,7 @@ bool wxRichTextBuffer::InsertImageWithUndo(long pos, const wxRichTextImageBlock&
 /// 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)
 {
     wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
     if (para)


@@ -4752,7 +4841,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
         bool foundAttributes = false;
         
         // Look for a matching paragraph style
         bool foundAttributes = false;
         
         // 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)


@@ -4763,7 +4852,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                     if (nextParaDef)
                     {
                         foundAttributes = true;
                     if (nextParaDef)
                     {
                         foundAttributes = true;

-                        attr = nextParaDef->GetStyle();
+                        attr = nextParaDef->GetStyleMergedWithBase(GetStyleSheet());

                     }
                 }
                 
                     }
                 }
                 


@@ -4771,7 +4860,7 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
                 if (!foundAttributes)
                 {
                     foundAttributes = true;
                 if (!foundAttributes)
                 {
                     foundAttributes = true;

-                    attr = paraDef->GetStyle();
+                    attr = paraDef->GetStyleMergedWithBase(GetStyleSheet());

                 }
             }
         }
                 }
             }
         }


@@ -4802,11 +4891,11 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
 }
 
 /// Submit command to delete this range
 }
 
 /// Submit command to delete this range

-bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl)
+bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl)

 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
 
 {
     wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
 

-    action->SetPosition(initialCaretPosition);
+    action->SetPosition(ctrl->GetCaretPosition());

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


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

-            wxTextAttrEx attr;
-            def->GetStyle().CopyTo(attr);
+            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());

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


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

-            wxTextAttrEx attr;
-            def->GetStyle().CopyTo(attr);
+            wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());

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


@@ -5181,7 +5268,7 @@ bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterSt
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
         if (def)
         {
         wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
         if (def)
         {

-            def->GetStyle().CopyTo(attr);
+            attr = def->GetStyleMergedWithBase(GetStyleSheet());

         }
     }
     attr.SetURL(url);
         }
     }
     attr.SetURL(url);


@@ -5954,14 +6041,29 @@ bool wxRichTextAction::Do()
             // Don't take into account the last newline
             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;
             // Don't take into account the last newline
             if (m_newParagraphs.GetPartialParagraph())
                 newCaretPosition --;

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

 
 

-            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));
-            
+            newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));            

 
             if (optimizationLineCharPositions.GetCount() > 0)
                 UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
             else
                 UpdateAppearance(newCaretPosition, true /* send update event */);
 
             if (optimizationLineCharPositions.GetCount() > 0)
                 UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
             else
                 UpdateAppearance(newCaretPosition, true /* send update event */);

+            
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);

 
             break;
         }
 
             break;
         }


@@ -5973,6 +6075,15 @@ bool wxRichTextAction::Do()
 
             UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
 
 
             UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
 

+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);
+

             break;
         }
     case wxRICHTEXT_CHANGE_STYLE:
             break;
         }
     case wxRICHTEXT_CHANGE_STYLE:


@@ -5982,6 +6093,15 @@ bool wxRichTextAction::Do()
 
             UpdateAppearance(GetPosition());
 
 
             UpdateAppearance(GetPosition());
 

+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);
+

             break;
         }
     default:
             break;
         }
     default:


@@ -6004,11 +6124,18 @@ bool wxRichTextAction::Undo()
             m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
 
             long newCaretPosition = GetPosition() - 1;
             m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
 
             long newCaretPosition = GetPosition() - 1;

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

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

+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);
+

             break;
         }
     case wxRICHTEXT_DELETE:
             break;
         }
     case wxRICHTEXT_DELETE:


@@ -6019,6 +6146,15 @@ bool wxRichTextAction::Undo()
 
             UpdateAppearance(GetPosition(), true /* send update event */);
 
 
             UpdateAppearance(GetPosition(), true /* send update event */);
 

+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);
+

             break;
         }
     case wxRICHTEXT_CHANGE_STYLE:
             break;
         }
     case wxRICHTEXT_CHANGE_STYLE:


@@ -6028,6 +6164,15 @@ bool wxRichTextAction::Undo()
 
             UpdateAppearance(GetPosition());
 
 
             UpdateAppearance(GetPosition());
 

+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED,
+                m_ctrl ? m_ctrl->GetId() : -1);
+            cmdEvent.SetEventObject(m_ctrl ? (wxObject*) m_ctrl : (wxObject*) m_buffer);
+            cmdEvent.SetRange(GetRange());
+            cmdEvent.SetPosition(GetRange().GetStart());
+            
+            m_buffer->SendEvent(cmdEvent);
+

             break;
         }
     default:
             break;
         }
     default:


@@ -6329,6 +6474,8 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
         attr1.GetFont().GetWeight() == attr2.GetFontWeight() &&
         attr1.GetFont().GetFaceName() == attr2.GetFontFaceName() &&
         attr1.GetFont().GetUnderlined() == attr2.GetFontUnderlined() &&
         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.GetAlignment() == attr2.GetAlignment() &&
         attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
         attr1.GetRightIndent() == attr2.GetRightIndent() &&


@@ -6342,6 +6489,7 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
         attr1.GetBulletText() == attr2.GetBulletText() &&
         attr1.GetBulletName() == attr2.GetBulletName() &&
         attr1.GetBulletFont() == attr2.GetBulletFont() &&
         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.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
         attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() &&
         attr1.GetListStyleName() == attr2.GetListStyleName() &&


@@ -6438,6 +6586,18 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i
         (attr1.HasPageBreak() != attr2.HasPageBreak()))
          return false;
 
         (attr1.HasPageBreak() != attr2.HasPageBreak()))
          return false;
 

+    if (flags & wxTEXT_ATTR_EFFECTS)
+    {
+        if (attr1.HasTextEffects() != attr2.HasTextEffects())
+            return false;
+        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
+            return false;
+    }
+
+    if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
+        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
+         return false;
+

     return true;
 }
 
     return true;
 }
 


@@ -6532,6 +6692,18 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2,
         (attr1.HasPageBreak() != attr2.HasPageBreak()))
          return false;
 
         (attr1.HasPageBreak() != attr2.HasPageBreak()))
          return false;
 

+    if (flags & wxTEXT_ATTR_EFFECTS)
+    {
+        if (attr1.HasTextEffects() != attr2.HasTextEffects())
+            return false;
+        if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
+            return false;
+    }
+
+    if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
+        (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
+         return false;
+

     return true;
 }
 
     return true;
 }
 


@@ -6550,7 +6722,6 @@ bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
     return true;
 }
 
     return true;
 }
 

-

 /// Apply one style to another
 bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
 {
 /// Apply one style to another
 bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
 {


@@ -6658,13 +6829,29 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
     if (style.HasPageBreak())
         destStyle.SetPageBreak();
 
     if (style.HasPageBreak())
         destStyle.SetPageBreak();
 

+    if (style.HasTextEffects())
+    {
+        int destBits = destStyle.GetTextEffects();
+        int destFlags = destStyle.GetTextEffectFlags();
+
+        int srcBits = style.GetTextEffects();
+        int srcFlags = style.GetTextEffectFlags();
+            
+        wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
+            
+        destStyle.SetTextEffects(destBits);
+        destStyle.SetTextEffectFlags(destFlags);
+    }
+
+    if (style.HasOutlineLevel())
+        destStyle.SetOutlineLevel(style.GetOutlineLevel());
+

     return true;
 }
 
 bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
 {
     return true;
 }
 
 bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
 {

-    wxTextAttrEx destStyle2;
-    destStyle.CopyTo(destStyle2);
+    wxTextAttrEx destStyle2 = destStyle;

     wxRichTextApplyStyle(destStyle2, style);
     destStyle = destStyle2;
     return true;
     wxRichTextApplyStyle(destStyle2, style);
     destStyle = destStyle2;
     return true;


@@ -6672,9 +6859,7 @@ bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
 
 bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
 {
 
 bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
 {

-    wxTextAttrEx attr(destStyle);
-    wxRichTextApplyStyle(attr, style, compareWith);
-    destStyle = attr;
+    destStyle = destStyle.Combine(style, compareWith);

     return true;
 }
 
     return true;
 }
 


@@ -6693,7 +6878,7 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
         {
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
         {

-            if (compareWith && compareWith->HasFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())
+            if (compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())

             {
                 // The same as currently displayed, so don't set
             }
             {
                 // The same as currently displayed, so don't set
             }


@@ -6706,7 +6891,7 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
         {
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
         {

-            if (compareWith && compareWith->HasSize() && compareWith->GetFontSize() == style.GetFontSize())
+            if (compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize())

             {
                 // The same as currently displayed, so don't set
             }
             {
                 // The same as currently displayed, so don't set
             }


@@ -6719,7 +6904,7 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
         {
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
         {

-            if (compareWith && compareWith->HasItalic() && compareWith->GetFontStyle() == style.GetFontStyle())
+            if (compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle())

             {
                 // The same as currently displayed, so don't set
             }
             {
                 // The same as currently displayed, so don't set
             }


@@ -6732,7 +6917,7 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
         {
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
         {

-            if (compareWith && compareWith->HasWeight() && compareWith->GetFontWeight() == style.GetFontWeight())
+            if (compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight())

             {
                 // The same as currently displayed, so don't set
             }
             {
                 // The same as currently displayed, so don't set
             }


@@ -6745,7 +6930,7 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
         {
 
         if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
         {

-            if (compareWith && compareWith->HasUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())
+            if (compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())

             {
                 // The same as currently displayed, so don't set
             }
             {
                 // The same as currently displayed, so don't set
             }


@@ -6878,9 +7063,60 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style,
             destStyle.SetPageBreak();
     }
 
             destStyle.SetPageBreak();
     }
 

+    if (style.HasTextEffects())
+    {
+        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);
+        }
+    }
+
+    if (style.HasOutlineLevel())
+    {
+        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
+            destStyle.SetOutlineLevel(style.GetOutlineLevel());
+    }
+

     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)
+{
+    // 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;
+}
+
+/// Compare two bitlists
+bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
+{
+    int relevantBitsA = valueA & flags;
+    int relevantBitsB = valueB & flags;
+    return (relevantBitsA != relevantBitsB);
+}
+

 /// Split into paragraph and character styles
 bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle)
 {
 /// Split into paragraph and character styles
 bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle)
 {


@@ -7003,6 +7239,9 @@ void wxRichTextAttr::Init()
     m_paragraphSpacingBefore = 0;
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     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;
 }
 
     m_bulletNumber = 0;
 }
 


@@ -7023,6 +7262,8 @@ void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
     m_fontWeight = attr.m_fontWeight;
     m_fontUnderlined = attr.m_fontUnderlined;
     m_fontFaceName = attr.m_fontFaceName;
     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_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
     m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;


@@ -7035,6 +7276,7 @@ void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
     m_bulletText = attr.m_bulletText;
     m_bulletFont = attr.m_bulletFont;
     m_bulletName = attr.m_bulletName;
     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;
 }
 
     m_urlTarget = attr.m_urlTarget;
 }


@@ -7048,6 +7290,8 @@ void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
 // operators
 void wxRichTextAttr::operator= (const wxTextAttrEx& 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_colText = attr.GetTextColour();
     m_colBack = attr.GetBackgroundColour();
     m_textAlignment = attr.GetAlignment();


@@ -7055,7 +7299,8 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
     m_leftSubIndent = attr.GetLeftSubIndent();
     m_rightIndent = attr.GetRightIndent();
     m_tabs = attr.GetTabs();
     m_leftSubIndent = attr.GetLeftSubIndent();
     m_rightIndent = attr.GetRightIndent();
     m_tabs = attr.GetTabs();

-    m_flags = attr.GetFlags();
+    m_textEffects = attr.GetTextEffects();
+    m_textEffectFlags = attr.GetTextEffectFlags();

 
     m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter();
     m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore();
 
     m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter();
     m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore();


@@ -7068,6 +7313,7 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
     m_bulletText = attr.GetBulletText();
     m_bulletName = attr.GetBulletName();
     m_bulletFont = attr.GetBulletFont();
     m_bulletText = attr.GetBulletText();
     m_bulletName = attr.GetBulletName();
     m_bulletFont = attr.GetBulletFont();

+    m_outlineLevel = attr.GetOutlineLevel();

 
     m_urlTarget = attr.GetURL();
 
 
     m_urlTarget = attr.GetURL();
 


@@ -7079,7 +7325,32 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
 wxRichTextAttr::operator wxTextAttrEx () const
 {
     wxTextAttrEx attr;
 wxRichTextAttr::operator wxTextAttrEx () const
 {
     wxTextAttrEx attr;

-    CopyTo(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;
 }
 
     return attr;
 }
 


@@ -7110,41 +7381,18 @@ bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
             GetBulletFont() == attr.GetBulletFont() &&
             GetBulletName() == attr.GetBulletName() &&
 
             GetBulletFont() == attr.GetBulletFont() &&
             GetBulletName() == attr.GetBulletName() &&
 

-            m_fontSize == attr.m_fontSize &&
-            m_fontStyle == attr.m_fontStyle &&
-            m_fontWeight == attr.m_fontWeight &&
-            m_fontUnderlined == attr.m_fontUnderlined &&
-            m_fontFaceName == attr.m_fontFaceName &&
-            
-            m_urlTarget == attr.m_urlTarget;
-}
+            GetTextEffects() == attr.GetTextEffects() &&
+            GetTextEffectFlags() == attr.GetTextEffectFlags() &&

 
 

-// Copy to a wxTextAttr
-void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const
-{
-    attr.SetTextColour(GetTextColour());
-    attr.SetBackgroundColour(GetBackgroundColour());
-    attr.SetAlignment(GetAlignment());
-    attr.SetTabs(GetTabs());
-    attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent());
-    attr.SetRightIndent(GetRightIndent());
-    attr.SetFont(CreateFont());
+            GetOutlineLevel() == attr.GetOutlineLevel() &&

 
 

-    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.SetURL(m_urlTarget);
-
-    attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags
+            GetFontSize() == attr.GetFontSize() &&
+            GetFontStyle() == attr.GetFontStyle() &&
+            GetFontWeight() == attr.GetFontWeight() &&
+            GetFontUnderlined() == attr.GetFontUnderlined() &&
+            GetFontFaceName() == attr.GetFontFaceName() &&
+            
+            GetURL() == attr.GetURL();

 }
 
 // Create font from font attributes.
 }
 
 // Create font from font attributes.


@@ -7172,107 +7420,184 @@ bool wxRichTextAttr::GetFontAttributes(const wxFont& font)
     return true;
 }
 
     return true;
 }
 

-wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr,
-                               const wxRichTextAttr& attrDef,
-                               const wxTextCtrlBase *text)
+wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& style, const wxRichTextAttr* compareWith) const

 {
 {

-    wxColour colFg = attr.GetTextColour();
-    if ( !colFg.Ok() )
-    {
-        colFg = attrDef.GetTextColour();
+    wxRichTextAttr destStyle = (*this);
+    destStyle.Apply(style, compareWith);
+    
+    return destStyle;
+}

 
 

-        if ( text && !colFg.Ok() )
-            colFg = text->GetForegroundColour();
+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());

     }
 
     }
 

-    wxColour colBg = attr.GetBackgroundColour();
-    if ( !colBg.Ok() )
+    if (style.HasFontSize())

     {
     {

-        colBg = attrDef.GetBackgroundColour();
-
-        if ( text && !colBg.Ok() )
-            colBg = text->GetBackgroundColour();
+        if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
+            destStyle.SetFontSize(style.GetFontSize());

     }
 
     }
 

-    wxRichTextAttr newAttr(colFg, colBg);
+    if (style.HasFontItalic())
+    {
+        if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle()))
+            destStyle.SetFontStyle(style.GetFontStyle());
+    }

 
 

-    if (attr.HasWeight())
-        newAttr.SetFontWeight(attr.GetFontWeight());
+    if (style.HasFontUnderlined())
+    {
+        if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()))
+            destStyle.SetFontUnderlined(style.GetFontUnderlined());
+    }

 
 

-    if (attr.HasSize())
-        newAttr.SetFontSize(attr.GetFontSize());
+    if (style.HasFontFaceName())
+    {
+        if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
+            destStyle.SetFontFaceName(style.GetFontFaceName());
+    }

 
 

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

 
 

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

 
 

-    if (attr.HasFaceName())
-        newAttr.SetFontFaceName(attr.GetFontFaceName());
+    if (style.HasAlignment())
+    {
+        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
+            destStyle.SetAlignment(style.GetAlignment());
+    }

 
 

-    if (attr.HasAlignment())
-        newAttr.SetAlignment(attr.GetAlignment());
-    else if (attrDef.HasAlignment())
-        newAttr.SetAlignment(attrDef.GetAlignment());
+    if (style.HasTabs())
+    {
+        if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
+            destStyle.SetTabs(style.GetTabs());
+    }

 
 

-    if (attr.HasTabs())
-        newAttr.SetTabs(attr.GetTabs());
-    else if (attrDef.HasTabs())
-        newAttr.SetTabs(attrDef.GetTabs());
+    if (style.HasLeftIndent())
+    {
+        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
+                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
+            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
+    }

 
 

-    if (attr.HasLeftIndent())
-        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
-    else if (attrDef.HasLeftIndent())
-        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+    if (style.HasRightIndent())
+    {
+        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
+            destStyle.SetRightIndent(style.GetRightIndent());
+    }

 
 

-    if (attr.HasRightIndent())
-        newAttr.SetRightIndent(attr.GetRightIndent());
-    else if (attrDef.HasRightIndent())
-        newAttr.SetRightIndent(attrDef.GetRightIndent());
+    if (style.HasParagraphSpacingAfter())
+    {
+        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
+            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
+    }

 
 

-    // NEW ATTRIBUTES
+    if (style.HasParagraphSpacingBefore())
+    {
+        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
+            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
+    }

 
 

-    if (attr.HasParagraphSpacingAfter())
-        newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
+    if (style.HasLineSpacing())
+    {
+        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
+            destStyle.SetLineSpacing(style.GetLineSpacing());
+    }

 
 

-    if (attr.HasParagraphSpacingBefore())
-        newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
+    if (style.HasCharacterStyleName())
+    {
+        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
+            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
+    }

 
 

-    if (attr.HasLineSpacing())
-        newAttr.SetLineSpacing(attr.GetLineSpacing());
+    if (style.HasParagraphStyleName())
+    {
+        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
+            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
+    }

 
 

-    if (attr.HasCharacterStyleName())
-        newAttr.SetCharacterStyleName(attr.GetCharacterStyleName());
+    if (style.HasListStyleName())
+    {
+        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
+            destStyle.SetListStyleName(style.GetListStyleName());
+    }

 
 

-    if (attr.HasParagraphStyleName())
-        newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
+    if (style.HasBulletStyle())
+    {
+        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
+            destStyle.SetBulletStyle(style.GetBulletStyle());
+    }

 
 

-    if (attr.HasListStyleName())
-        newAttr.SetListStyleName(attr.GetListStyleName());
+    if (style.HasBulletText())
+    {
+        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
+        {
+            destStyle.SetBulletText(style.GetBulletText());
+            destStyle.SetBulletFont(style.GetBulletFont());
+        }
+    }

 
 

-    if (attr.HasBulletStyle())
-        newAttr.SetBulletStyle(attr.GetBulletStyle());
+    if (style.HasBulletNumber())
+    {
+        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
+            destStyle.SetBulletNumber(style.GetBulletNumber());
+    }

 
 

-    if (attr.HasBulletNumber())
-        newAttr.SetBulletNumber(attr.GetBulletNumber());
+    if (style.HasBulletName())
+    {
+        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
+            destStyle.SetBulletName(style.GetBulletName());
+    }

 
 

-    if (attr.HasBulletName())
-        newAttr.SetBulletName(attr.GetBulletName());
+    if (style.HasURL())
+    {
+        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
+            destStyle.SetURL(style.GetURL());
+    }

 
 

-    if (attr.HasBulletText())
+    if (style.HasPageBreak())

     {
     {

-        newAttr.SetBulletText(attr.GetBulletText());
-        newAttr.SetBulletFont(attr.GetBulletFont());
+        if (!(compareWith && compareWith->HasPageBreak()))
+            destStyle.SetPageBreak();

     }
 
     }
 

-    if (attr.HasURL())
-        newAttr.SetURL(attr.GetURL());
+    if (style.HasTextEffects())
+    {
+        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
+        {
+            int destBits = destStyle.GetTextEffects();
+            int destFlags = destStyle.GetTextEffectFlags();

 
 

-    if (attr.HasPageBreak())
-        newAttr.SetPageBreak();
+            int srcBits = style.GetTextEffects();
+            int srcFlags = style.GetTextEffectFlags();
+            
+            wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
+            
+            destStyle.SetTextEffects(destBits);
+            destStyle.SetTextEffectFlags(destFlags);
+        }
+    }

 
 

-    return newAttr;
+    if (style.HasOutlineLevel())
+    {
+        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
+            destStyle.SetOutlineLevel(style.GetOutlineLevel());
+    }
+
+    return true;

 }
 
 /*!
 }
 
 /*!


@@ -7291,7 +7616,10 @@ void wxTextAttrEx::Init()
     m_paragraphSpacingBefore = 0;
     m_lineSpacing = 0;
     m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
     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_bulletNumber = 0;

+    m_outlineLevel = 0;

 }
 
 // Copy
 }
 
 // Copy


@@ -7311,6 +7639,9 @@ void wxTextAttrEx::Copy(const wxTextAttrEx& attr)
     m_bulletFont = attr.m_bulletFont;
     m_bulletName = attr.m_bulletName;
     m_urlTarget = attr.m_urlTarget;
     m_bulletFont = attr.m_bulletFont;
     m_bulletName = attr.m_bulletName;
     m_urlTarget = attr.m_urlTarget;

+    m_textEffects = attr.m_textEffects;
+    m_textEffectFlags = attr.m_textEffectFlags;
+    m_outlineLevel = attr.m_outlineLevel;

 }
 
 // Assignment from a wxTextAttrEx object
 }
 
 // Assignment from a wxTextAttrEx object


@@ -7329,9 +7660,12 @@ void wxTextAttrEx::operator= (const wxTextAttr& attr)
 bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
 {
     return (
 bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
 {
     return (

+        GetFlags() == attr.GetFlags() &&

         GetTextColour() == attr.GetTextColour() &&
         GetBackgroundColour() == attr.GetBackgroundColour() &&
         GetFont() == attr.GetFont() &&
         GetTextColour() == attr.GetTextColour() &&
         GetBackgroundColour() == attr.GetBackgroundColour() &&
         GetFont() == attr.GetFont() &&

+        GetTextEffects() == attr.GetTextEffects() &&
+        GetTextEffectFlags() == attr.GetTextEffectFlags() &&

         GetAlignment() == attr.GetAlignment() &&
         GetLeftIndent() == attr.GetLeftIndent() &&
         GetRightIndent() == attr.GetRightIndent() &&
         GetAlignment() == attr.GetAlignment() &&
         GetLeftIndent() == attr.GetLeftIndent() &&
         GetRightIndent() == attr.GetRightIndent() &&


@@ -7348,6 +7682,7 @@ bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
         GetCharacterStyleName() == attr.GetCharacterStyleName() &&
         GetParagraphStyleName() == attr.GetParagraphStyleName() &&
         GetListStyleName() == attr.GetListStyleName() &&
         GetCharacterStyleName() == attr.GetCharacterStyleName() &&
         GetParagraphStyleName() == attr.GetParagraphStyleName() &&
         GetListStyleName() == attr.GetListStyleName() &&

+        GetOutlineLevel() == attr.GetOutlineLevel() &&

         GetURL() == attr.GetURL());
 }
 
         GetURL() == attr.GetURL());
 }
 


@@ -7385,27 +7720,27 @@ wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
         // Otherwise, if there are font attributes in attr, apply them
         if (attr.GetFlags() & wxTEXT_ATTR_FONT)
         {
         // Otherwise, if there are font attributes in attr, apply them
         if (attr.GetFlags() & wxTEXT_ATTR_FONT)
         {

-            if (attr.HasSize())
+            if (attr.HasFontSize())

             {
                 flags |= wxTEXT_ATTR_FONT_SIZE;
                 font.SetPointSize(attr.GetFont().GetPointSize());
             }
             {
                 flags |= wxTEXT_ATTR_FONT_SIZE;
                 font.SetPointSize(attr.GetFont().GetPointSize());
             }

-            if (attr.HasItalic())
+            if (attr.HasFontItalic())

             {
                 flags |= wxTEXT_ATTR_FONT_ITALIC;;
                 font.SetStyle(attr.GetFont().GetStyle());
             }
             {
                 flags |= wxTEXT_ATTR_FONT_ITALIC;;
                 font.SetStyle(attr.GetFont().GetStyle());
             }

-            if (attr.HasWeight())
+            if (attr.HasFontWeight())

             {
                 flags |= wxTEXT_ATTR_FONT_WEIGHT;
                 font.SetWeight(attr.GetFont().GetWeight());
             }
             {
                 flags |= wxTEXT_ATTR_FONT_WEIGHT;
                 font.SetWeight(attr.GetFont().GetWeight());
             }

-            if (attr.HasFaceName())
+            if (attr.HasFontFaceName())

             {
                 flags |= wxTEXT_ATTR_FONT_FACE;
                 font.SetFaceName(attr.GetFont().GetFaceName());
             }
             {
                 flags |= wxTEXT_ATTR_FONT_FACE;
                 font.SetFaceName(attr.GetFont().GetFaceName());
             }

-            if (attr.HasUnderlined())
+            if (attr.HasFontUnderlined())

             {
                 flags |= wxTEXT_ATTR_FONT_UNDERLINE;
                 font.SetUnderlined(attr.GetFont().GetUnderlined());
             {
                 flags |= wxTEXT_ATTR_FONT_UNDERLINE;
                 font.SetUnderlined(attr.GetFont().GetUnderlined());


@@ -7499,6 +7834,15 @@ wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
     if (attr.HasURL())
         newAttr.SetURL(attr.GetURL());
 
     if (attr.HasURL())
         newAttr.SetURL(attr.GetURL());
 

+    if (attr.HasTextEffects())
+    {
+        newAttr.SetTextEffects(attr.GetTextEffects());
+        newAttr.SetTextEffectFlags(attr.GetTextEffectFlags());
+    }
+
+    if (attr.HasOutlineLevel())
+        newAttr.SetOutlineLevel(attr.GetOutlineLevel());
+

     return newAttr;
 }
 
     return newAttr;
 }
 


@@ -7571,12 +7915,12 @@ bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStr
         }
     }
 
         }
     }
 

+    buffer->ResetAndClearCommands();

     buffer->Clear();
     buffer->AddParagraphs(str);
     buffer->UpdateRanges();
 
     return true;
     buffer->Clear();
     buffer->AddParagraphs(str);
     buffer->UpdateRanges();
 
     return true;

-

 }
 
 bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
 }
 
 bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)


@@ -7585,6 +7929,10 @@ bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputSt
         return false;
 
     wxString text = buffer->GetText();
         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());
     wxCharBuffer buf = text.ToAscii();
 
     stream.Write((const char*) buf, text.length());