From 1199fbd4e0ba0b53b7417cac31f33c68d461a557 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 8 Jan 2012 18:27:47 +0000
Subject: [PATCH] Fixed default style setting to take into account text boxes;
 fixed AddBoxStyle

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/richtext/richtextctrl.cpp   | 10 +++++++++-
 src/richtext/richtextstyles.cpp |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index f21e56c5d1..a0feef5dc7 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -4086,7 +4086,15 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
     // If at the start of a paragraph, use the next position.
     long pos = GetAdjustedCaretPosition(GetCaretPosition());
 
-    if (GetUncombinedStyle(pos, attr))
+    wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(pos);
+    if (obj && obj->IsTopLevel())
+    {
+        // Don't use the attributes of a top-level object, since they might apply
+        // to content of the object, e.g. background colour.
+        SetDefaultStyle(wxRichTextAttr());
+        return true;
+    }
+    else if (GetUncombinedStyle(pos, attr))
     {
         SetDefaultStyle(attr);
         return true;
diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index 8484ce683b..86e64ccfbb 100644
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -442,7 +442,7 @@ bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def)
 /// Add a definition to the box style list
 bool wxRichTextStyleSheet::AddBoxStyle(wxRichTextBoxStyleDefinition* def)
 {
-    def->GetStyle().SetParagraphStyleName(def->GetName());
+    def->GetStyle().GetTextBoxAttr().SetBoxStyleName(def->GetName());
     return AddStyle(m_boxStyleDefinitions, def);
 }