Remove nonsensical custom comparison code from wxDataViewIndexListModel.

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index bb091333eb13ca59574937e46ddebe271505875b..e8eff5d801319effc3b75cdf8b88d1d72a0a38ad 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/richtext/richeditctrl.cpp
+// Name:        src/richtext/richtextctrl.cpp

 // Purpose:     A rich edit control
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     A rich edit control
 // Author:      Julian Smart
 // Modified by:


@@ -26,6 +26,7 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#include "wx/timer.h"

 #include "wx/textfile.h"
 #include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/textfile.h"
 #include "wx/ffile.h"
 #include "wx/filename.h"


@@ -34,28 +35,40 @@
 #include "wx/fontenum.h"
 #include "wx/accel.h"
 
 #include "wx/fontenum.h"
 #include "wx/accel.h"
 

+#if defined (__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
+#define wxHAVE_PRIMARY_SELECTION 1
+#else
+#define wxHAVE_PRIMARY_SELECTION 0
+#endif
+
+#if wxUSE_CLIPBOARD && wxHAVE_PRIMARY_SELECTION
+#include "wx/clipbrd.h"
+#endif
+

 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl")
 
 // DLL options compatibility check:
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl")
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RETURN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CHARACTER)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_DELETE)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET)
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent );

 
 #if wxRICHTEXT_USE_OWN_CARET
 
 
 #if wxRICHTEXT_USE_OWN_CARET
 


@@ -67,18 +80,30 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET)
  * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
  */
 
  * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
  */
 

+class wxRichTextCaret;
+class wxRichTextCaretTimer: public wxTimer
+{
+  public:
+    wxRichTextCaretTimer(wxRichTextCaret* caret)
+    {
+        m_caret = caret;
+    }
+    virtual void Notify();
+    wxRichTextCaret* m_caret;
+};
+

 class wxRichTextCaret: public wxCaret
 {
 public:
     // ctors
     // -----
         // default - use Create()
 class wxRichTextCaret: public wxCaret
 {
 public:
     // ctors
     // -----
         // default - use Create()

-    wxRichTextCaret() { Init(); }
+    wxRichTextCaret(): m_timer(this)  { Init(); }

         // creates a block caret associated with the given window
     wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
         // creates a block caret associated with the given window
     wxRichTextCaret(wxRichTextCtrl *window, int width, int height)

-        : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+        : wxCaret(window, width, height), m_timer(this) { Init(); m_richTextCtrl = window; }

     wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
     wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)

-        : wxCaret(window, size) { Init(); m_richTextCtrl = window; }
+        : wxCaret(window, size), m_timer(this) { Init(); m_richTextCtrl = window; }

 
     virtual ~wxRichTextCaret();
 
 
     virtual ~wxRichTextCaret();
 


@@ -99,6 +124,11 @@ public:
     bool GetNeedsUpdate() const { return m_needsUpdate; }
     void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
 
     bool GetNeedsUpdate() const { return m_needsUpdate; }
     void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
 

+    void Notify();
+
+    bool GetRefreshEnabled() const { return m_refreshEnabled; }
+    void EnableRefresh(bool b) { m_refreshEnabled = b; }
+

 protected:
     virtual void DoShow();
     virtual void DoHide();
 protected:
     virtual void DoShow();
     virtual void DoHide();


@@ -115,14 +145,16 @@ private:
                   m_yOld;
     bool          m_hasFocus;       // true => our window has focus
     bool          m_needsUpdate;    // must be repositioned
                   m_yOld;
     bool          m_hasFocus;       // true => our window has focus
     bool          m_needsUpdate;    // must be repositioned

-
+    bool          m_flashOn;
+    wxRichTextCaretTimer m_timer;

     wxRichTextCtrl* m_richTextCtrl;
     wxRichTextCtrl* m_richTextCtrl;

+    bool          m_refreshEnabled;

 };
 #endif
 
 };
 #endif
 

-IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextCtrl, wxControl )

 
 

-IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
+IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )

 
 BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_PAINT(wxRichTextCtrl::OnPaint)
 
 BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_PAINT(wxRichTextCtrl::OnPaint)


@@ -136,6 +168,7 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_MIDDLE_DOWN(wxRichTextCtrl::OnMiddleClick)
     EVT_LEFT_DCLICK(wxRichTextCtrl::OnLeftDClick)
     EVT_CHAR(wxRichTextCtrl::OnChar)
     EVT_MIDDLE_DOWN(wxRichTextCtrl::OnMiddleClick)
     EVT_LEFT_DCLICK(wxRichTextCtrl::OnLeftDClick)
     EVT_CHAR(wxRichTextCtrl::OnChar)

+    EVT_KEY_DOWN(wxRichTextCtrl::OnChar)

     EVT_SIZE(wxRichTextCtrl::OnSize)
     EVT_SET_FOCUS(wxRichTextCtrl::OnSetFocus)
     EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus)
     EVT_SIZE(wxRichTextCtrl::OnSize)
     EVT_SET_FOCUS(wxRichTextCtrl::OnSetFocus)
     EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus)


@@ -163,6 +196,16 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
 
     EVT_MENU(wxID_SELECTALL, wxRichTextCtrl::OnSelectAll)
     EVT_UPDATE_UI(wxID_SELECTALL, wxRichTextCtrl::OnUpdateSelectAll)
 
     EVT_MENU(wxID_SELECTALL, wxRichTextCtrl::OnSelectAll)
     EVT_UPDATE_UI(wxID_SELECTALL, wxRichTextCtrl::OnUpdateSelectAll)

+
+    EVT_MENU(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnProperties)
+    EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnUpdateProperties)
+
+    EVT_MENU(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnProperties)
+    EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnUpdateProperties)
+
+    EVT_MENU(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnProperties)
+    EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnUpdateProperties)
+

 END_EVENT_TABLE()
 
 /*!
 END_EVENT_TABLE()
 
 /*!


@@ -195,35 +238,41 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent,
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {

+    style |= wxVSCROLL;
+

     if (!wxControl::Create(parent, id, pos, size,
                            style|wxFULL_REPAINT_ON_RESIZE,
                            validator, name))
         return false;
 
     if (!wxControl::Create(parent, id, pos, size,
                            style|wxFULL_REPAINT_ON_RESIZE,
                            validator, name))
         return false;
 

-    if (!GetFont().Ok())
+    if (!GetFont().IsOk())

     {
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     }
 
     {
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     }
 

+    // No physical scrolling, so we can preserve margins
+    EnableScrolling(false, false);
+

     if (style & wxTE_READONLY)
         SetEditable(false);
 
     // The base attributes must all have default values
     if (style & wxTE_READONLY)
         SetEditable(false);
 
     // The base attributes must all have default values

-    wxTextAttr attributes;
+    wxRichTextAttr attributes;

     attributes.SetFont(GetFont());
     attributes.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     attributes.SetLineSpacing(10);
     attributes.SetParagraphSpacingAfter(10);
     attributes.SetParagraphSpacingBefore(0);
     attributes.SetFont(GetFont());
     attributes.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     attributes.SetLineSpacing(10);
     attributes.SetParagraphSpacingAfter(10);
     attributes.SetParagraphSpacingBefore(0);

-    attributes.SetTextEffects(0);
-    attributes.SetTextEffectFlags(wxTEXT_ATTR_EFFECT_STRIKETHROUGH|wxTEXT_ATTR_EFFECT_CAPITALS);

 
     SetBasicStyle(attributes);
 
 
     SetBasicStyle(attributes);
 

+    int margin = 5;
+    SetMargins(margin, margin);
+

     // The default attributes will be merged with base attributes, so
     // can be empty to begin with
     // The default attributes will be merged with base attributes, so
     // can be empty to begin with

-    wxTextAttr defaultAttributes;
+    wxRichTextAttr defaultAttributes;

     SetDefaultStyle(defaultAttributes);
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetDefaultStyle(defaultAttributes);
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));


@@ -257,21 +306,41 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     GetBuffer().AddEventHandler(this);
 
     // Accelerators
     GetBuffer().AddEventHandler(this);
 
     // Accelerators

-    wxAcceleratorEntry entries[4];
+    wxAcceleratorEntry entries[6];

 
 

-    entries[0].Set(wxACCEL_CMD,   (int) 'C',       wxID_COPY);
-    entries[1].Set(wxACCEL_CMD,   (int) 'X',       wxID_CUT);
-    entries[2].Set(wxACCEL_CMD,   (int) 'V',       wxID_PASTE);
-    entries[3].Set(wxACCEL_CMD,   (int) 'A',       wxID_SELECTALL);
+    entries[0].Set(wxACCEL_CTRL,   (int) 'C',       wxID_COPY);
+    entries[1].Set(wxACCEL_CTRL,   (int) 'X',       wxID_CUT);
+    entries[2].Set(wxACCEL_CTRL,   (int) 'V',       wxID_PASTE);
+    entries[3].Set(wxACCEL_CTRL,   (int) 'A',       wxID_SELECTALL);
+    entries[4].Set(wxACCEL_CTRL,   (int) 'Z',       wxID_UNDO);
+    entries[5].Set(wxACCEL_CTRL,   (int) 'Y',       wxID_REDO);

 
 

-    wxAcceleratorTable accel(4, entries);
+    wxAcceleratorTable accel(6, entries);

     SetAcceleratorTable(accel);
 
     SetAcceleratorTable(accel);
 

+    m_contextMenu = new wxMenu;
+    m_contextMenu->Append(wxID_UNDO, _("&Undo"));
+    m_contextMenu->Append(wxID_REDO, _("&Redo"));
+    m_contextMenu->AppendSeparator();
+    m_contextMenu->Append(wxID_CUT, _("Cu&t"));
+    m_contextMenu->Append(wxID_COPY, _("&Copy"));
+    m_contextMenu->Append(wxID_PASTE, _("&Paste"));
+    m_contextMenu->Append(wxID_CLEAR, _("&Delete"));
+    m_contextMenu->AppendSeparator();
+    m_contextMenu->Append(wxID_SELECTALL, _("Select &All"));
+    m_contextMenu->AppendSeparator();
+    m_contextMenu->Append(wxID_RICHTEXT_PROPERTIES1, _("&Properties"));
+
+#if wxUSE_DRAG_AND_DROP
+    SetDropTarget(new wxRichTextDropTarget(this));
+#endif
+

     return true;
 }
 
 wxRichTextCtrl::~wxRichTextCtrl()
 {
     return true;
 }
 
 wxRichTextCtrl::~wxRichTextCtrl()
 {

+    SetFocusObject(& GetBuffer(), false);

     GetBuffer().RemoveEventHandler(this);
 
     delete m_contextMenu;
     GetBuffer().RemoveEventHandler(this);
 
     delete m_contextMenu;


@@ -283,36 +352,52 @@ void wxRichTextCtrl::Init()
     m_contextMenu = NULL;
     m_caret = NULL;
     m_caretPosition = -1;
     m_contextMenu = NULL;
     m_caret = NULL;
     m_caretPosition = -1;

-    m_selectionRange.SetRange(-2, -2);

     m_selectionAnchor = -2;
     m_selectionAnchor = -2;

+    m_selectionAnchorObject = NULL;
+    m_selectionState = wxRichTextCtrlSelectionState_Normal;

     m_editable = true;
     m_editable = true;

+    m_verticalScrollbarEnabled = true;

     m_caretAtLineStart = false;
     m_dragging = false;
     m_caretAtLineStart = false;
     m_dragging = false;

+#if wxUSE_DRAG_AND_DROP
+    m_preDrag = false;
+#endif

     m_fullLayoutRequired = false;
     m_fullLayoutTime = 0;
     m_fullLayoutSavedPosition = 0;
     m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
     m_caretPositionForDefaultStyle = -2;
     m_fullLayoutRequired = false;
     m_fullLayoutTime = 0;
     m_fullLayoutSavedPosition = 0;
     m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
     m_caretPositionForDefaultStyle = -2;

+    m_focusObject = & m_buffer;

 }
 
 void wxRichTextCtrl::DoThaw()
 {
 }
 
 void wxRichTextCtrl::DoThaw()
 {

-    if (GetBuffer().GetDirty())
+    if (GetBuffer().IsDirty())

         LayoutContent();
     else
         SetupScrollbars();
         LayoutContent();
     else
         SetupScrollbars();

-    Refresh(false);
+
+    wxWindow::DoThaw();

 }
 
 /// Clear all text
 void wxRichTextCtrl::Clear()
 {
 }
 
 /// Clear all text
 void wxRichTextCtrl::Clear()
 {

-    m_buffer.ResetAndClearCommands();
-    m_buffer.SetDirty(true);
+    if (GetFocusObject() == & GetBuffer())
+    {
+        m_buffer.ResetAndClearCommands();
+        m_buffer.Invalidate(wxRICHTEXT_ALL);
+    }
+    else
+    {
+        GetFocusObject()->Reset();
+    }
+

     m_caretPosition = -1;
     m_caretPositionForDefaultStyle = -2;
     m_caretAtLineStart = false;
     m_caretPosition = -1;
     m_caretPositionForDefaultStyle = -2;
     m_caretAtLineStart = false;

-    m_selectionRange.SetRange(-2, -2);
+    m_selection.Reset();
+    m_selectionState = wxRichTextCtrlSelectionState_Normal;

 
     Scroll(0,0);
 
 
     Scroll(0,0);
 


@@ -331,6 +416,11 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 #if !wxRICHTEXT_USE_OWN_CARET
     if (GetCaret() && !IsFrozen())
         GetCaret()->Hide();
 #if !wxRICHTEXT_USE_OWN_CARET
     if (GetCaret() && !IsFrozen())
         GetCaret()->Hide();

+#else
+    // Stop the caret refreshing the control from within the
+    // paint handler
+    if (GetCaret())
+        ((wxRichTextCaret*) GetCaret())->EnableRefresh(false);

 #endif
 
     {
 #endif
 
     {


@@ -356,17 +446,37 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition()));
 
         wxRect availableSpace(GetClientSize());
         drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition()));
 
         wxRect availableSpace(GetClientSize());

-        if (GetBuffer().GetDirty())
+        wxRichTextDrawingContext context(& GetBuffer());
+        if (GetBuffer().IsDirty())

         {
         {

-            GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
-            GetBuffer().SetDirty(false);
+            GetBuffer().Layout(dc, context, availableSpace, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
+            GetBuffer().Invalidate(wxRICHTEXT_NONE);

             SetupScrollbars();
         }
 
             SetupScrollbars();
         }
 

-        GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
+        wxRect clipRect(availableSpace);
+        clipRect.x += GetBuffer().GetLeftMargin();
+        clipRect.y += GetBuffer().GetTopMargin();
+        clipRect.width -= (GetBuffer().GetLeftMargin() + GetBuffer().GetRightMargin());
+        clipRect.height -= (GetBuffer().GetTopMargin() + GetBuffer().GetBottomMargin());
+        clipRect.SetPosition(GetLogicalPoint(clipRect.GetPosition()));
+        dc.SetClippingRegion(clipRect);
+
+        int flags = 0;
+        if ((GetExtraStyle() & wxRICHTEXT_EX_NO_GUIDELINES) == 0)
+            flags |= wxRICHTEXT_DRAW_GUIDELINES;
+
+        GetBuffer().Draw(dc, context, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags);
+
+        dc.DestroyClippingRegion();
+
+        // Other user defined painting after everything else (i.e. all text) is painted
+        PaintAboveContent(dc);
+

 #if wxRICHTEXT_USE_OWN_CARET
         if (GetCaret()->IsVisible())
         {
 #if wxRICHTEXT_USE_OWN_CARET
         if (GetCaret()->IsVisible())
         {

+            PositionCaret();

             ((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
         }
 #endif
             ((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
         }
 #endif


@@ -376,6 +486,9 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     if (GetCaret())
         GetCaret()->Show();
     PositionCaret();
     if (GetCaret())
         GetCaret()->Show();
     PositionCaret();

+#else
+    if (GetCaret())
+        ((wxRichTextCaret*) GetCaret())->EnableRefresh(true);

 #endif
 }
 
 #endif
 }
 


@@ -422,6 +535,33 @@ void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
     m_dragging = false;
 }
 
     m_dragging = false;
 }
 

+// Set up the caret for the given position and container, after a mouse click
+bool wxRichTextCtrl::SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection)
+{
+    bool caretAtLineStart = false;
+
+    if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE)
+    {
+        // If we're at the start of a line (but not first in para)
+        // then we should keep the caret showing at the start of the line
+        // by showing the m_caretAtLineStart flag.
+        wxRichTextParagraph* para = container->GetParagraphAtPosition(position);
+        wxRichTextLine* line = container->GetLineAtPosition(position);
+
+        if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
+            caretAtLineStart = true;
+        position --;
+    }
+
+    if (extendSelection && (m_caretPosition != position))
+        ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+
+    MoveCaret(position, caretAtLineStart);
+    SetDefaultStyleToCursorStyle();
+
+    return true;
+}
+

 /// Left-click
 void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
 {
 /// Left-click
 void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
 {


@@ -431,42 +571,52 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
     PrepareDC(dc);
     dc.SetFont(GetFont());
 
     PrepareDC(dc);
     dc.SetFont(GetFont());
 

+    // TODO: detect change of focus object

     long position = 0;
     long position = 0;

-    int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position);
-
-    if (hit != wxRICHTEXT_HITTEST_NONE)
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+    wxRichTextDrawingContext context(& GetBuffer());
+    int hit = GetBuffer().HitTest(dc, context, event.GetLogicalPosition(dc), position, & hitObj, & contextObj);
+
+#if wxUSE_DRAG_AND_DROP
+    // If there's no selection, or we're not inside it, this isn't an attempt to initiate Drag'n'Drop
+    if (IsEditable() && HasSelection() && GetSelectionRange().ToInternal().Contains(position))

     {
     {

-        m_dragStart = event.GetLogicalPosition(dc);
-        m_dragging = true;
-        CaptureMouse();
+        // This might be an attempt at initiating Drag'n'Drop. So set the time & flags
+        m_preDrag = true;
+        m_dragStartPoint = event.GetPosition();   // No need to worry about logical positions etc, we only care about the distance from the original pt

 
 

-        bool caretAtLineStart = false;
+#if wxUSE_DATETIME
+        m_dragStartTime = wxDateTime::UNow();
+#endif // wxUSE_DATETIME

 
 

-        if (hit & wxRICHTEXT_HITTEST_BEFORE)
-        {
-            // If we're at the start of a line (but not first in para)
-            // then we should keep the caret showing at the start of the line
-            // by showing the m_caretAtLineStart flag.
-            wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
+        // Preserve behaviour of clicking on an object within the selection
+        if (hit != wxRICHTEXT_HITTEST_NONE && hitObj)
+            m_dragging = true;
+
+        return; // Don't skip the event, else the selection will be lost
+    }
+#endif // wxUSE_DRAG_AND_DROP

 
 

-            if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
-                caretAtLineStart = true;
-            position --;
+    if (hit != wxRICHTEXT_HITTEST_NONE && hitObj)
+    {
+        wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject();
+        wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+        if (container && container != GetFocusObject() && container->AcceptsFocus())
+        {
+            SetFocusObject(container, false /* don't set caret position yet */);

         }
 
         }
 

+        m_dragging = true;
+        CaptureMouse();
+

         long oldCaretPos = m_caretPosition;
 
         long oldCaretPos = m_caretPosition;
 

-        MoveCaret(position, caretAtLineStart);
-        SetDefaultStyleToCursorStyle();
+        SetCaretPositionAfterClick(container, position, hit);

 
 

-        if (event.ShiftDown())
-        {
-            if (m_selectionRange.GetStart() == -2)
-                ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
-            else
-                ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
-        }
+        // For now, don't handle shift-click when we're selecting multiple objects.
+        if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal)
+            ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);

         else
             SelectNone();
     }
         else
             SelectNone();
     }


@@ -490,7 +640,41 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
 
         long position = 0;
         wxPoint logicalPt = event.GetLogicalPosition(dc);
 
         long position = 0;
         wxPoint logicalPt = event.GetLogicalPosition(dc);

-        int hit = GetBuffer().HitTest(dc, logicalPt, position);
+        wxRichTextObject* hitObj = NULL;
+        wxRichTextObject* contextObj = NULL;
+        wxRichTextDrawingContext context(& GetBuffer());
+        // Only get objects at this level, not nested, because otherwise we couldn't swipe text at a single level.
+        int hit = GetFocusObject()->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);
+
+#if wxUSE_DRAG_AND_DROP
+        if (m_preDrag)
+        {
+            // Preserve the behaviour that would have happened without drag-and-drop detection, in OnLeftClick
+            m_preDrag = false; // Tell DnD not to happen now: we are processing Left Up ourselves.
+
+            // Do the actions that would have been done in OnLeftClick if we hadn't tried to drag
+            long position = 0;
+            wxRichTextObject* hitObj = NULL;
+            wxRichTextObject* contextObj = NULL;
+            int hit = GetBuffer().HitTest(dc, context, event.GetLogicalPosition(dc), position, & hitObj, & contextObj);
+            wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject();
+            wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+            if (container && container != GetFocusObject() && container->AcceptsFocus())
+            {
+                SetFocusObject(container, false /* don't set caret position yet */);
+            }
+
+            long oldCaretPos = m_caretPosition;
+
+            SetCaretPositionAfterClick(container, position, hit);
+
+            // For now, don't handle shift-click when we're selecting multiple objects.
+            if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal)
+                ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
+            else
+                SelectNone();
+        }
+#endif

 
         if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
         {
 
         if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
         {


@@ -498,11 +682,13 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                 wxEVT_COMMAND_RICHTEXT_LEFT_CLICK,
                 GetId());
             cmdEvent.SetEventObject(this);
                 wxEVT_COMMAND_RICHTEXT_LEFT_CLICK,
                 GetId());
             cmdEvent.SetEventObject(this);

-            cmdEvent.SetPosition(m_caretPosition+1);
+            cmdEvent.SetPosition(position);
+            if (hitObj)
+                cmdEvent.SetContainer(hitObj->GetContainer());

 
             if (!GetEventHandler()->ProcessEvent(cmdEvent))
             {
 
             if (!GetEventHandler()->ProcessEvent(cmdEvent))
             {

-                wxTextAttr attr;
+                wxRichTextAttr attr;

                 if (GetStyle(position, attr))
                 {
                     if (attr.HasFlag(wxTEXT_ATTR_URL))
                 if (GetStyle(position, attr))
                 {
                     if (attr.HasFlag(wxTEXT_ATTR_URL))


@@ -513,7 +699,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                             wxMouseEvent mouseEvent(event);
 
                             long startPos = 0, endPos = 0;
                             wxMouseEvent mouseEvent(event);
 
                             long startPos = 0, endPos = 0;

-                            wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
+                            wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(position);

                             if (obj)
                             {
                                 startPos = obj->GetRange().GetStart();
                             if (obj)
                             {
                                 startPos = obj->GetRange().GetStart();


@@ -532,36 +718,126 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
             }
         }
     }
             }
         }
     }

+
+#if wxUSE_DRAG_AND_DROP
+    m_preDrag = false;
+#endif // wxUSE_DRAG_AND_DROP
+
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ && wxHAVE_PRIMARY_SELECTION
+    if (HasSelection() && GetFocusObject() && GetFocusObject()->GetBuffer())
+    {
+        // Put the selection in PRIMARY, if it exists
+        wxTheClipboard->UsePrimarySelection(true);
+
+        wxRichTextRange range = GetInternalSelectionRange();
+        GetFocusObject()->GetBuffer()->CopyToClipboard(range);
+
+        wxTheClipboard->UsePrimarySelection(false);
+    }
+#endif

 }
 
 }
 

-/// Left-click
+/// Mouse-movements

 void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
 {
 void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
 {

+#if wxUSE_DRAG_AND_DROP
+    // See if we're starting Drag'n'Drop
+    if (m_preDrag)
+    {
+        int x = m_dragStartPoint.x - event.GetPosition().x;
+        int y = m_dragStartPoint.y - event.GetPosition().y;
+        size_t distance = abs(x) + abs(y);
+#if wxUSE_DATETIME
+        wxTimeSpan diff = wxDateTime::UNow() - m_dragStartTime;
+#endif
+        if ((distance > 10)
+#if wxUSE_DATETIME
+             && (diff.GetMilliseconds() > 100)
+#endif
+           )
+        {
+            m_dragging = false;
+
+            // Start drag'n'drop
+            wxRichTextRange range = GetInternalSelectionRange();
+            if (range == wxRICHTEXT_NONE)
+            {
+              // Don't try to drag an empty range
+              m_preDrag = false;
+              return;
+            }
+
+            // Cache the current situation, to be restored if Drag'n'Drop is cancelled
+            long oldPos = GetCaretPosition();
+            wxRichTextParagraphLayoutBox* oldFocus = GetFocusObject();
+
+            wxDataObjectComposite* compositeObject = new wxDataObjectComposite();
+            wxString text = GetFocusObject()->GetTextForRange(range);
+#ifdef __WXMSW__
+            text = wxTextFile::Translate(text, wxTextFileType_Dos);
+#endif
+            compositeObject->Add(new wxTextDataObject(text), false /* not preferred */);
+
+            wxRichTextBuffer* richTextBuf = new wxRichTextBuffer;
+            GetFocusObject()->CopyFragment(range, *richTextBuf);
+            compositeObject->Add(new wxRichTextBufferDataObject(richTextBuf), true /* preferred */);
+
+            wxRichTextDropSource source(*compositeObject, this);
+            // Use wxDrag_DefaultMove, not because it's the likelier choice but because pressing Ctrl for Copy obeys the principle of least surprise
+            // The alternative, wxDrag_DefaultCopy, requires the user to know that Move needs the Shift key pressed
+            BeginBatchUndo(_("Drag"));
+            switch (source.DoDragDrop(wxDrag_AllowMove | wxDrag_DefaultMove))
+            {
+                case wxDragMove:
+                case wxDragCopy:  break;
+
+                case wxDragError:
+                    wxLogError(wxT("An error occurred during drag and drop operation"));
+                case wxDragNone:
+                case wxDragCancel:
+                    Refresh(); // This is needed in wxMSW, otherwise resetting the position doesn't 'take'
+                    SetCaretPosition(oldPos);
+                    SetFocusObject(oldFocus, false);
+                default: break;
+            }
+            EndBatchUndo();
+
+            m_preDrag = false;
+            return;
+        }
+    }
+#endif // wxUSE_DRAG_AND_DROP
+

     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
 
     long position = 0;
     wxPoint logicalPt = event.GetLogicalPosition(dc);
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
 
     long position = 0;
     wxPoint logicalPt = event.GetLogicalPosition(dc);

-    int hit = GetBuffer().HitTest(dc, logicalPt, position);
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+
+    int flags = 0;
+
+    // If we're dragging, let's only consider positions at this level; otherwise
+    // selecting a range is not going to work.
+    wxRichTextParagraphLayoutBox* container = & GetBuffer();
+    if (m_dragging)
+    {
+        flags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS;
+        container = GetFocusObject();
+    }
+    wxRichTextDrawingContext context(& GetBuffer());
+    int hit = container->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj, flags);

 
     // See if we need to change the cursor
 
     {
 
     // See if we need to change the cursor
 
     {

-        if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
+        if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj)

         {
         {

-            wxTextAttr attr;
-            if (GetStyle(position, attr))
-            {
-                if (attr.HasFlag(wxTEXT_ATTR_URL))
-                {
-                    SetCursor(m_urlCursor);
-                }
-                else if (!attr.HasFlag(wxTEXT_ATTR_URL))
-                {
-                    SetCursor(m_textCursor);
-                }
-            }
+            wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+            if (actualContainer)
+                ProcessMouseMovement(actualContainer, hitObj, position, logicalPt);

         }
         else
             SetCursor(m_textCursor);
         }
         else
             SetCursor(m_textCursor);


@@ -573,33 +849,92 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
         return;
     }
 
         return;
     }
 

-    if (m_dragging && hit != wxRICHTEXT_HITTEST_NONE)
+    if (m_dragging
+#if wxUSE_DRAG_AND_DROP
+        && !m_preDrag
+#endif
+        )

     {
     {

-        // TODO: test closeness
+        wxRichTextParagraphLayoutBox* commonAncestor = NULL;
+        wxRichTextParagraphLayoutBox* otherContainer = NULL;
+        wxRichTextParagraphLayoutBox* firstContainer = NULL;
+
+        // Check for dragging across multiple containers
+        long position2 = 0;
+        wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL;
+        int hit2 = GetBuffer().HitTest(dc, context, logicalPt, position2, & hitObj2, & contextObj2, 0);
+        if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2)
+        {
+            // See if we can find a common ancestor
+            if (m_selectionState == wxRichTextCtrlSelectionState_Normal)
+            {
+                firstContainer = GetFocusObject();
+                commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox);
+            }
+            else
+            {
+                firstContainer = wxDynamicCast(m_selectionAnchorObject, wxRichTextParagraphLayoutBox);
+                //commonAncestor = GetFocusObject(); // when the selection state is not normal, the focus object (e.g. table)
+                                                   // is the common ancestor.
+                commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox);
+            }

 
 

-        bool caretAtLineStart = false;
+            if (commonAncestor && commonAncestor->HandlesChildSelections())
+            {
+                wxRichTextObject* p = hitObj2;
+                while (p)
+                {
+                    if (p->GetParent() == commonAncestor)
+                    {
+                        otherContainer = wxDynamicCast(p, wxRichTextParagraphLayoutBox);
+                        break;
+                    }
+                    p = p->GetParent();
+                }
+            }

 
 

-        if (hit & wxRICHTEXT_HITTEST_BEFORE)
-        {
-            // If we're at the start of a line (but not first in para)
-            // then we should keep the caret showing at the start of the line
-            // by showing the m_caretAtLineStart flag.
-            wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
+            if (commonAncestor && firstContainer && otherContainer)
+            {
+                // We have now got a second container that shares a parent with the current or anchor object.
+                if (m_selectionState == wxRichTextCtrlSelectionState_Normal)
+                {
+                    // Don't go into common-ancestor selection mode if we still have the same
+                    // container.
+                    if (otherContainer != firstContainer)
+                    {
+                        m_selectionState = wxRichTextCtrlSelectionState_CommonAncestor;
+                        m_selectionAnchorObject = firstContainer;
+                        m_selectionAnchor = firstContainer->GetRange().GetStart();

 
 

-            if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
-                caretAtLineStart = true;
-            position --;
-        }
+                        // The common ancestor, such as a table, returns the cell selection
+                        // between the anchor and current position.
+                        m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart());
+                    }
+                }
+                else
+                {
+                    m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart());
+                }

 
 

-        if (m_caretPosition != position)
-        {
-            ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+                Refresh();

 
 

-            MoveCaret(position, caretAtLineStart);
-            SetDefaultStyleToCursorStyle();
+                if (otherContainer->AcceptsFocus())
+                    SetFocusObject(otherContainer, false /* don't set caret and clear selection */);
+                MoveCaret(-1, false);
+                SetDefaultStyleToCursorStyle();
+            }

         }
     }
         }
     }

+
+    if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal
+#if wxUSE_DRAG_AND_DROP
+        && !m_preDrag
+#endif
+        )
+    {
+        // TODO: test closeness
+        SetCaretPositionAfterClick(container, position, hit, true /* extend selection */);
+    }

 }
 
 /// Right-click
 }
 
 /// Right-click


@@ -607,11 +942,34 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event)
 {
     SetFocus();
 
 {
     SetFocus();
 

+    wxClientDC dc(this);
+    PrepareDC(dc);
+    dc.SetFont(GetFont());
+
+    long position = 0;
+    wxPoint logicalPt = event.GetLogicalPosition(dc);
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+    wxRichTextDrawingContext context(& GetBuffer());
+    int hit = GetFocusObject()->HitTest(dc, context, logicalPt, position, & hitObj, & contextObj);
+
+    if (hitObj && hitObj->GetContainer() != GetFocusObject())
+    {
+        wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+        if (actualContainer && actualContainer->AcceptsFocus())
+        {
+            SetFocusObject(actualContainer, false /* don't set caret position yet */);
+            SetCaretPositionAfterClick(actualContainer, position, hit);
+        }
+    }
+

     wxRichTextEvent cmdEvent(
         wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK,
         GetId());
     cmdEvent.SetEventObject(this);
     wxRichTextEvent cmdEvent(
         wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK,
         GetId());
     cmdEvent.SetEventObject(this);

-    cmdEvent.SetPosition(m_caretPosition+1);
+    cmdEvent.SetPosition(position);
+    if (hitObj)
+        cmdEvent.SetContainer(hitObj->GetContainer());

 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();
 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();


@@ -625,6 +983,7 @@ void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event))
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);

+    cmdEvent.SetContainer(GetFocusObject());

 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
     {
 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
     {


@@ -640,9 +999,17 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event)
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);

+    cmdEvent.SetContainer(GetFocusObject());

 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();
 
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();

+
+#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ && wxHAVE_PRIMARY_SELECTION
+    // Paste any PRIMARY selection, if it exists
+    wxTheClipboard->UsePrimarySelection(true);
+    Paste();
+    wxTheClipboard->UsePrimarySelection(false);
+#endif

 }
 
 /// Key press
 }
 
 /// Key press


@@ -656,25 +1023,177 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
     if (event.AltDown())
         flags |= wxRICHTEXT_ALT_DOWN;
 
     if (event.AltDown())
         flags |= wxRICHTEXT_ALT_DOWN;
 

-    if (event.GetKeyCode() == WXK_LEFT ||
-        event.GetKeyCode() == WXK_RIGHT ||
-        event.GetKeyCode() == WXK_UP ||
-        event.GetKeyCode() == WXK_DOWN ||
-        event.GetKeyCode() == WXK_HOME ||
-        event.GetKeyCode() == WXK_PAGEUP ||
-        event.GetKeyCode() == WXK_PAGEDOWN ||
-        event.GetKeyCode() == WXK_END ||
-
-        event.GetKeyCode() == WXK_NUMPAD_LEFT ||
-        event.GetKeyCode() == WXK_NUMPAD_RIGHT ||
-        event.GetKeyCode() == WXK_NUMPAD_UP ||
-        event.GetKeyCode() == WXK_NUMPAD_DOWN ||
-        event.GetKeyCode() == WXK_NUMPAD_HOME ||
-        event.GetKeyCode() == WXK_NUMPAD_PAGEUP ||
-        event.GetKeyCode() == WXK_NUMPAD_PAGEDOWN ||
-        event.GetKeyCode() == WXK_NUMPAD_END)
-    {
-        KeyboardNavigate(event.GetKeyCode(), flags);
+    if (event.GetEventType() == wxEVT_KEY_DOWN)
+    {
+        if (event.IsKeyInCategory(WXK_CATEGORY_NAVIGATION))
+        {
+            KeyboardNavigate(event.GetKeyCode(), flags);
+            return;
+        }
+
+        long keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_ESCAPE:
+            case WXK_START:
+            case WXK_LBUTTON:
+            case WXK_RBUTTON:
+            case WXK_CANCEL:
+            case WXK_MBUTTON:
+            case WXK_CLEAR:
+            case WXK_SHIFT:
+            case WXK_ALT:
+            case WXK_CONTROL:
+            case WXK_MENU:
+            case WXK_PAUSE:
+            case WXK_CAPITAL:
+            case WXK_END:
+            case WXK_HOME:
+            case WXK_LEFT:
+            case WXK_UP:
+            case WXK_RIGHT:
+            case WXK_DOWN:
+            case WXK_SELECT:
+            case WXK_PRINT:
+            case WXK_EXECUTE:
+            case WXK_SNAPSHOT:
+            case WXK_INSERT:
+            case WXK_HELP:
+            case WXK_F1:
+            case WXK_F2:
+            case WXK_F3:
+            case WXK_F4:
+            case WXK_F5:
+            case WXK_F6:
+            case WXK_F7:
+            case WXK_F8:
+            case WXK_F9:
+            case WXK_F10:
+            case WXK_F11:
+            case WXK_F12:
+            case WXK_F13:
+            case WXK_F14:
+            case WXK_F15:
+            case WXK_F16:
+            case WXK_F17:
+            case WXK_F18:
+            case WXK_F19:
+            case WXK_F20:
+            case WXK_F21:
+            case WXK_F22:
+            case WXK_F23:
+            case WXK_F24:
+            case WXK_NUMLOCK:
+            case WXK_SCROLL:
+            case WXK_PAGEUP:
+            case WXK_PAGEDOWN:
+            case WXK_NUMPAD_F1:
+            case WXK_NUMPAD_F2:
+            case WXK_NUMPAD_F3:
+            case WXK_NUMPAD_F4:
+            case WXK_NUMPAD_HOME:
+            case WXK_NUMPAD_LEFT:
+            case WXK_NUMPAD_UP:
+            case WXK_NUMPAD_RIGHT:
+            case WXK_NUMPAD_DOWN:
+            case WXK_NUMPAD_PAGEUP:
+            case WXK_NUMPAD_PAGEDOWN:
+            case WXK_NUMPAD_END:
+            case WXK_NUMPAD_BEGIN:
+            case WXK_NUMPAD_INSERT:
+            case WXK_WINDOWS_LEFT:
+            {
+                return;
+            }
+            default:
+            {
+            }
+        }
+
+        // Must process this before translation, otherwise it's translated into a WXK_DELETE event.
+        if (event.CmdDown() && event.GetKeyCode() == WXK_BACK)
+        {
+            if (!IsEditable())
+            {
+                return;
+            }
+
+            if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange()))
+            {
+                return;
+            }
+
+            BeginBatchUndo(_("Delete Text"));
+
+            long newPos = m_caretPosition;
+
+            bool processed = DeleteSelectedContent(& newPos);
+
+            int deletions = 0;
+            if (processed)
+                deletions ++;
+
+            // Submit range in character positions, which are greater than caret positions,
+            // so subtract 1 for deleted character and add 1 for conversion to character position.
+            if (newPos > -1)
+            {
+                if (event.CmdDown())
+                {
+                    long pos = wxRichTextCtrl::FindNextWordPosition(-1);
+                    if (pos < newPos)
+                    {
+                        wxRichTextRange range(pos+1, newPos);
+                        if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                        {
+                            GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                            deletions ++;
+                        }
+                        processed = true;
+                    }
+                }
+
+                if (!processed)
+                {
+                    wxRichTextRange range(newPos, newPos);
+                    if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                    {
+                        GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                        deletions ++;
+                    }
+                }
+            }
+
+            EndBatchUndo();
+
+            if (GetLastPosition() == -1)
+            {
+                GetFocusObject()->Reset();
+
+                m_caretPosition = -1;
+                PositionCaret();
+                SetDefaultStyleToCursorStyle();
+            }
+
+            ScrollIntoView(m_caretPosition, WXK_LEFT);
+
+            // Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
+            //if (deletions > 0)
+            {
+                wxRichTextEvent cmdEvent(
+                    wxEVT_COMMAND_RICHTEXT_DELETE,
+                    GetId());
+                cmdEvent.SetEventObject(this);
+                cmdEvent.SetFlags(flags);
+                cmdEvent.SetPosition(m_caretPosition+1);
+                cmdEvent.SetContainer(GetFocusObject());
+                GetEventHandler()->ProcessEvent(cmdEvent);
+            }
+
+            Update();
+        }
+        else
+            event.Skip();
+

         return;
     }
 
         return;
     }
 


@@ -688,20 +1207,30 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
     if (event.GetKeyCode() == WXK_RETURN)
     {
 
     if (event.GetKeyCode() == WXK_RETURN)
     {

-        BeginBatchUndo(_("Insert Text"));
+        if (!CanInsertContent(* GetFocusObject(), m_caretPosition+1))
+            return;

 
         long newPos = m_caretPosition;
 
 
         long newPos = m_caretPosition;
 

+        if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange()))
+        {
+            return;
+        }
+
+        BeginBatchUndo(_("Insert Text"));
+

         DeleteSelectedContent(& newPos);
 
         if (event.ShiftDown())
         {
             wxString text;
             text = wxRichTextLineBreakChar;
         DeleteSelectedContent(& newPos);
 
         if (event.ShiftDown())
         {
             wxString text;
             text = wxRichTextLineBreakChar;

-            GetBuffer().InsertTextWithUndo(newPos+1, text, this);
+            GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, text, this);
+            m_caretAtLineStart = true;
+            PositionCaret();

         }
         else
         }
         else

-            GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);
+            GetFocusObject()->InsertNewlineWithUndo(& GetBuffer(), newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);

 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();


@@ -714,6 +1243,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         cmdEvent.SetEventObject(this);
         cmdEvent.SetFlags(flags);
         cmdEvent.SetPosition(newPos+1);
         cmdEvent.SetEventObject(this);
         cmdEvent.SetFlags(flags);
         cmdEvent.SetPosition(newPos+1);

+        cmdEvent.SetContainer(GetFocusObject());

 
         if (!GetEventHandler()->ProcessEvent(cmdEvent))
         {
 
         if (!GetEventHandler()->ProcessEvent(cmdEvent))
         {


@@ -727,34 +1257,56 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
     }
     else if (event.GetKeyCode() == WXK_BACK)
     {
     }
     else if (event.GetKeyCode() == WXK_BACK)
     {

+        long newPos = m_caretPosition;
+
+        if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange()))
+        {
+            return;
+        }
+

         BeginBatchUndo(_("Delete Text"));
 
         BeginBatchUndo(_("Delete Text"));
 

+        bool processed = DeleteSelectedContent(& newPos);
+
+        int deletions = 0;
+        if (processed)
+            deletions ++;
+

         // Submit range in character positions, which are greater than caret positions,
         // so subtract 1 for deleted character and add 1 for conversion to character position.
         // Submit range in character positions, which are greater than caret positions,
         // so subtract 1 for deleted character and add 1 for conversion to character position.

-        if (m_caretPosition > -1 && !HasSelection())
+        if (newPos > -1)

         {
         {

-            bool processed = false;

             if (event.CmdDown())
             {
                 long pos = wxRichTextCtrl::FindNextWordPosition(-1);
             if (event.CmdDown())
             {
                 long pos = wxRichTextCtrl::FindNextWordPosition(-1);

-                if (pos != -1 && (pos < m_caretPosition))
+                if (pos < newPos)

                 {
                 {

-                    GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, m_caretPosition), this);
+                    wxRichTextRange range(pos+1, newPos);
+                    if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                    {
+                        GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                        deletions ++;
+                    }

                     processed = true;
                 }
             }
 
             if (!processed)
                     processed = true;
                 }
             }
 
             if (!processed)

-                GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition, m_caretPosition), this);
+            {
+                wxRichTextRange range(newPos, newPos);
+                if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                {
+                    GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                    deletions ++;
+                }
+            }

         }
         }

-        else
-            DeleteSelectedContent();

 
         EndBatchUndo();
 
         if (GetLastPosition() == -1)
         {
 
         EndBatchUndo();
 
         if (GetLastPosition() == -1)
         {

-            GetBuffer().Reset();
+            GetFocusObject()->Reset();

 
             m_caretPosition = -1;
             PositionCaret();
 
             m_caretPosition = -1;
             PositionCaret();


@@ -763,149 +1315,101 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
         ScrollIntoView(m_caretPosition, WXK_LEFT);
 
 
         ScrollIntoView(m_caretPosition, WXK_LEFT);
 

-        wxRichTextEvent cmdEvent(
-            wxEVT_COMMAND_RICHTEXT_DELETE,
-            GetId());
-        cmdEvent.SetEventObject(this);
-        cmdEvent.SetFlags(flags);
-        cmdEvent.SetPosition(m_caretPosition+1);
-        GetEventHandler()->ProcessEvent(cmdEvent);
+        // Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
+        //if (deletions > 0)
+        {
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_DELETE,
+                GetId());
+            cmdEvent.SetEventObject(this);
+            cmdEvent.SetFlags(flags);
+            cmdEvent.SetPosition(m_caretPosition+1);
+            cmdEvent.SetContainer(GetFocusObject());
+            GetEventHandler()->ProcessEvent(cmdEvent);
+        }

 
         Update();
     }
     else if (event.GetKeyCode() == WXK_DELETE)
     {
 
         Update();
     }
     else if (event.GetKeyCode() == WXK_DELETE)
     {

-        BeginBatchUndo(_("Delete Text"));
+        long newPos = m_caretPosition;

 
 

-        // Submit range in character positions, which are greater than caret positions,
-        if (m_caretPosition < GetBuffer().GetRange().GetEnd()+1 && !HasSelection())
+        if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange()))

         {
         {

-            GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition+1, m_caretPosition+1), this);
+            return;

         }
         }

-        else
-            DeleteSelectedContent();

 
 

-        EndBatchUndo();
+        BeginBatchUndo(_("Delete Text"));

 
 

-        if (GetLastPosition() == -1)
+        bool processed = DeleteSelectedContent(& newPos);
+
+        int deletions = 0;
+        if (processed)
+            deletions ++;
+
+        // Submit range in character positions, which are greater than caret positions,
+        if (newPos < GetFocusObject()->GetOwnRange().GetEnd()+1)

         {
         {

-            GetBuffer().Reset();
+            if (event.CmdDown())
+            {
+                long pos = wxRichTextCtrl::FindNextWordPosition(1);
+                if (pos != -1 && (pos > newPos))
+                {
+                    wxRichTextRange range(newPos+1, pos);
+                    if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                    {
+                        GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                        deletions ++;
+                    }
+                    processed = true;
+                }
+            }

 
 

-            m_caretPosition = -1;
-            PositionCaret();
-            SetDefaultStyleToCursorStyle();
+            if (!processed && newPos < (GetLastPosition()-1))
+            {
+                wxRichTextRange range(newPos+1, newPos+1);
+                if (CanDeleteRange(* GetFocusObject(), range.FromInternal()))
+                {
+                    GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+                    deletions ++;
+                }
+            }

         }
 
         }
 

-        wxRichTextEvent cmdEvent(
-            wxEVT_COMMAND_RICHTEXT_DELETE,
-            GetId());
-        cmdEvent.SetEventObject(this);
-        cmdEvent.SetFlags(flags);
-        cmdEvent.SetPosition(m_caretPosition+1);
-        GetEventHandler()->ProcessEvent(cmdEvent);
-
-        Update();
-    }
-    else
-    {
-        long keycode = event.GetKeyCode();
-        switch ( keycode )
-        {
-            case WXK_ESCAPE:
-            case WXK_DELETE:
-            case WXK_START:
-            case WXK_LBUTTON:
-            case WXK_RBUTTON:
-            case WXK_CANCEL:
-            case WXK_MBUTTON:
-            case WXK_CLEAR:
-            case WXK_SHIFT:
-            case WXK_ALT:
-            case WXK_CONTROL:
-            case WXK_MENU:
-            case WXK_PAUSE:
-            case WXK_CAPITAL:
-            case WXK_END:
-            case WXK_HOME:
-            case WXK_LEFT:
-            case WXK_UP:
-            case WXK_RIGHT:
-            case WXK_DOWN:
-            case WXK_SELECT:
-            case WXK_PRINT:
-            case WXK_EXECUTE:
-            case WXK_SNAPSHOT:
-            case WXK_INSERT:
-            case WXK_HELP:
-            case WXK_NUMPAD0:
-            case WXK_NUMPAD1:
-            case WXK_NUMPAD2:
-            case WXK_NUMPAD3:
-            case WXK_NUMPAD4:
-            case WXK_NUMPAD5:
-            case WXK_NUMPAD6:
-            case WXK_NUMPAD7:
-            case WXK_NUMPAD8:
-            case WXK_NUMPAD9:
-            case WXK_MULTIPLY:
-            case WXK_ADD:
-            case WXK_SEPARATOR:
-            case WXK_SUBTRACT:
-            case WXK_DECIMAL:
-            case WXK_DIVIDE:
-            case WXK_F1:
-            case WXK_F2:
-            case WXK_F3:
-            case WXK_F4:
-            case WXK_F5:
-            case WXK_F6:
-            case WXK_F7:
-            case WXK_F8:
-            case WXK_F9:
-            case WXK_F10:
-            case WXK_F11:
-            case WXK_F12:
-            case WXK_F13:
-            case WXK_F14:
-            case WXK_F15:
-            case WXK_F16:
-            case WXK_F17:
-            case WXK_F18:
-            case WXK_F19:
-            case WXK_F20:
-            case WXK_F21:
-            case WXK_F22:
-            case WXK_F23:
-            case WXK_F24:
-            case WXK_NUMLOCK:
-            case WXK_SCROLL:
-            case WXK_PAGEUP:
-            case WXK_PAGEDOWN:
-            case WXK_NUMPAD_SPACE:
-            case WXK_NUMPAD_TAB:
-            case WXK_NUMPAD_ENTER:
-            case WXK_NUMPAD_F1:
-            case WXK_NUMPAD_F2:
-            case WXK_NUMPAD_F3:
-            case WXK_NUMPAD_F4:
-            case WXK_NUMPAD_HOME:
-            case WXK_NUMPAD_LEFT:
-            case WXK_NUMPAD_UP:
-            case WXK_NUMPAD_RIGHT:
-            case WXK_NUMPAD_DOWN:
-            case WXK_NUMPAD_PAGEUP:
-            case WXK_NUMPAD_PAGEDOWN:
-            case WXK_NUMPAD_END:
-            case WXK_NUMPAD_BEGIN:
-            case WXK_NUMPAD_INSERT:
-            case WXK_NUMPAD_DELETE:
-            case WXK_NUMPAD_EQUAL:
-            case WXK_NUMPAD_MULTIPLY:
-            case WXK_NUMPAD_ADD:
-            case WXK_NUMPAD_SEPARATOR:
-            case WXK_NUMPAD_SUBTRACT:
-            case WXK_NUMPAD_DECIMAL:
-            case WXK_WINDOWS_LEFT:
+        EndBatchUndo();
+
+        if (GetLastPosition() == -1)
+        {
+            GetFocusObject()->Reset();
+
+            m_caretPosition = -1;
+            PositionCaret();
+            SetDefaultStyleToCursorStyle();
+        }
+
+        ScrollIntoView(m_caretPosition, WXK_LEFT);
+
+        // Always send this event; wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED will be sent only if there is an actual deletion.
+        //if (deletions > 0)
+        {
+            wxRichTextEvent cmdEvent(
+                wxEVT_COMMAND_RICHTEXT_DELETE,
+                GetId());
+            cmdEvent.SetEventObject(this);
+            cmdEvent.SetFlags(flags);
+            cmdEvent.SetPosition(m_caretPosition+1);
+            cmdEvent.SetContainer(GetFocusObject());
+            GetEventHandler()->ProcessEvent(cmdEvent);
+        }
+
+        Update();
+    }
+    else
+    {
+        long keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_ESCAPE:

             {
                 event.Skip();
                 return;
             {
                 event.Skip();
                 return;


@@ -913,7 +1417,12 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
             default:
             {
 
             default:
             {

-                if (event.CmdDown() || event.AltDown())
+#ifdef __WXMAC__
+                if (event.CmdDown())
+#else
+                // Fixes AltGr+key with European input languages on Windows
+                if ((event.CmdDown() && !event.AltDown()) || (event.AltDown() && !event.CmdDown()))
+#endif

                 {
                     event.Skip();
                     return;
                 {
                     event.Skip();
                     return;


@@ -930,13 +1439,14 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                 cmdEvent.SetCharacter((wxChar) keycode);
 #endif
                 cmdEvent.SetPosition(m_caretPosition+1);
                 cmdEvent.SetCharacter((wxChar) keycode);
 #endif
                 cmdEvent.SetPosition(m_caretPosition+1);

+                cmdEvent.SetContainer(GetFocusObject());

 
                 if (keycode == wxT('\t'))
                 {
                     // See if we need to promote or demote the selection or paragraph at the cursor
                     // position, instead of inserting a tab.
                     long pos = GetAdjustedCaretPosition(GetCaretPosition());
 
                 if (keycode == wxT('\t'))
                 {
                     // See if we need to promote or demote the selection or paragraph at the cursor
                     // position, instead of inserting a tab.
                     long pos = GetAdjustedCaretPosition(GetCaretPosition());

-                    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos);
+                    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos);

                     if (para && para->GetRange().GetStart() == pos && para->GetAttributes().HasListStyleName())
                     {
                         wxRichTextRange range;
                     if (para && para->GetRange().GetStart() == pos && para->GetAttributes().HasListStyleName())
                     {
                         wxRichTextRange range;


@@ -955,6 +1465,12 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                     }
                 }
 
                     }
                 }
 

+                if (!CanInsertContent(* GetFocusObject(), m_caretPosition+1))
+                    return;
+
+                if (HasSelection() && !CanDeleteRange(* GetFocusObject(), GetSelectionRange()))
+                    return;
+

                 BeginBatchUndo(_("Insert Text"));
 
                 long newPos = m_caretPosition;
                 BeginBatchUndo(_("Insert Text"));
 
                 long newPos = m_caretPosition;


@@ -965,13 +1481,14 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 #else
                 wxString str = (wxChar) event.GetKeyCode();
 #endif
 #else
                 wxString str = (wxChar) event.GetKeyCode();
 #endif

-                GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
+                GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, str, this, 0);

 
                 EndBatchUndo();
 
                 SetDefaultStyleToCursorStyle();
                 ScrollIntoView(m_caretPosition, WXK_RIGHT);
 
 
                 EndBatchUndo();
 
                 SetDefaultStyleToCursorStyle();
                 ScrollIntoView(m_caretPosition, WXK_RIGHT);
 

+                cmdEvent.SetPosition(m_caretPosition);

                 GetEventHandler()->ProcessEvent(cmdEvent);
 
                 Update();
                 GetEventHandler()->ProcessEvent(cmdEvent);
 
                 Update();


@@ -980,14 +1497,42 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
     }
 }
 
     }
 }
 

+bool wxRichTextCtrl::ProcessMouseMovement(wxRichTextParagraphLayoutBox* container, wxRichTextObject* WXUNUSED(obj), long position, const wxPoint& WXUNUSED(pos))
+{
+    wxRichTextAttr attr;
+    if (container && GetStyle(position, attr, container))
+    {
+        if (attr.HasFlag(wxTEXT_ATTR_URL))
+        {
+            SetCursor(m_urlCursor);
+        }
+        else if (!attr.HasFlag(wxTEXT_ATTR_URL))
+        {
+            SetCursor(m_textCursor);
+        }
+        return true;
+    }
+    else
+        return false;
+}
+

 /// Delete content if there is a selection, e.g. when pressing a key.
 bool wxRichTextCtrl::DeleteSelectedContent(long* newPos)
 {
     if (HasSelection())
     {
 /// Delete content if there is a selection, e.g. when pressing a key.
 bool wxRichTextCtrl::DeleteSelectedContent(long* newPos)
 {
     if (HasSelection())
     {

-        long pos = m_selectionRange.GetStart();
-        GetBuffer().DeleteRangeWithUndo(m_selectionRange, this);
-        m_selectionRange.SetRange(-2, -2);
+        long pos = m_selection.GetRange().GetStart();
+        wxRichTextRange range = m_selection.GetRange();
+
+        // SelectAll causes more to be selected than doing it interactively,
+        // and causes a new paragraph to be inserted. So for multiline buffers,
+        // don't delete the final position.
+        if (range.GetEnd() == GetLastPosition() && GetNumberOfLines() > 0)
+            range.SetEnd(range.GetEnd()-1);
+
+        GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+        m_selection.Reset();
+        m_selectionState = wxRichTextCtrlSelectionState_Normal;

 
         if (newPos)
             *newPos = pos-1;
 
         if (newPos)
             *newPos = pos-1;


@@ -1097,31 +1642,47 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags)
 {
     if (flags & wxRICHTEXT_SHIFT_DOWN)
     {
 {
     if (flags & wxRICHTEXT_SHIFT_DOWN)
     {

-        wxRichTextRange oldSelection = m_selectionRange;
+        if (oldPos == newPos)
+            return false;
+
+        wxRichTextSelection oldSelection = m_selection;
+
+        m_selection.SetContainer(GetFocusObject());
+
+        wxRichTextRange oldRange;
+        if (m_selection.IsValid())
+            oldRange = m_selection.GetRange();
+        else
+            oldRange = wxRICHTEXT_NO_SELECTION;
+        wxRichTextRange newRange;

 
         // If not currently selecting, start selecting
 
         // If not currently selecting, start selecting

-        if (m_selectionRange.GetStart() == -2)
+        if (oldRange.GetStart() == -2)

         {
             m_selectionAnchor = oldPos;
 
             if (oldPos > newPos)
         {
             m_selectionAnchor = oldPos;
 
             if (oldPos > newPos)

-                m_selectionRange.SetRange(newPos+1, oldPos);
+                newRange.SetRange(newPos+1, oldPos);

             else
             else

-                m_selectionRange.SetRange(oldPos+1, newPos);
+                newRange.SetRange(oldPos+1, newPos);

         }
         else
         {
             // Always ensure that the selection range start is greater than
             // the end.
             if (newPos > m_selectionAnchor)
         }
         else
         {
             // Always ensure that the selection range start is greater than
             // the end.
             if (newPos > m_selectionAnchor)

-                m_selectionRange.SetRange(m_selectionAnchor+1, newPos);
+                newRange.SetRange(m_selectionAnchor+1, newPos);
+            else if (newPos == m_selectionAnchor)
+                newRange = wxRichTextRange(-2, -2);

             else
             else

-                m_selectionRange.SetRange(newPos+1, m_selectionAnchor);
+                newRange.SetRange(newPos+1, m_selectionAnchor);

         }
 
         }
 

-        RefreshForSelectionChange(oldSelection, m_selectionRange);
+        m_selection.SetRange(newRange);
+
+        RefreshForSelectionChange(oldSelection, m_selection);

 
 

-        if (m_selectionRange.GetStart() > m_selectionRange.GetEnd())
+        if (newRange.GetStart() > newRange.GetEnd())

         {
             wxLogDebug(wxT("Strange selection range"));
         }
         {
             wxLogDebug(wxT("Strange selection range"));
         }


@@ -1161,6 +1722,36 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
 
     wxSize clientSize = GetClientSize();
 
 
     wxSize clientSize = GetClientSize();
 

+    int leftMargin, rightMargin, topMargin, bottomMargin;
+
+    {
+        wxClientDC dc(this);
+        wxRichTextObject::GetTotalMargin(dc, & GetBuffer(), GetBuffer().GetAttributes(), leftMargin, rightMargin,
+            topMargin, bottomMargin);
+    }
+//    clientSize.y -= GetBuffer().GetBottomMargin();
+    clientSize.y -= bottomMargin;
+
+    if (GetWindowStyle() & wxRE_CENTRE_CARET)
+    {
+        int y = rect.y - GetClientSize().y/2;
+        int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
+        if (y >= 0 && (y + clientSize.y) < GetBuffer().GetCachedSize().y)
+        {
+            if (startYUnits != yUnits)
+            {
+                SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
+                scrolled = true;
+            }
+#if !wxRICHTEXT_USE_OWN_CARET
+            if (scrolled)
+#endif
+                PositionCaret();
+
+            return scrolled;
+        }
+    }
+

     // Going down
     if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN ||
         keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT ||
     // Going down
     if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN ||
         keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT ||


@@ -1184,11 +1775,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
                 scrolled = true;
             }
         }
                 scrolled = true;
             }
         }

-        else if (rect.y < startY)
+        else if (rect.y < (startY + GetBuffer().GetTopMargin()))

         {
             // Make it scroll so this item is at the top
             // of the window
         {
             // Make it scroll so this item is at the top
             // of the window

-            int y = rect.y ;
+            int y = rect.y - GetBuffer().GetTopMargin();

             int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
 
             if (startYUnits != yUnits)
             int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
 
             if (startYUnits != yUnits)


@@ -1204,11 +1795,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
              keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME ||
              keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP )
     {
              keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME ||
              keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP )
     {

-        if (rect.y < startY)
+        if (rect.y < (startY + GetBuffer().GetBottomMargin()))

         {
             // Make it scroll so this item is at the top
             // of the window
         {
             // Make it scroll so this item is at the top
             // of the window

-            int y = rect.y ;
+            int y = rect.y - GetBuffer().GetTopMargin();

             int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
 
             if (startYUnits != yUnits)
             int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
 
             if (startYUnits != yUnits)


@@ -1262,8 +1853,9 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const
 
     wxRect rect = line->GetRect();
     wxSize clientSize = GetClientSize();
 
     wxRect rect = line->GetRect();
     wxSize clientSize = GetClientSize();

+    clientSize.y -= GetBuffer().GetBottomMargin();

 
 

-    return (rect.GetBottom() > startY) && (rect.GetTop() < (startY + clientSize.y));
+    return (rect.GetTop() >= (startY + GetBuffer().GetTopMargin())) && (rect.GetBottom() <= (startY + clientSize.y));

 }
 
 void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
 }
 
 void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)


@@ -1277,13 +1869,13 @@ void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
 /// to the start of the next, which may be the exact same caret position.
 void wxRichTextCtrl::MoveCaretForward(long oldPosition)
 {
 /// to the start of the next, which may be the exact same caret position.
 void wxRichTextCtrl::MoveCaretForward(long oldPosition)
 {

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition);

 
     // Only do the check if we're not at the end of the paragraph (where things work OK
     // anyway)
     if (para && (oldPosition != para->GetRange().GetEnd() - 1))
     {
 
     // Only do the check if we're not at the end of the paragraph (where things work OK
     // anyway)
     if (para && (oldPosition != para->GetRange().GetEnd() - 1))
     {

-        wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition);
+        wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition);

 
         if (line)
         {
 
         if (line)
         {


@@ -1322,13 +1914,13 @@ void wxRichTextCtrl::MoveCaretForward(long oldPosition)
 /// to the start of the next, which may be the exact same caret position.
 void wxRichTextCtrl::MoveCaretBack(long oldPosition)
 {
 /// to the start of the next, which may be the exact same caret position.
 void wxRichTextCtrl::MoveCaretBack(long oldPosition)
 {

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition);

 
     // Only do the check if we're not at the start of the paragraph (where things work OK
     // anyway)
     if (para && (oldPosition != para->GetRange().GetStart()))
     {
 
     // Only do the check if we're not at the start of the paragraph (where things work OK
     // anyway)
     if (para && (oldPosition != para->GetRange().GetStart()))
     {

-        wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition);
+        wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition);

 
         if (line)
         {
 
         if (line)
         {


@@ -1370,7 +1962,7 @@ void wxRichTextCtrl::MoveCaretBack(long oldPosition)
 /// Move right
 bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
 {
 /// Move right
 bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
 {

-    long endPos = GetBuffer().GetRange().GetEnd();
+    long endPos = GetFocusObject()->GetOwnRange().GetEnd();

 
     if (m_caretPosition + noPositions < endPos)
     {
 
     if (m_caretPosition + noPositions < endPos)
     {


@@ -1427,6 +2019,40 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags)
         return false;
 }
 
         return false;
 }
 

+// Find the caret position for the combination of hit-test flags and character position.
+// Returns the caret position and also an indication of where to place the caret (caretLineStart)
+// since this is ambiguous (same position used for end of line and start of next).
+long wxRichTextCtrl::FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container,
+                                                   bool& caretLineStart)
+{
+    // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,
+    // we want to be at the end of the last line but with m_caretAtLineStart set to true,
+    // so we view the caret at the start of the line.
+    caretLineStart = false;
+    long caretPosition = position;
+
+    if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE)
+    {
+        wxRichTextLine* thisLine = container->GetLineAtPosition(position-1);
+        wxRichTextRange lineRange;
+        if (thisLine)
+            lineRange = thisLine->GetAbsoluteRange();
+
+        if (thisLine && (position-1) == lineRange.GetEnd())
+        {
+            caretPosition --;
+            caretLineStart = true;
+        }
+        else
+        {
+            wxRichTextParagraph* para = container->GetParagraphAtPosition(position);
+            if (para && para->GetRange().GetStart() == position)
+                caretPosition --;
+        }
+    }
+    return caretPosition;
+}
+

 /// Move up
 bool wxRichTextCtrl::MoveUp(int noLines, int flags)
 {
 /// Move up
 bool wxRichTextCtrl::MoveUp(int noLines, int flags)
 {


@@ -1439,74 +2065,94 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
     if (!GetCaret())
         return false;
 
     if (!GetCaret())
         return false;
 

-    long lineNumber = GetBuffer().GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);
+    long lineNumber = GetFocusObject()->GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);

     wxPoint pt = GetCaret()->GetPosition();
     long newLine = lineNumber + noLines;
     wxPoint pt = GetCaret()->GetPosition();
     long newLine = lineNumber + noLines;

+    bool notInThisObject = false;

 
     if (lineNumber != -1)
     {
         if (noLines > 0)
         {
 
     if (lineNumber != -1)
     {
         if (noLines > 0)
         {

-            long lastLine = GetBuffer().GetVisibleLineNumber(GetBuffer().GetRange().GetEnd());
-
+            long lastLine = GetFocusObject()->GetVisibleLineNumber(GetFocusObject()->GetOwnRange().GetEnd());

             if (newLine > lastLine)
             if (newLine > lastLine)

-                return false;
+                notInThisObject = true;

         }
         else
         {
             if (newLine < 0)
         }
         else
         {
             if (newLine < 0)

-                return false;
+                notInThisObject = true;

         }
     }
 
         }
     }
 

-    wxRichTextLine* lineObj = GetBuffer().GetLineForVisibleLineNumber(newLine);
-    if (lineObj)
+    wxRichTextParagraphLayoutBox* container = GetFocusObject();
+    int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS;
+
+    if (notInThisObject)

     {
     {

-        pt.y = lineObj->GetAbsolutePosition().y + 2;
+        // If we know we're navigating out of the current object,
+        // try to find an object anywhere in the buffer at the new position (up or down a bit)
+        container = & GetBuffer();
+        hitTestFlags &= ~wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS;
+
+        if (noLines > 0) // going down
+        {
+            pt.y = GetFocusObject()->GetPosition().y + GetFocusObject()->GetCachedSize().y + 2;
+        }
+        else // going up
+        {
+            pt.y = GetFocusObject()->GetPosition().y - 2;
+        }

     }
     else
     }
     else

-        return false;
+    {
+        wxRichTextLine* lineObj = GetFocusObject()->GetLineForVisibleLineNumber(newLine);
+        if (lineObj)
+            pt.y = lineObj->GetAbsolutePosition().y + 2;
+        else
+            return false;
+    }

 
     long newPos = 0;
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
 
 
     long newPos = 0;
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
 

-    int hitTest = GetBuffer().HitTest(dc, pt, newPos);
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+    wxRichTextDrawingContext context(& GetBuffer());
+    int hitTest = container->HitTest(dc, context, pt, newPos, & hitObj, & contextObj, hitTestFlags);

 
 

-    if (hitTest != wxRICHTEXT_HITTEST_NONE)
+    if (hitObj &&
+        ((hitTest & wxRICHTEXT_HITTEST_NONE) == 0) &&
+        (! (hitObj == (& m_buffer) && ((hitTest & wxRICHTEXT_HITTEST_OUTSIDE) != 0))) // outside the buffer counts as 'do nothing'
+        )

     {
     {

-        // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,
-        // we want to be at the end of the last line but with m_caretAtLineStart set to true,
-        // so we view the caret at the start of the line.
-        bool caretLineStart = false;
-        if (hitTest & wxRICHTEXT_HITTEST_BEFORE)
+        if (notInThisObject)

         {
         {

-            wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);
-            wxRichTextRange lineRange;
-            if (thisLine)
-                lineRange = thisLine->GetAbsoluteRange();
-
-            if (thisLine && (newPos-1) == lineRange.GetEnd())
-            {
-                newPos --;
-                caretLineStart = true;
-            }
-            else
+            wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+            if (actualContainer && actualContainer != GetFocusObject() && actualContainer->AcceptsFocus())

             {
             {

-                wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(newPos);
-                if (para && para->GetRange().GetStart() == newPos)
-                    newPos --;
+                SetFocusObject(actualContainer, false /* don't set caret position yet */);
+
+                container = actualContainer;

             }
         }
 
             }
         }
 

-        long newSelEnd = newPos;
+        bool caretLineStart = true;
+        long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart);
+        long newSelEnd = caretPosition;
+        bool extendSel;
+
+        if (notInThisObject)
+            extendSel = false;
+        else
+            extendSel = ExtendSelection(m_caretPosition, newSelEnd, flags);

 
 

-        bool extendSel = ExtendSelection(m_caretPosition, newSelEnd, flags);

         if (!extendSel)
             SelectNone();
 
         if (!extendSel)
             SelectNone();
 

-        SetCaretPosition(newPos, caretLineStart);
+        SetCaretPosition(caretPosition, caretLineStart);

         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 


@@ -1519,7 +2165,7 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
 /// Move to the end of the paragraph
 bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
 {
 /// Move to the end of the paragraph
 bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
 {

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true);

     if (para)
     {
         long newPos = para->GetRange().GetEnd() - 1;
     if (para)
     {
         long newPos = para->GetRange().GetEnd() - 1;


@@ -1540,7 +2186,7 @@ bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
 /// Move to the start of the paragraph
 bool wxRichTextCtrl::MoveToParagraphStart(int flags)
 {
 /// Move to the start of the paragraph
 bool wxRichTextCtrl::MoveToParagraphStart(int flags)
 {

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true);

     if (para)
     {
         long newPos = para->GetRange().GetStart() - 1;
     if (para)
     {
         long newPos = para->GetRange().GetStart() - 1;


@@ -1594,7 +2240,7 @@ bool wxRichTextCtrl::MoveToLineStart(int flags)
         if (!extendSel)
             SelectNone();
 
         if (!extendSel)
             SelectNone();
 

-        wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(line);
+        wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(line);

 
         SetCaretPosition(newPos, para->GetRange().GetStart() != lineRange.GetStart());
         PositionCaret();
 
         SetCaretPosition(newPos, para->GetRange().GetStart() != lineRange.GetStart());
         PositionCaret();


@@ -1628,7 +2274,7 @@ bool wxRichTextCtrl::MoveHome(int flags)
 /// Move to the end of the buffer
 bool wxRichTextCtrl::MoveEnd(int flags)
 {
 /// Move to the end of the buffer
 bool wxRichTextCtrl::MoveEnd(int flags)
 {

-    long endPos = GetBuffer().GetRange().GetEnd()-1;
+    long endPos = GetFocusObject()->GetOwnRange().GetEnd()-1;

 
     if (m_caretPosition != endPos)
     {
 
     if (m_caretPosition != endPos)
     {


@@ -1662,14 +2308,14 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
         wxSize clientSize = GetClientSize();
         int newY = line->GetAbsolutePosition().y + noPages*clientSize.y;
 
         wxSize clientSize = GetClientSize();
         int newY = line->GetAbsolutePosition().y + noPages*clientSize.y;
 

-        wxRichTextLine* newLine = GetBuffer().GetLineAtYPosition(newY);
+        wxRichTextLine* newLine = GetFocusObject()->GetLineAtYPosition(newY);

         if (newLine)
         {
             wxRichTextRange lineRange = newLine->GetAbsoluteRange();
             long pos = lineRange.GetStart()-1;
             if (pos != m_caretPosition)
             {
         if (newLine)
         {
             wxRichTextRange lineRange = newLine->GetAbsoluteRange();
             long pos = lineRange.GetStart()-1;
             if (pos != m_caretPosition)
             {

-                wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(newLine);
+                wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(newLine);

 
                 bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
                 if (!extendSel)
 
                 bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
                 if (!extendSel)


@@ -1695,7 +2341,7 @@ static bool wxRichTextCtrlIsWhitespace(const wxString& str)
 // Finds the caret position for the next word
 long wxRichTextCtrl::FindNextWordPosition(int direction) const
 {
 // Finds the caret position for the next word
 long wxRichTextCtrl::FindNextWordPosition(int direction) const
 {

-    long endPos = GetBuffer().GetRange().GetEnd();
+    long endPos = GetFocusObject()->GetOwnRange().GetEnd();

 
     if (direction > 0)
     {
 
     if (direction > 0)
     {


@@ -1705,8 +2351,8 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions

-            wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+            wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);

             if (line && (i == line->GetAbsoluteRange().GetEnd()))
             {
                 break;
             if (line && (i == line->GetAbsoluteRange().GetEnd()))
             {
                 break;


@@ -1721,8 +2367,8 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions

-            wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+            wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);

             if (line && (i == line->GetAbsoluteRange().GetEnd()))
                 return wxMax(-1, i);
 
             if (line && (i == line->GetAbsoluteRange().GetEnd()))
                 return wxMax(-1, i);
 


@@ -1748,8 +2394,8 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions

-            wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+            wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);

 
             if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
                 break;
 
             if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
                 break;


@@ -1762,8 +2408,8 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions

-            wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
-            wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+            wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+            wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);

             if (line && line->GetAbsoluteRange().GetStart() == i)
                 return i-1;
 
             if (line && line->GetAbsoluteRange().GetStart() == i)
                 return i-1;
 


@@ -1786,7 +2432,7 @@ bool wxRichTextCtrl::WordLeft(int WXUNUSED(n), int flags)
     long pos = FindNextWordPosition(-1);
     if (pos != m_caretPosition)
     {
     long pos = FindNextWordPosition(-1);
     if (pos != m_caretPosition)
     {

-        wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
+        wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true);

 
         bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
         if (!extendSel)
 
         bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
         if (!extendSel)


@@ -1808,7 +2454,7 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags)
     long pos = FindNextWordPosition(1);
     if (pos != m_caretPosition)
     {
     long pos = FindNextWordPosition(1);
     if (pos != m_caretPosition)
     {

-        wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
+        wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true);

 
         bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
         if (!extendSel)
 
         bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
         if (!extendSel)


@@ -1828,7 +2474,7 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags)
 void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 {
     // Only do sizing optimization for large buffers
 void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 {
     // Only do sizing optimization for large buffers

-    if (GetBuffer().GetRange().GetEnd() > m_delayedLayoutThreshold)
+    if (GetBuffer().GetOwnRange().GetEnd() > m_delayedLayoutThreshold)

     {
         m_fullLayoutRequired = true;
         m_fullLayoutTime = wxGetLocalTimeMillis();
     {
         m_fullLayoutRequired = true;
         m_fullLayoutTime = wxGetLocalTimeMillis();


@@ -1845,6 +2491,19 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+// Force any pending layout due to large buffer
+void wxRichTextCtrl::ForceDelayedLayout()
+{
+    if (m_fullLayoutRequired)
+    {
+        m_fullLayoutRequired = false;
+        m_fullLayoutTime = 0;
+        GetBuffer().Invalidate(wxRICHTEXT_ALL);
+        ShowPosition(m_fullLayoutSavedPosition);
+        Refresh(false);
+        Update();
+    }
+}

 
 /// Idle-time processing
 void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 
 /// Idle-time processing
 void wxRichTextCtrl::OnIdle(wxIdleEvent& event)


@@ -1900,7 +2559,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
     if (IsFrozen())
         return;
 
     if (IsFrozen())
         return;
 

-    if (GetBuffer().IsEmpty())
+    if (GetBuffer().IsEmpty() || !m_verticalScrollbarEnabled)

     {
         SetScrollbars(0, 0, 0, 0, 0, 0);
         return;
     {
         SetScrollbars(0, 0, 0, 0, 0, 0);
         return;


@@ -1911,7 +2570,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
     int pixelsPerUnit = 5;
     wxSize clientSize = GetClientSize();
 
     int pixelsPerUnit = 5;
     wxSize clientSize = GetClientSize();
 

-    int maxHeight = GetBuffer().GetCachedSize().y;
+    int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin();

 
     // Round up so we have at least maxHeight pixels
     int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5);
 
     // Round up so we have at least maxHeight pixels
     int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5);


@@ -1939,7 +2598,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
         return;
 
     // Don't set scrollbars if there were none before, and there will be none now.
         return;
 
     // Don't set scrollbars if there were none before, and there will be none now.

-    if (oldPPUY != 0 && (oldVirtualSizeY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))
+    if (oldPPUY != 0 && (oldVirtualSizeY*oldPPUY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))

         return;
 
     // Move to previous scroll position if
         return;
 
     // Move to previous scroll position if


@@ -1951,7 +2610,7 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
 void wxRichTextCtrl::PaintBackground(wxDC& dc)
 {
     wxColour backgroundColour = GetBackgroundColour();
 void wxRichTextCtrl::PaintBackground(wxDC& dc)
 {
     wxColour backgroundColour = GetBackgroundColour();

-    if (!backgroundColour.Ok())
+    if (!backgroundColour.IsOk())

         backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 
     // Clear the background
         backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 
     // Clear the background


@@ -1978,9 +2637,9 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
     if (sz.x < 1 || sz.y < 1)
         return false;
 
     if (sz.x < 1 || sz.y < 1)
         return false;
 

-    if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)
+    if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)

         m_bufferBitmap = wxBitmap(sz.x, sz.y);
         m_bufferBitmap = wxBitmap(sz.x, sz.y);

-    return m_bufferBitmap.Ok();
+    return m_bufferBitmap.IsOk();

 }
 #endif
 
 }
 #endif
 


@@ -2035,7 +2694,8 @@ bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
 /// Add a new paragraph of text to the end of the buffer
 wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text)
 {
 /// Add a new paragraph of text to the end of the buffer
 wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text)
 {

-    wxRichTextRange range = GetBuffer().AddParagraph(text);
+    wxRichTextRange range = GetFocusObject()->AddParagraph(text);
+    GetBuffer().Invalidate();

     LayoutContent();
     return range;
 }
     LayoutContent();
     return range;
 }


@@ -2043,7 +2703,8 @@ wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text)
 /// Add an image
 wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
 {
 /// Add an image
 wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
 {

-    wxRichTextRange range = GetBuffer().AddImage(image);
+    wxRichTextRange range = GetFocusObject()->AddImage(image);
+    GetBuffer().Invalidate();

     LayoutContent();
     return range;
 }
     LayoutContent();
     return range;
 }


@@ -2054,22 +2715,23 @@ wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
 
 void wxRichTextCtrl::SelectAll()
 {
 
 void wxRichTextCtrl::SelectAll()
 {

-    SetSelection(0, GetLastPosition()+1);
-    m_selectionAnchor = -1;
+    SetSelection(-1, -1);

 }
 
 /// Select none
 void wxRichTextCtrl::SelectNone()
 {
 }
 
 /// Select none
 void wxRichTextCtrl::SelectNone()
 {

-    if (!(GetSelectionRange() == wxRichTextRange(-2, -2)))
+    if (m_selection.IsValid())

     {
     {

-        wxRichTextRange oldSelection = m_selectionRange;
+        wxRichTextSelection oldSelection = m_selection;

 
 

-        m_selectionRange = wxRichTextRange(-2, -2);
+        m_selection.Reset();

 
 

-        RefreshForSelectionChange(oldSelection, m_selectionRange);
+        RefreshForSelectionChange(oldSelection, m_selection);

     }
     m_selectionAnchor = -2;
     }
     m_selectionAnchor = -2;

+    m_selectionAnchorObject = NULL;
+    m_selectionState = wxRichTextCtrlSelectionState_Normal;

 }
 
 static bool wxIsWordDelimiter(const wxString& text)
 }
 
 static bool wxIsWordDelimiter(const wxString& text)


@@ -2080,10 +2742,10 @@ static bool wxIsWordDelimiter(const wxString& text)
 /// Select the word at the given character position
 bool wxRichTextCtrl::SelectWord(long position)
 {
 /// Select the word at the given character position
 bool wxRichTextCtrl::SelectWord(long position)
 {

-    if (position < 0 || position > GetBuffer().GetRange().GetEnd())
+    if (position < 0 || position > GetFocusObject()->GetOwnRange().GetEnd())

         return false;
 
         return false;
 

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(position);

     if (!para)
         return false;
 
     if (!para)
         return false;
 


@@ -2095,7 +2757,7 @@ bool wxRichTextCtrl::SelectWord(long position)
 
     for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --)
     {
 
     for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --)
     {

-        wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionStart, positionStart));
+        wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionStart, positionStart));

         if (wxIsWordDelimiter(text))
         {
             positionStart ++;
         if (wxIsWordDelimiter(text))
         {
             positionStart ++;


@@ -2107,7 +2769,7 @@ bool wxRichTextCtrl::SelectWord(long position)
 
     for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++)
     {
 
     for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++)
     {

-        wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionEnd, positionEnd));
+        wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionEnd, positionEnd));

         if (wxIsWordDelimiter(text))
         {
             positionEnd --;
         if (wxIsWordDelimiter(text))
         {
             positionEnd --;


@@ -2171,7 +2833,10 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
     // so convert
     wxPoint pt2 = GetLogicalPoint(pt);
 
     // so convert
     wxPoint pt2 = GetLogicalPoint(pt);
 

-    int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt2, *pos);
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+    wxRichTextDrawingContext context((wxRichTextBuffer*) & GetBuffer());
+    int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, context, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);

 
     if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
         return wxTE_HT_BEFORE;
 
     if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
         return wxTE_HT_BEFORE;


@@ -2183,11 +2848,29 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
     return wxTE_HT_UNKNOWN;
 }
 
     return wxTE_HT_UNKNOWN;
 }
 

+wxRichTextParagraphLayoutBox*
+wxRichTextCtrl::FindContainerAtPoint(const wxPoint pt, long& position, int& hit, wxRichTextObject* hitObj, int flags/* = 0*/)
+{
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    dc.SetFont(GetFont());
+
+    wxPoint logicalPt = GetLogicalPoint(pt);
+
+    wxRichTextObject* contextObj = NULL;
+    wxRichTextDrawingContext context(& GetBuffer());
+    hit = GetBuffer().HitTest(dc, context, logicalPt, position, &hitObj, &contextObj, flags);
+    wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+
+    return container;
+}
+
+

 // ----------------------------------------------------------------------------
 // set/get the controls text
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // set/get the controls text
 // ----------------------------------------------------------------------------
 

-wxString wxRichTextCtrl::GetValue() const
+wxString wxRichTextCtrl::DoGetValue() const

 {
     return GetBuffer().GetText();
 }
 {
     return GetBuffer().GetText();
 }


@@ -2195,18 +2878,19 @@ wxString wxRichTextCtrl::GetValue() const
 wxString wxRichTextCtrl::GetRange(long from, long to) const
 {
     // Public API for range is different from internals
 wxString wxRichTextCtrl::GetRange(long from, long to) const
 {
     // Public API for range is different from internals

-    return GetBuffer().GetTextForRange(wxRichTextRange(from, to-1));
+    return GetFocusObject()->GetTextForRange(wxRichTextRange(from, to-1));

 }
 
 void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
 {
     // Don't call Clear here, since it always sends a text updated event
     m_buffer.ResetAndClearCommands();
 }
 
 void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
 {
     // Don't call Clear here, since it always sends a text updated event
     m_buffer.ResetAndClearCommands();

-    m_buffer.SetDirty(true);
+    m_buffer.Invalidate(wxRICHTEXT_ALL);

     m_caretPosition = -1;
     m_caretPositionForDefaultStyle = -2;
     m_caretAtLineStart = false;
     m_caretPosition = -1;
     m_caretPositionForDefaultStyle = -2;
     m_caretAtLineStart = false;

-    m_selectionRange.SetRange(-2, -2);
+    m_selection.Reset();
+    m_selectionState = wxRichTextCtrlSelectionState_Normal;

 
     Scroll(0,0);
 
 
     Scroll(0,0);
 


@@ -2243,7 +2927,7 @@ void wxRichTextCtrl::DoWriteText(const wxString& value, int flags)
 {
     wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
 
 {
     wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
 

-    GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+    GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);

 
     if ( flags & SetValue_SendEvent )
         wxTextCtrl::SendTextUpdatedEvent(this);
 
     if ( flags & SetValue_SendEvent )
         wxTextCtrl::SendTextUpdatedEvent(this);


@@ -2257,51 +2941,100 @@ void wxRichTextCtrl::AppendText(const wxString& text)
 }
 
 /// Write an image at the current insertion point
 }
 
 /// Write an image at the current insertion point

-bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)

 {
     wxRichTextImageBlock imageBlock;
 
     wxImage image2 = image;
     if (imageBlock.MakeImageBlock(image2, bitmapType))
 {
     wxRichTextImageBlock imageBlock;
 
     wxImage image2 = image;
     if (imageBlock.MakeImageBlock(image2, bitmapType))

-        return WriteImage(imageBlock);
+        return WriteImage(imageBlock, textAttr);

 
     return false;
 }
 
 
     return false;
 }
 

-bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)

 {
     wxRichTextImageBlock imageBlock;
 
     wxImage image;
     if (imageBlock.MakeImageBlock(filename, bitmapType, image, false))
 {
     wxRichTextImageBlock imageBlock;
 
     wxImage image;
     if (imageBlock.MakeImageBlock(filename, bitmapType, image, false))

-        return WriteImage(imageBlock);
+        return WriteImage(imageBlock, textAttr);

 
     return false;
 }
 
 
     return false;
 }
 

-bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)
+bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wxRichTextAttr& textAttr)

 {
 {

-    return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
+    return GetFocusObject()->InsertImageWithUndo(& GetBuffer(), m_caretPosition+1, imageBlock, this, 0, textAttr);

 }
 
 }
 

-bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)

 {
 {

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

     {
         wxRichTextImageBlock imageBlock;
 
         wxImage image = bitmap.ConvertToImage();
     {
         wxRichTextImageBlock imageBlock;
 
         wxImage image = bitmap.ConvertToImage();

-        if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType))
-            return WriteImage(imageBlock);
+        if (image.IsOk() && imageBlock.MakeImageBlock(image, bitmapType))
+            return WriteImage(imageBlock, textAttr);

     }
 
     return false;
 }
 
     }
 
     return false;
 }
 

+// Write a text box at the current insertion point.
+wxRichTextBox* wxRichTextCtrl::WriteTextBox(const wxRichTextAttr& textAttr)
+{
+    wxRichTextBox* textBox = new wxRichTextBox;
+    textBox->SetAttributes(textAttr);
+    textBox->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style
+    textBox->AddParagraph(wxEmptyString);
+    textBox->SetParent(NULL);
+
+    // The object returned is the one actually inserted into the buffer,
+    // while the original one is deleted.
+    wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(& GetBuffer(), m_caretPosition+1, textBox, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+    wxRichTextBox* box = wxDynamicCast(obj, wxRichTextBox);
+    return box;
+}
+
+// Write a table at the current insertion point, returning the table.
+wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr, const wxRichTextAttr& cellAttr)
+{
+    wxASSERT(rows > 0 && cols > 0);
+
+    if (rows <= 0 || cols <= 0)
+        return NULL;
+
+    wxRichTextTable* table = new wxRichTextTable;
+    table->SetAttributes(tableAttr);
+    table->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style
+
+    table->CreateTable(rows, cols);
+
+    table->SetParent(NULL);
+
+    int i, j;
+    for (j = 0; j < rows; j++)
+    {
+        for (i = 0; i < cols; i++)
+        {
+            table->GetCell(j, i)->GetAttributes() = cellAttr;
+        }
+    }
+
+    // The object returned is the one actually inserted into the buffer,
+    // while the original one is deleted.
+    wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(& GetBuffer(), m_caretPosition+1, table, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+    wxRichTextTable* tableResult = wxDynamicCast(obj, wxRichTextTable);
+    return tableResult;
+}
+
+

 /// Insert a newline (actually paragraph) at the current insertion point.
 bool wxRichTextCtrl::Newline()
 {
 /// Insert a newline (actually paragraph) at the current insertion point.
 bool wxRichTextCtrl::Newline()
 {

-    return GetBuffer().InsertNewlineWithUndo(m_caretPosition+1, this);
+    return GetFocusObject()->InsertNewlineWithUndo(& GetBuffer(), m_caretPosition+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);

 }
 
 /// Insert a line break at the current insertion point.
 }
 
 /// Insert a line break at the current insertion point.


@@ -2309,7 +3042,7 @@ bool wxRichTextCtrl::LineBreak()
 {
     wxString text;
     text = wxRichTextLineBreakChar;
 {
     wxString text;
     text = wxRichTextLineBreakChar;

-    return GetBuffer().InsertTextWithUndo(m_caretPosition+1, text, this);
+    return GetFocusObject()->InsertTextWithUndo(& GetBuffer(), m_caretPosition+1, text, this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2363,7 +3096,12 @@ void wxRichTextCtrl::DeleteSelection()
 
 bool wxRichTextCtrl::HasSelection() const
 {
 
 bool wxRichTextCtrl::HasSelection() const
 {

-    return m_selectionRange.GetStart() != -2 && m_selectionRange.GetEnd() != -2;
+    return (m_selection.IsValid() && m_selection.GetContainer() == GetFocusObject());
+}
+
+bool wxRichTextCtrl::HasUnfocusedSelection() const
+{
+    return m_selection.IsValid();

 }
 
 bool wxRichTextCtrl::CanCopy() const
 }
 
 bool wxRichTextCtrl::CanCopy() const


@@ -2374,12 +3112,12 @@ bool wxRichTextCtrl::CanCopy() const
 
 bool wxRichTextCtrl::CanCut() const
 {
 
 bool wxRichTextCtrl::CanCut() const
 {

-    return HasSelection() && IsEditable();
+    return CanDeleteSelection();

 }
 
 bool wxRichTextCtrl::CanPaste() const
 {
 }
 
 bool wxRichTextCtrl::CanPaste() const
 {

-    if ( !IsEditable() )
+    if ( !IsEditable() || !GetFocusObject() || !CanInsertContent(* GetFocusObject(), m_caretPosition+1))

         return false;
 
     return GetBuffer().CanPasteFromClipboard();
         return false;
 
     return GetBuffer().CanPasteFromClipboard();


@@ -2387,7 +3125,7 @@ bool wxRichTextCtrl::CanPaste() const
 
 bool wxRichTextCtrl::CanDeleteSelection() const
 {
 
 bool wxRichTextCtrl::CanDeleteSelection() const
 {

-    return HasSelection() && IsEditable();
+    return HasSelection() && IsEditable() && CanDeleteRange(* GetFocusObject(), GetSelectionRange());

 }
 
 
 }
 
 


@@ -2395,6 +3133,13 @@ bool wxRichTextCtrl::CanDeleteSelection() const
 // Accessors
 // ----------------------------------------------------------------------------
 
 // Accessors
 // ----------------------------------------------------------------------------
 

+void wxRichTextCtrl::SetContextMenu(wxMenu* menu)
+{
+    if (m_contextMenu && m_contextMenu != menu)
+        delete m_contextMenu;
+    m_contextMenu = menu;
+}
+

 void wxRichTextCtrl::SetEditable(bool editable)
 {
     m_editable = editable;
 void wxRichTextCtrl::SetEditable(bool editable)
 {
     m_editable = editable;


@@ -2407,6 +3152,8 @@ void wxRichTextCtrl::SetInsertionPoint(long pos)
     m_caretPosition = pos - 1;
 
     PositionCaret();
     m_caretPosition = pos - 1;
 
     PositionCaret();

+
+    SetDefaultStyleToCursorStyle();

 }
 
 void wxRichTextCtrl::SetInsertionPointEnd()
 }
 
 void wxRichTextCtrl::SetInsertionPointEnd()


@@ -2422,17 +3169,24 @@ long wxRichTextCtrl::GetInsertionPoint() const
 
 wxTextPos wxRichTextCtrl::GetLastPosition() const
 {
 
 wxTextPos wxRichTextCtrl::GetLastPosition() const
 {

-    return GetBuffer().GetRange().GetEnd();
+    return GetFocusObject()->GetOwnRange().GetEnd();

 }
 
 // If the return values from and to are the same, there is no
 // selection.
 void wxRichTextCtrl::GetSelection(long* from, long* to) const
 {
 }
 
 // If the return values from and to are the same, there is no
 // selection.
 void wxRichTextCtrl::GetSelection(long* from, long* to) const
 {

-    *from = m_selectionRange.GetStart();
-    *to = m_selectionRange.GetEnd();
-    if ((*to) != -1 && (*to) != -2)
+    if (m_selection.IsValid())
+    {
+        *from = m_selection.GetRange().GetStart();
+        *to = m_selection.GetRange().GetEnd();

         (*to) ++;
         (*to) ++;

+    }
+    else
+    {
+        *from = -2;
+        *to = -2;
+    }

 }
 
 bool wxRichTextCtrl::IsEditable() const
 }
 
 bool wxRichTextCtrl::IsEditable() const


@@ -2454,24 +3208,21 @@ void wxRichTextCtrl::SetSelection(long from, long to)
         to = GetLastPosition()+1;
     }
 
         to = GetLastPosition()+1;
     }
 

-    DoSetSelection(from, to);
-}
-
-void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
-{

     if (from == to)
     {
         SelectNone();
     }
     else
     {
     if (from == to)
     {
         SelectNone();
     }
     else
     {

-        wxRichTextRange oldSelection = m_selectionRange;
-        m_selectionAnchor = from;
-        m_selectionRange.SetRange(from, to-1);
-        if (from > -2)
-            m_caretPosition = from-1;
+        wxRichTextSelection oldSelection = m_selection;

 
 

-        RefreshForSelectionChange(oldSelection, m_selectionRange);
+        m_selectionAnchor = from-1;
+        m_selectionAnchorObject = NULL;
+        m_selection.Set(wxRichTextRange(from, to-1), GetFocusObject());
+
+        m_caretPosition = wxMax(-1, to-1);
+
+        RefreshForSelectionChange(oldSelection, m_selection);

         PositionCaret();
     }
 }
         PositionCaret();
     }
 }


@@ -2480,13 +3231,19 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare
 // Editing
 // ----------------------------------------------------------------------------
 
 // Editing
 // ----------------------------------------------------------------------------
 

-void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to),
+void wxRichTextCtrl::Replace(long from, long to,

                              const wxString& value)
 {
     BeginBatchUndo(_("Replace"));
 
                              const wxString& value)
 {
     BeginBatchUndo(_("Replace"));
 

+    SetSelection(from, to);
+
+    wxRichTextAttr attr = GetDefaultStyle();
+

     DeleteSelectedContent();
 
     DeleteSelectedContent();
 

+    SetDefaultStyle(attr);
+

     DoWriteText(value, SetValue_SelectionOnly);
 
     EndBatchUndo();
     DoWriteText(value, SetValue_SelectionOnly);
 
     EndBatchUndo();


@@ -2496,7 +3253,7 @@ void wxRichTextCtrl::Remove(long from, long to)
 {
     SelectNone();
 
 {
     SelectNone();
 

-    GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to-1), this);
+    GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(from, to-1), this, & GetBuffer());

 
     LayoutContent();
     if (!IsFrozen())
 
     LayoutContent();
     if (!IsFrozen())


@@ -2522,7 +3279,7 @@ void wxRichTextCtrl::DiscardEdits()
 
 int wxRichTextCtrl::GetNumberOfLines() const
 {
 
 int wxRichTextCtrl::GetNumberOfLines() const
 {

-    return GetBuffer().GetParagraphCount();
+    return GetFocusObject()->GetParagraphCount();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2531,12 +3288,12 @@ int wxRichTextCtrl::GetNumberOfLines() const
 
 long wxRichTextCtrl::XYToPosition(long x, long y) const
 {
 
 long wxRichTextCtrl::XYToPosition(long x, long y) const
 {

-    return GetBuffer().XYToPosition(x, y);
+    return GetFocusObject()->XYToPosition(x, y);

 }
 
 bool wxRichTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {
 }
 
 bool wxRichTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {

-    return GetBuffer().PositionToXY(pos, x, y);
+    return GetFocusObject()->PositionToXY(pos, x, y);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2551,12 +3308,12 @@ void wxRichTextCtrl::ShowPosition(long pos)
 
 int wxRichTextCtrl::GetLineLength(long lineNo) const
 {
 
 int wxRichTextCtrl::GetLineLength(long lineNo) const
 {

-    return GetBuffer().GetParagraphLength(lineNo);
+    return GetFocusObject()->GetParagraphLength(lineNo);

 }
 
 wxString wxRichTextCtrl::GetLineText(long lineNo) const
 {
 }
 
 wxString wxRichTextCtrl::GetLineText(long lineNo) const
 {

-    return GetBuffer().GetParagraphText(lineNo);
+    return GetFocusObject()->GetParagraphText(lineNo);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2581,12 +3338,12 @@ void wxRichTextCtrl::Redo()
 
 bool wxRichTextCtrl::CanUndo() const
 {
 
 bool wxRichTextCtrl::CanUndo() const
 {

-    return GetCommandProcessor()->CanUndo();
+    return GetCommandProcessor()->CanUndo() && IsEditable();

 }
 
 bool wxRichTextCtrl::CanRedo() const
 {
 }
 
 bool wxRichTextCtrl::CanRedo() const
 {

-    return GetCommandProcessor()->CanRedo();
+    return GetCommandProcessor()->CanRedo() && IsEditable();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2681,7 +3438,8 @@ void wxRichTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 
 void wxRichTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxRichTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {

-    SelectAll();
+    if (GetLastPosition() > 0)
+        SelectAll();

 }
 
 void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
 }
 
 void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)


@@ -2689,6 +3447,25 @@ void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
     event.Enable(GetLastPosition() > 0);
 }
 

+void wxRichTextCtrl::OnProperties(wxCommandEvent& event)
+{
+    int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1;
+    if (idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount())
+    {
+        wxRichTextObject* obj = m_contextMenuPropertiesInfo.GetObject(idx);
+        if (obj && CanEditProperties(obj))
+            EditProperties(obj, this);
+
+        m_contextMenuPropertiesInfo.Clear();
+    }
+}
+
+void wxRichTextCtrl::OnUpdateProperties(wxUpdateUIEvent& event)
+{
+    int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1;
+    event.Enable(idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount());
+}
+

 void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
     if (event.GetEventObject() != this)
 void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
     if (event.GetEventObject() != this)


@@ -2697,67 +3474,218 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         return;
     }
 
         return;
     }
 

-    if (!m_contextMenu)
+    ShowContextMenu(m_contextMenu, event.GetPosition());
+}
+
+// Prepares the context menu, adding appropriate property-editing commands.
+// Returns the number of property commands added.
+int wxRichTextCtrl::PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
+{
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    dc.SetFont(GetFont());
+
+    m_contextMenuPropertiesInfo.Clear();
+
+    long position = 0;
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextObject* contextObj = NULL;
+    if (pt != wxDefaultPosition)
+    {
+        wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
+        wxRichTextDrawingContext context(& GetBuffer());
+        int hit = GetBuffer().HitTest(dc, context, logicalPt, position, & hitObj, & contextObj);
+
+        if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER)
+        {
+            wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+            if (hitObj && actualContainer)
+            {
+                if (actualContainer->AcceptsFocus())
+                {
+                    SetFocusObject(actualContainer, false /* don't set caret position yet */);
+                    SetCaretPositionAfterClick(actualContainer, position, hit);
+                }
+
+                if (addPropertyCommands)
+                    m_contextMenuPropertiesInfo.AddItems(this, actualContainer, hitObj);
+            }
+            else
+            {
+                if (addPropertyCommands)
+                    m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL);
+            }
+        }
+        else
+        {
+            if (addPropertyCommands)
+                m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL);
+        }
+    }
+    else
+    {
+        // Invoked from the keyboard, so don't set the caret position and don't use the event
+        // position
+        hitObj = GetFocusObject()->GetLeafObjectAtPosition(m_caretPosition+1);
+        if (hitObj)
+            contextObj = hitObj->GetParentContainer();
+        else
+            contextObj = GetFocusObject();
+
+        wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+        if (hitObj && actualContainer)
+        {
+            if (addPropertyCommands)
+                m_contextMenuPropertiesInfo.AddItems(this, actualContainer, hitObj);
+        }
+        else
+        {
+            if (addPropertyCommands)
+                m_contextMenuPropertiesInfo.AddItems(this, GetFocusObject(), NULL);
+        }
+    }
+
+    if (menu)
+    {
+        if (addPropertyCommands)
+            m_contextMenuPropertiesInfo.AddMenuItems(menu);
+        return m_contextMenuPropertiesInfo.GetCount();
+    }
+    else
+        return 0;
+}
+
+// Shows the context menu, adding appropriate property-editing commands
+bool wxRichTextCtrl::ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands)
+{
+    if (menu)
+    {
+        PrepareContextMenu(menu, pt, addPropertyCommands);
+        PopupMenu(menu);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
+{
+    return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), wxRichTextAttr(style));
+}
+
+bool wxRichTextCtrl::SetStyle(long start, long end, const wxRichTextAttr& style)
+{
+    return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), style);
+}
+
+bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style)
+{
+    return GetFocusObject()->SetStyle(range.ToInternal(), wxRichTextAttr(style));
+}
+
+bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
+{
+    return GetFocusObject()->SetStyle(range.ToInternal(), style);
+}
+
+void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr)
+{
+    GetFocusObject()->SetStyle(obj, textAttr);
+}
+
+// extended style setting operation with flags including:
+// wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY.
+// see richtextbuffer.h for more details.
+
+bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
+{
+    return GetFocusObject()->SetStyle(range.ToInternal(), style, flags);
+}
+
+bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+{
+    return GetBuffer().SetDefaultStyle(style);
+}
+
+bool wxRichTextCtrl::SetDefaultStyle(const wxRichTextAttr& style)
+{
+    wxRichTextAttr attr1(style);
+    attr1.GetTextBoxAttr().Reset();
+    return GetBuffer().SetDefaultStyle(attr1);
+}
+
+const wxRichTextAttr& wxRichTextCtrl::GetDefaultStyleEx() const
+{
+    return GetBuffer().GetDefaultStyle();
+}
+
+bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style)
+{
+    wxRichTextAttr attr;
+    if (GetFocusObject()->GetStyle(position, attr))

     {
     {

-        m_contextMenu = new wxMenu;
-        m_contextMenu->Append(wxID_UNDO, _("&Undo"));
-        m_contextMenu->Append(wxID_REDO, _("&Redo"));
-        m_contextMenu->AppendSeparator();
-        m_contextMenu->Append(wxID_CUT, _("Cu&t"));
-        m_contextMenu->Append(wxID_COPY, _("&Copy"));
-        m_contextMenu->Append(wxID_PASTE, _("&Paste"));
-        m_contextMenu->Append(wxID_CLEAR, _("&Delete"));
-        m_contextMenu->AppendSeparator();
-        m_contextMenu->Append(wxID_SELECTALL, _("Select &All"));
+        style = attr;
+        return true;

     }
     }

-    PopupMenu(m_contextMenu);
-    return;
+    else
+        return false;

 }
 
 }
 

-bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
+bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style)

 {
 {

-    return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttr(style));
+    return GetFocusObject()->GetStyle(position, style);

 }
 
 }
 

-bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style)
+bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)

 {
 {

-    return GetBuffer().SetStyle(range.ToInternal(), style);
+    wxRichTextAttr attr;
+    if (container->GetStyle(position, attr))
+    {
+        style = attr;
+        return true;
+    }
+    else
+        return false;

 }
 
 }
 

-// extended style setting operation with flags including:
-// wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY.
-// see richtextbuffer.h for more details.
-
-bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttr& style, int flags)
+// get the common set of styles for the range
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)

 {
 {

-    return GetBuffer().SetStyle(range.ToInternal(), style, flags);
+    wxRichTextAttr attr;
+    if (GetFocusObject()->GetStyleForRange(range.ToInternal(), attr))
+    {
+        style = attr;
+        return true;
+    }
+    else
+        return false;

 }
 
 }
 

-bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style)

 {
 {

-    return GetBuffer().SetDefaultStyle(wxTextAttr(style));
+    return GetFocusObject()->GetStyleForRange(range.ToInternal(), style);

 }
 
 }
 

-const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)

 {
 {

-    return GetBuffer().GetDefaultStyle();
+    return container->GetStyleForRange(range.ToInternal(), style);

 }
 
 }
 

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

 {
 {

-    return GetBuffer().GetStyle(position, style);
+    return GetFocusObject()->GetUncombinedStyle(position, style);

 }
 
 }
 

-// get the common set of styles for the range
-bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)
+/// Get the content (uncombined) attributes for this position.
+bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)

 {
 {

-    return GetBuffer().GetStyleForRange(range.ToInternal(), style);
+    return container->GetUncombinedStyle(position, style);

 }
 
 }
 

-/// Get the content (uncombined) attributes for this position.
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
+bool wxRichTextCtrl::SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags)

 {
 {

-    return GetBuffer().GetUncombinedStyle(position, style);
+    return GetFocusObject()->SetProperties(range.ToInternal(), properties, flags);

 }
 
 /// Set font, and also the buffer attributes
 }
 
 /// Set font, and also the buffer attributes


@@ -2765,7 +3693,7 @@ bool wxRichTextCtrl::SetFont(const wxFont& font)
 {
     wxControl::SetFont(font);
 
 {
     wxControl::SetFont(font);
 

-    wxTextAttr attr = GetBuffer().GetAttributes();
+    wxRichTextAttr attr = GetBuffer().GetAttributes();

     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);
 
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);
 


@@ -2794,7 +3722,7 @@ wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical) const
 }
 
 /// Position the caret
 }
 
 /// Position the caret

-void wxRichTextCtrl::PositionCaret()
+void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container)

 {
     if (!GetCaret())
         return;
 {
     if (!GetCaret())
         return;


@@ -2802,7 +3730,7 @@ void wxRichTextCtrl::PositionCaret()
     //wxLogDebug(wxT("PositionCaret"));
 
     wxRect caretRect;
     //wxLogDebug(wxT("PositionCaret"));
 
     wxRect caretRect;

-    if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
+    if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container))

     {
         wxPoint newPt = caretRect.GetPosition();
         wxSize newSz = caretRect.GetSize();
     {
         wxPoint newPt = caretRect.GetPosition();
         wxSize newSz = caretRect.GetSize();


@@ -2812,6 +3740,28 @@ void wxRichTextCtrl::PositionCaret()
             GetCaret()->Hide();
             if (GetCaret()->GetSize() != newSz)
                 GetCaret()->SetSize(newSz);
             GetCaret()->Hide();
             if (GetCaret()->GetSize() != newSz)
                 GetCaret()->SetSize(newSz);

+
+            // Adjust size so the caret size and position doesn't appear in the margins
+            if (((pt.y + newSz.y) <= GetBuffer().GetTopMargin()) || (pt.y >= (GetClientSize().y - GetBuffer().GetBottomMargin())))
+            {
+                pt.x = -200;
+                pt.y = -200;
+            }
+            else if (pt.y < GetBuffer().GetTopMargin() && (pt.y + newSz.y) > GetBuffer().GetTopMargin())
+            {
+                newSz.y -= (GetBuffer().GetTopMargin() - pt.y);
+                if (newSz.y > 0)
+                {
+                    pt.y = GetBuffer().GetTopMargin();
+                    GetCaret()->SetSize(newSz);
+                }
+            }
+            else if (pt.y < (GetClientSize().y - GetBuffer().GetBottomMargin()) && (pt.y + newSz.y) > (GetClientSize().y - GetBuffer().GetBottomMargin()))
+            {
+                newSz.y = GetClientSize().y - GetBuffer().GetBottomMargin() - pt.y;
+                GetCaret()->SetSize(newSz);
+            }
+

             GetCaret()->Move(pt);
             GetCaret()->Show();
         }
             GetCaret()->Move(pt);
             GetCaret()->Show();
         }


@@ -2819,7 +3769,7 @@ void wxRichTextCtrl::PositionCaret()
 }
 
 /// Get the caret height and position for the given character position
 }
 
 /// Get the caret height and position for the given character position

-bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
+bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container)

 {
     wxClientDC dc(this);
     dc.SetFont(GetFont());
 {
     wxClientDC dc(this);
     dc.SetFont(GetFont());


@@ -2829,7 +3779,11 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
     wxPoint pt;
     int height = 0;
 
     wxPoint pt;
     int height = 0;
 

-    if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart))
+    if (!container)
+        container = GetFocusObject();
+
+    wxRichTextDrawingContext context(& GetBuffer());
+    if (container->FindPosition(dc, context, position, pt, & height, m_caretAtLineStart))

     {
         // Caret height can't be zero
         if (height == 0)
     {
         // Caret height can't be zero
         if (height == 0)


@@ -2848,8 +3802,8 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
 /// if this is the case.
 wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPosition) const
 {
 /// if this is the case.
 wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPosition) const
 {

-    wxRichTextLine* line = GetBuffer().GetLineAtPosition(caretPosition, true);
-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPosition, true);
+    wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(caretPosition, true);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPosition, true);

     if (line)
     {
         wxRichTextRange lineRange = line->GetAbsoluteRange();
     if (line)
     {
         wxRichTextRange lineRange = line->GetAbsoluteRange();


@@ -2857,7 +3811,7 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio
             (para->GetRange().GetStart() != lineRange.GetStart()))
         {
             if (!m_caretAtLineStart)
             (para->GetRange().GetStart() != lineRange.GetStart()))
         {
             if (!m_caretAtLineStart)

-                line = GetBuffer().GetLineAtPosition(caretPosition-1, true);
+                line = GetFocusObject()->GetLineAtPosition(caretPosition-1, true);

         }
     }
     return line;
         }
     }
     return line;


@@ -2865,16 +3819,19 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio
 
 
 /// Move the caret to the given character position
 
 
 /// Move the caret to the given character position

-bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
+bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart, wxRichTextParagraphLayoutBox* container)

 {
 {

-    if (GetBuffer().GetDirty())
+    if (GetBuffer().IsDirty())

         LayoutContent();
 
         LayoutContent();
 

-    if (pos <= GetBuffer().GetRange().GetEnd())
+    if (!container)
+        container = GetFocusObject();
+
+    if (pos <= container->GetOwnRange().GetEnd())

     {
         SetCaretPosition(pos, showAtLineStart);
 
     {
         SetCaretPosition(pos, showAtLineStart);
 

-        PositionCaret();
+        PositionCaret(container);

 
         return true;
     }
 
         return true;
     }


@@ -2886,7 +3843,7 @@ bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
 /// setting the caret position.
 bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
 {
 /// setting the caret position.
 bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
 {

-    if (GetBuffer().GetDirty() || onlyVisibleRect)
+    if (GetBuffer().IsDirty() || onlyVisibleRect)

     {
         wxRect availableSpace(GetClientSize());
         if (availableSpace.width == 0)
     {
         wxRect availableSpace(GetClientSize());
         if (availableSpace.width == 0)


@@ -2906,10 +3863,11 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
 
         PrepareDC(dc);
 
 
         PrepareDC(dc);
 

+        wxRichTextDrawingContext context(& GetBuffer());

         GetBuffer().Defragment();
         GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
         GetBuffer().Defragment();
         GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation

-        GetBuffer().Layout(dc, availableSpace, flags);
-        GetBuffer().SetDirty(false);
+        GetBuffer().Layout(dc, context, availableSpace, availableSpace, flags);
+        GetBuffer().Invalidate(wxRICHTEXT_NONE);

 
         if (!IsFrozen())
             SetupScrollbars();
 
         if (!IsFrozen())
             SetupScrollbars();


@@ -2918,15 +3876,15 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
     return true;
 }
 
     return true;
 }
 

-/// Is all of the selection bold?
+/// Is all of the selection, or the current caret position, bold?

 bool wxRichTextCtrl::IsSelectionBold()
 {
     if (HasSelection())
     {
 bool wxRichTextCtrl::IsSelectionBold()
 {
     if (HasSelection())
     {

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         wxRichTextRange range = GetSelectionRange();
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         wxRichTextRange range = GetSelectionRange();
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);

-        attr.SetFontWeight(wxBOLD);
+        attr.SetFontWeight(wxFONTWEIGHT_BOLD);

 
         return HasCharacterAttributes(range, attr);
     }
 
         return HasCharacterAttributes(range, attr);
     }


@@ -2934,7 +3892,7 @@ bool wxRichTextCtrl::IsSelectionBold()
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());


@@ -2942,21 +3900,21 @@ bool wxRichTextCtrl::IsSelectionBold()
         {
             if (IsDefaultStyleShowing())
                 wxRichTextApplyStyle(attr, GetDefaultStyleEx());
         {
             if (IsDefaultStyleShowing())
                 wxRichTextApplyStyle(attr, GetDefaultStyleEx());

-            return attr.GetFontWeight() == wxBOLD;
+            return attr.GetFontWeight() == wxFONTWEIGHT_BOLD;

         }
     }
     return false;
 }
 
         }
     }
     return false;
 }
 

-/// Is all of the selection italics?
+/// Is all of the selection, or the current caret position, italics?

 bool wxRichTextCtrl::IsSelectionItalics()
 {
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();
 bool wxRichTextCtrl::IsSelectionItalics()
 {
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);

-        attr.SetFontStyle(wxITALIC);
+        attr.SetFontStyle(wxFONTSTYLE_ITALIC);

 
         return HasCharacterAttributes(range, attr);
     }
 
         return HasCharacterAttributes(range, attr);
     }


@@ -2964,7 +3922,7 @@ bool wxRichTextCtrl::IsSelectionItalics()
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());


@@ -2972,19 +3930,19 @@ bool wxRichTextCtrl::IsSelectionItalics()
         {
             if (IsDefaultStyleShowing())
                 wxRichTextApplyStyle(attr, GetDefaultStyleEx());
         {
             if (IsDefaultStyleShowing())
                 wxRichTextApplyStyle(attr, GetDefaultStyleEx());

-            return attr.GetFontStyle() == wxITALIC;
+            return attr.GetFontStyle() == wxFONTSTYLE_ITALIC;

         }
     }
     return false;
 }
 
         }
     }
     return false;
 }
 

-/// Is all of the selection underlined?
+/// Is all of the selection, or the current caret position, underlined?

 bool wxRichTextCtrl::IsSelectionUnderlined()
 {
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();
 bool wxRichTextCtrl::IsSelectionUnderlined()
 {
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         attr.SetFontUnderlined(true);
 
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         attr.SetFontUnderlined(true);
 


@@ -2994,7 +3952,7 @@ bool wxRichTextCtrl::IsSelectionUnderlined()
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.
     {
         // If no selection, then we need to combine current style with default style
         // to see what the effect would be if we started typing.

-        wxTextAttr attr;
+        wxRichTextAttr attr;

         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
 
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
 


@@ -3008,12 +3966,39 @@ bool wxRichTextCtrl::IsSelectionUnderlined()
     return false;
 }
 
     return false;
 }
 

+/// Does all of the selection, or the current caret position, have this wxTextAttrEffects flag(s)?
+bool wxRichTextCtrl::DoesSelectionHaveTextEffectFlag(int flag)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_EFFECTS);
+    attr.SetTextEffectFlags(flag);
+    attr.SetTextEffects(flag);
+
+    if (HasSelection())
+    {
+        return HasCharacterAttributes(GetSelectionRange(), attr);
+    }
+    else
+    {
+        // If no selection, then we need to combine current style with default style
+        // to see what the effect would be if we started typing.
+        long pos = GetAdjustedCaretPosition(GetCaretPosition());
+        if (GetStyle(pos, attr))
+        {
+            if (IsDefaultStyleShowing())
+                wxRichTextApplyStyle(attr, GetDefaultStyleEx());
+            return (attr.GetTextEffectFlags() & flag) != 0;
+        }
+    }
+    return false;
+}
+

 /// Apply bold to the selection
 bool wxRichTextCtrl::ApplyBoldToSelection()
 {
 /// Apply bold to the selection
 bool wxRichTextCtrl::ApplyBoldToSelection()
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
     attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);

-    attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD);
+    attr.SetFontWeight(IsSelectionBold() ? wxFONTWEIGHT_NORMAL : wxFONTWEIGHT_BOLD);

 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);


@@ -3029,9 +4014,9 @@ bool wxRichTextCtrl::ApplyBoldToSelection()
 /// Apply italic to the selection
 bool wxRichTextCtrl::ApplyItalicToSelection()
 {
 /// Apply italic to the selection
 bool wxRichTextCtrl::ApplyItalicToSelection()
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
     attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);

-    attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC);
+    attr.SetFontStyle(IsSelectionItalics() ? wxFONTSTYLE_NORMAL : wxFONTSTYLE_ITALIC);

 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);


@@ -3047,7 +4032,7 @@ bool wxRichTextCtrl::ApplyItalicToSelection()
 /// Apply underline to the selection
 bool wxRichTextCtrl::ApplyUnderlineToSelection()
 {
 /// Apply underline to the selection
 bool wxRichTextCtrl::ApplyUnderlineToSelection()
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
     attr.SetFontUnderlined(!IsSelectionUnderlined());
 
     attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
     attr.SetFontUnderlined(!IsSelectionUnderlined());
 


@@ -3062,6 +4047,28 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
     return true;
 }
 
     return true;
 }
 

+/// Apply the wxTextAttrEffects flag(s) to the selection, or the current caret position if there's no selection
+bool wxRichTextCtrl::ApplyTextEffectToSelection(int flags)
+{
+    wxRichTextAttr attr;
+    attr.SetFlags(wxTEXT_ATTR_EFFECTS);
+    attr.SetTextEffectFlags(flags);
+    if (!DoesSelectionHaveTextEffectFlag(flags))
+        attr.SetTextEffects(flags);
+     else
+        attr.SetTextEffects(attr.GetTextEffectFlags() & ~flags);
+
+    if (HasSelection())
+        return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
+    else
+    {
+        wxRichTextAttr current = GetDefaultStyleEx();
+        current.Apply(attr);
+        SetAndShowDefaultStyle(current);
+    }
+    return true;
+}
+

 /// Is all of the selection aligned according to the specified flag?
 bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
 {
 /// Is all of the selection aligned according to the specified flag?
 bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
 {


@@ -3071,7 +4078,7 @@ bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
     else
         range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+2);
 
     else
         range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+2);
 

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetAlignment(alignment);
 
     return HasParagraphAttributes(range, attr);
     attr.SetAlignment(alignment);
 
     return HasParagraphAttributes(range, attr);


@@ -3080,13 +4087,13 @@ bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
 /// Apply alignment to the selection
 bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
 {
 /// Apply alignment to the selection
 bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetAlignment(alignment);
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     {
     attr.SetAlignment(alignment);
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     {

-        wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
+        wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(GetCaretPosition()+1);

         if (para)
             return SetStyleEx(para->GetRange().FromInternal(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY);
     }
         if (para)
             return SetStyleEx(para->GetRange().FromInternal(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY);
     }


@@ -3098,7 +4105,7 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
 {
     // Flags are defined within each definition, so only certain
     // attributes are applied.
 {
     // Flags are defined within each definition, so only certain
     // attributes are applied.

-    wxTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());
+    wxRichTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());

 
     int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET;
 
 
     int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET;
 


@@ -3119,9 +4126,12 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
         return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags);
     }
 
         return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags);
     }
 

+    bool isPara = false;
+

     // Make sure the attr has the style name
     if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
     {
     // Make sure the attr has the style name
     if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
     {

+        isPara = true;

         attr.SetParagraphStyleName(def->GetName());
 
         // If applying a paragraph style, we only want the paragraph nodes to adopt these
         attr.SetParagraphStyleName(def->GetName());
 
         // If applying a paragraph style, we only want the paragraph nodes to adopt these


@@ -3129,16 +4139,47 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
         // to change its style independently.
         flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY;
     }
         // to change its style independently.
         flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY;
     }

-    else
+    else if (def->IsKindOf(CLASSINFO(wxRichTextCharacterStyleDefinition)))

         attr.SetCharacterStyleName(def->GetName());
         attr.SetCharacterStyleName(def->GetName());

+    else if (def->IsKindOf(CLASSINFO(wxRichTextBoxStyleDefinition)))
+        attr.GetTextBoxAttr().SetBoxStyleName(def->GetName());

 
 

-    if (HasSelection())
+    if (def->IsKindOf(CLASSINFO(wxRichTextBoxStyleDefinition)))
+    {
+        if (GetFocusObject() && (GetFocusObject() != & GetBuffer()))
+        {
+            SetStyle(GetFocusObject(), attr);
+            return true;
+        }
+        else
+            return false;
+    }
+    else if (HasSelection())

         return SetStyleEx(GetSelectionRange(), attr, flags);
     else
     {
         wxRichTextAttr current = GetDefaultStyleEx();
         return SetStyleEx(GetSelectionRange(), attr, flags);
     else
     {
         wxRichTextAttr current = GetDefaultStyleEx();

-        current.Apply(attr);
+        wxRichTextAttr defaultStyle(attr);
+        if (isPara)
+        {
+            // Don't apply extra character styles since they are already implied
+            // in the paragraph style
+            defaultStyle.SetFlags(defaultStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER);
+        }
+        current.Apply(defaultStyle);

         SetAndShowDefaultStyle(current);
         SetAndShowDefaultStyle(current);

+
+        // If it's a paragraph style, we want to apply the style to the
+        // current paragraph even if we didn't select any text.
+        if (isPara)
+        {
+            long pos = GetAdjustedCaretPosition(GetCaretPosition());
+            wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos);
+            if (para)
+            {
+                return SetStyleEx(para->GetRange().FromInternal(), attr, flags);
+            }
+        }

         return true;
     }
 }
         return true;
     }
 }


@@ -3164,13 +4205,21 @@ bool wxRichTextCtrl::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
 /// Sets the default style to the style under the cursor
 bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 {
 /// Sets the default style to the style under the cursor
 bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

     attr.SetFlags(wxTEXT_ATTR_CHARACTER);
 
     // If at the start of a paragraph, use the next position.
     long pos = GetAdjustedCaretPosition(GetCaretPosition());
 
     attr.SetFlags(wxTEXT_ATTR_CHARACTER);
 
     // 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;
     {
         SetDefaultStyle(attr);
         return true;


@@ -3182,7 +4231,7 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 /// Returns the first visible position in the current view
 long wxRichTextCtrl::GetFirstVisiblePosition() const
 {
 /// Returns the first visible position in the current view
 long wxRichTextCtrl::GetFirstVisiblePosition() const
 {

-    wxRichTextLine* line = GetBuffer().GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y);
+    wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y);

     if (line)
         return line->GetAbsoluteRange().GetStart();
     else
     if (line)
         return line->GetAbsoluteRange().GetStart();
     else


@@ -3206,7 +4255,7 @@ wxPoint wxRichTextCtrl::GetFirstVisiblePoint() const
 /// style information should be taken from the next position, not current one.
 long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const
 {
 /// style information should be taken from the next position, not current one.
 long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const
 {

-    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPos+1);
+    wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPos+1);

 
     if (para && (caretPos+1 == para->GetRange().GetStart()))
         caretPos ++;
 
     if (para && (caretPos+1 == para->GetRange().GetStart()))
         caretPos ++;


@@ -3226,58 +4275,52 @@ wxRichTextRange wxRichTextCtrl::GetSelectionRange() const
 
 void wxRichTextCtrl::SetSelectionRange(const wxRichTextRange& range)
 {
 
 void wxRichTextCtrl::SetSelectionRange(const wxRichTextRange& range)
 {

-    wxRichTextRange range1(range);
-    if (range1 != wxRichTextRange(-2,-2) && range1 != wxRichTextRange(-1,-1) )
-        range1.SetEnd(range1.GetEnd() - 1);
-
-    wxASSERT( range1.GetStart() > range1.GetEnd() );
-
-    SetInternalSelectionRange(range1);
+    SetSelection(range.GetStart(), range.GetEnd());

 }
 
 /// Set list style
 bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
 }
 
 /// Set list style
 bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {

-    return GetBuffer().SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+    return GetFocusObject()->SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel);

 }
 
 bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {
 }
 
 bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {

-    return GetBuffer().SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+    return GetFocusObject()->SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);

 }
 
 /// Clear list for given range
 bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags)
 {
 }
 
 /// Clear list for given range
 bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags)
 {

-    return GetBuffer().ClearListStyle(range.ToInternal(), flags);
+    return GetFocusObject()->ClearListStyle(range.ToInternal(), flags);

 }
 
 /// Number/renumber any list elements in the given range
 bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {
 }
 
 /// Number/renumber any list elements in the given range
 bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
 {

-    return GetBuffer().NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+    return GetFocusObject()->NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel);

 }
 
 bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {
 }
 
 bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
 {

-    return GetBuffer().NumberList(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+    return GetFocusObject()->NumberList(range.ToInternal(), defName, flags, startFrom, specifiedLevel);

 }
 
 /// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1
 bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel)
 {
 }
 
 /// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1
 bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel)
 {

-    return GetBuffer().PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel);
+    return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel);

 }
 
 bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
 {
 }
 
 bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
 {

-    return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);
+    return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);

 }
 
 /// Deletes the content in the given range
 bool wxRichTextCtrl::Delete(const wxRichTextRange& range)
 {
 }
 
 /// Deletes the content in the given range
 bool wxRichTextCtrl::Delete(const wxRichTextRange& range)
 {

-    return GetBuffer().DeleteRangeWithUndo(range.ToInternal(), this);
+    return GetFocusObject()->DeleteRangeWithUndo(range.ToInternal(), this, & GetBuffer());

 }
 
 const wxArrayString& wxRichTextCtrl::GetAvailableFontNames()
 }
 
 const wxArrayString& wxRichTextCtrl::GetAvailableFontNames()


@@ -3308,32 +4351,53 @@ void wxRichTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)
 }
 
 // Refresh the area affected by a selection change
 }
 
 // Refresh the area affected by a selection change

-bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelection, const wxRichTextRange& newSelection)
-{
+bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection)
+{
+    // If the selection is not part of the focus object, or we have multiple ranges, then the chances are that
+    // the selection contains whole containers rather than just text, so refresh everything
+    // for now as it would be hard to compute the rectangle bounding all selections.
+    // TODO: improve on this.
+    if ((oldSelection.IsValid() && (oldSelection.GetContainer() != GetFocusObject() || oldSelection.GetCount() > 1)) ||
+        (newSelection.IsValid() && (newSelection.GetContainer() != GetFocusObject() || newSelection.GetCount() > 1)))
+    {
+        Refresh(false);
+        return true;
+    }
+
+    wxRichTextRange oldRange, newRange;
+    if (oldSelection.IsValid())
+        oldRange = oldSelection.GetRange();
+    else
+        oldRange = wxRICHTEXT_NO_SELECTION;
+    if (newSelection.IsValid())
+        newRange = newSelection.GetRange();
+    else
+        newRange = wxRICHTEXT_NO_SELECTION;
+

     // Calculate the refresh rectangle - just the affected lines
     long firstPos, lastPos;
     // Calculate the refresh rectangle - just the affected lines
     long firstPos, lastPos;

-    if (oldSelection.GetStart() == -2 && newSelection.GetStart() != -2)
+    if (oldRange.GetStart() == -2 && newRange.GetStart() != -2)

     {
     {

-        firstPos = newSelection.GetStart();
-        lastPos = newSelection.GetEnd();
+        firstPos = newRange.GetStart();
+        lastPos = newRange.GetEnd();

     }
     }

-    else if (oldSelection.GetStart() != -2 && newSelection.GetStart() == -2)
+    else if (oldRange.GetStart() != -2 && newRange.GetStart() == -2)

     {
     {

-        firstPos = oldSelection.GetStart();
-        lastPos = oldSelection.GetEnd();
+        firstPos = oldRange.GetStart();
+        lastPos = oldRange.GetEnd();

     }
     }

-    else if (oldSelection.GetStart() == -2 && newSelection.GetStart() == -2)
+    else if (oldRange.GetStart() == -2 && newRange.GetStart() == -2)

     {
         return false;
     }
     else
     {
     {
         return false;
     }
     else
     {

-        firstPos = wxMin(oldSelection.GetStart(), newSelection.GetStart());
-        lastPos = wxMax(oldSelection.GetEnd(), newSelection.GetEnd());
+        firstPos = wxMin(oldRange.GetStart(), newRange.GetStart());
+        lastPos = wxMax(oldRange.GetEnd(), newRange.GetEnd());

     }
 
     }
 

-    wxRichTextLine* firstLine = GetBuffer().GetLineAtPosition(firstPos);
-    wxRichTextLine* lastLine = GetBuffer().GetLineAtPosition(lastPos);
+    wxRichTextLine* firstLine = GetFocusObject()->GetLineAtPosition(firstPos);
+    wxRichTextLine* lastLine = GetFocusObject()->GetLineAtPosition(lastPos);

 
     if (firstLine && lastLine)
     {
 
     if (firstLine && lastLine)
     {


@@ -3355,6 +4419,158 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelecti
     return true;
 }
 
     return true;
 }
 

+// margins functions
+bool wxRichTextCtrl::DoSetMargins(const wxPoint& pt)
+{
+    GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS);
+    GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS);
+    GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS);
+    GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS);
+
+    return true;
+}
+
+wxPoint wxRichTextCtrl::DoGetMargins() const
+{
+    return wxPoint(GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().GetValue(),
+                   GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().GetValue());
+}
+
+bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition)
+{
+    if (obj && !obj->AcceptsFocus())
+        return false;
+
+    wxRichTextParagraphLayoutBox* oldContainer = GetFocusObject();
+    bool changingContainer = (m_focusObject != obj);
+
+    if (changingContainer && HasSelection())
+        SelectNone();
+
+    m_focusObject = obj;
+
+    if (!obj)
+        m_focusObject = & m_buffer;
+
+    if (setCaretPosition && changingContainer)
+    {
+        m_selection.Reset();
+        m_selectionAnchor = -2;
+        m_selectionAnchorObject = NULL;
+        m_selectionState = wxRichTextCtrlSelectionState_Normal;
+
+        long pos = -1;
+
+        m_caretAtLineStart = false;
+        MoveCaret(pos, m_caretAtLineStart);
+        SetDefaultStyleToCursorStyle();
+
+        wxRichTextEvent cmdEvent(
+            wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED,
+            GetId());
+        cmdEvent.SetEventObject(this);
+        cmdEvent.SetPosition(m_caretPosition+1);
+        cmdEvent.SetOldContainer(oldContainer);
+        cmdEvent.SetContainer(m_focusObject);
+
+        GetEventHandler()->ProcessEvent(cmdEvent);
+    }
+    return true;
+}
+
+#if wxUSE_DRAG_AND_DROP
+void wxRichTextCtrl::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def, wxDataObject* DataObj)
+{
+    m_preDrag = false;
+
+    if ((def != wxDragCopy) && (def != wxDragMove))
+    {
+        return;
+    }
+
+    if (!GetSelection().IsValid())
+    {
+        return;
+    }
+
+    wxRichTextParagraphLayoutBox* originContainer = GetSelection().GetContainer();
+    wxRichTextParagraphLayoutBox* destContainer = GetFocusObject(); // This will be the drop container, not necessarily the same as the origin one
+
+    wxRichTextBuffer* richTextBuffer = ((wxRichTextBufferDataObject*)DataObj)->GetRichTextBuffer();
+    if (richTextBuffer)
+    {
+        long position = GetCaretPosition();
+        wxRichTextRange selectionrange = GetInternalSelectionRange();
+        if (selectionrange.Contains(position) && (def == wxDragMove))
+        {
+            // It doesn't make sense to move onto itself
+            return;
+        }
+
+        // If we're moving, and the data is being moved forward, we need to drop first, then delete the selection
+        // If moving backwards, we need to delete then drop. If we're copying (or doing nothing) we don't delete anyway
+        bool DeleteAfter = (def == wxDragMove) && (position > selectionrange.GetEnd());
+        if ((def == wxDragMove) && !DeleteAfter)
+        {
+            // We can't use e.g. DeleteSelectedContent() as it uses the focus container
+            originContainer->DeleteRangeWithUndo(selectionrange, this, &GetBuffer());
+        }
+
+        destContainer->InsertParagraphsWithUndo(&GetBuffer(), position+1, *richTextBuffer, this, 0);
+        ShowPosition(position + richTextBuffer->GetOwnRange().GetEnd());
+
+        delete richTextBuffer;
+
+        if (DeleteAfter)
+        {
+            // We can't use e.g. DeleteSelectedContent() as it uses the focus container
+            originContainer->DeleteRangeWithUndo(selectionrange, this, &GetBuffer());
+        }
+
+        SelectNone();
+        Refresh();
+    }
+}
+#endif // wxUSE_DRAG_AND_DROP
+
+
+#if wxUSE_DRAG_AND_DROP
+bool wxRichTextDropSource::GiveFeedback(wxDragResult WXUNUSED(effect))
+{
+    wxCHECK_MSG(m_rtc, false, wxT("NULL m_rtc"));
+
+    long position = 0;
+    int hit = 0;
+    wxRichTextObject* hitObj = NULL;
+    wxRichTextParagraphLayoutBox* container = m_rtc->FindContainerAtPoint(m_rtc->ScreenToClient(wxGetMousePosition()), position, hit, hitObj);
+
+    if (!(hit & wxRICHTEXT_HITTEST_NONE) && container && container->AcceptsFocus())
+    {
+        m_rtc->StoreFocusObject(container);
+        m_rtc->SetCaretPositionAfterClick(container, position, hit);
+    }
+
+    return false;  // so that the base-class sets a cursor
+}
+#endif // wxUSE_DRAG_AND_DROP
+
+bool wxRichTextCtrl::CanDeleteRange(wxRichTextParagraphLayoutBox& WXUNUSED(container), const wxRichTextRange& WXUNUSED(range)) const
+{
+    return true;
+}
+
+bool wxRichTextCtrl::CanInsertContent(wxRichTextParagraphLayoutBox& WXUNUSED(container), long WXUNUSED(pos)) const
+{
+    return true;
+}
+
+void wxRichTextCtrl::EnableVerticalScrollbar(bool enable)
+{
+    m_verticalScrollbarEnabled = enable;
+    SetupScrollbars();
+}
+
+

 #if wxRICHTEXT_USE_OWN_CARET
 
 // ----------------------------------------------------------------------------
 #if wxRICHTEXT_USE_OWN_CARET
 
 // ----------------------------------------------------------------------------


@@ -3364,15 +4580,19 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelecti
 void wxRichTextCaret::Init()
 {
     m_hasFocus = true;
 void wxRichTextCaret::Init()
 {
     m_hasFocus = true;

+    m_refreshEnabled = true;

 
     m_xOld =
     m_yOld = -1;
     m_richTextCtrl = NULL;
     m_needsUpdate = false;
 
     m_xOld =
     m_yOld = -1;
     m_richTextCtrl = NULL;
     m_needsUpdate = false;

+    m_flashOn = true;

 }
 
 wxRichTextCaret::~wxRichTextCaret()
 {
 }
 
 wxRichTextCaret::~wxRichTextCaret()
 {

+    if (m_timer.IsRunning())
+        m_timer.Stop();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -3381,11 +4601,19 @@ wxRichTextCaret::~wxRichTextCaret()
 
 void wxRichTextCaret::DoShow()
 {
 
 void wxRichTextCaret::DoShow()
 {

+    m_flashOn = true;
+
+    if (!m_timer.IsRunning())
+        m_timer.Start(GetBlinkTime());
+

     Refresh();
 }
 
 void wxRichTextCaret::DoHide()
 {
     Refresh();
 }
 
 void wxRichTextCaret::DoHide()
 {

+    if (m_timer.IsRunning())
+        m_timer.Stop();
+

     Refresh();
 }
 
     Refresh();
 }
 


@@ -3397,7 +4625,7 @@ void wxRichTextCaret::DoMove()
 
         if (m_xOld != -1 && m_yOld != -1)
         {
 
         if (m_xOld != -1 && m_yOld != -1)
         {

-            if (m_richTextCtrl)
+            if (m_richTextCtrl && m_refreshEnabled)

             {
                 wxRect rect(GetPosition(), GetSize());
                 m_richTextCtrl->RefreshRect(rect, false);
             {
                 wxRect rect(GetPosition(), GetSize());
                 m_richTextCtrl->RefreshRect(rect, false);


@@ -3448,7 +4676,7 @@ void wxRichTextCaret::OnKillFocus()
 
 void wxRichTextCaret::Refresh()
 {
 
 void wxRichTextCaret::Refresh()
 {

-    if (m_richTextCtrl)
+    if (m_richTextCtrl && m_refreshEnabled)

     {
         wxRect rect(GetPosition(), GetSize());
         m_richTextCtrl->RefreshRect(rect, false);
     {
         wxRect rect(GetPosition(), GetSize());
         m_richTextCtrl->RefreshRect(rect, false);


@@ -3462,20 +4690,138 @@ void wxRichTextCaret::DoDraw(wxDC *dc)
     dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
     dc->SetPen(*wxBLACK_PEN);
 
     dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
     dc->SetPen(*wxBLACK_PEN);
 

-    // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
-    //     done under wxGTK - no idea why
-    //dc->SetLogicalFunction(wxINVERT);
-

     wxPoint pt(m_x, m_y);
 
     if (m_richTextCtrl)
     {
         pt = m_richTextCtrl->GetLogicalPoint(pt);
     }
     wxPoint pt(m_x, m_y);
 
     if (m_richTextCtrl)
     {
         pt = m_richTextCtrl->GetLogicalPoint(pt);
     }

-    dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+    if (IsVisible() && m_flashOn)
+        dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+
+void wxRichTextCaret::Notify()
+{
+    m_flashOn = !m_flashOn;
+    Refresh();
+}
+
+void wxRichTextCaretTimer::Notify()
+{
+    m_caret->Notify();

 }
 #endif
     // wxRICHTEXT_USE_OWN_CARET
 
 }
 #endif
     // wxRICHTEXT_USE_OWN_CARET
 

+// Add an item
+bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichTextObject* obj)
+{
+    if (GetCount() < 3)
+    {
+        m_labels.Add(label);
+        m_objects.Add(obj);
+        return true;
+    }
+    else
+        return false;
+}
+
+// Returns number of menu items were added.
+int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd) const
+{
+    wxMenuItem* item = menu->FindItem(startCmd);
+    // If none of the standard properties identifiers are in the menu, add them if necessary.
+    // If no items to add, just set the text to something generic
+    if (GetCount() == 0)
+    {
+        if (item)
+        {
+            menu->SetLabel(startCmd, _("&Properties"));
+
+            // Delete the others if necessary
+            int i;
+            for (i = startCmd+1; i < startCmd+3; i++)
+            {
+                if (menu->FindItem(i))
+                {
+                    menu->Delete(i);
+                }
+            }
+        }
+    }
+    else
+    {
+        int i;
+        int pos = -1;
+        // Find the position of the first properties item
+        for (i = 0; i < (int) menu->GetMenuItemCount(); i++)
+        {
+            wxMenuItem* item = menu->FindItemByPosition(i);
+            if (item && item->GetId() == startCmd)
+            {
+                pos = i;
+                break;
+            }
+        }
+
+        if (pos != -1)
+        {
+            int insertBefore = pos+1;
+            for (i = startCmd; i < startCmd+GetCount(); i++)
+            {
+                if (menu->FindItem(i))
+                {
+                    menu->SetLabel(i, m_labels[i - startCmd]);
+                }
+                else
+                {
+                    if (insertBefore >= (int) menu->GetMenuItemCount())
+                        menu->Append(i, m_labels[i - startCmd]);
+                    else
+                        menu->Insert(insertBefore, i, m_labels[i - startCmd]);
+                }
+                insertBefore ++;
+            }
+
+            // Delete any old items still left on the menu
+            for (i = startCmd + GetCount(); i < startCmd+3; i++)
+            {
+                if (menu->FindItem(i))
+                {
+                    menu->Delete(i);
+                }
+            }
+        }
+        else
+        {
+            // No existing property identifiers were found, so append to the end of the menu.
+            menu->AppendSeparator();
+            for (i = startCmd; i < startCmd+GetCount(); i++)
+            {
+                menu->Append(i, m_labels[i - startCmd]);
+            }
+        }
+    }
+
+    return GetCount();
+}
+
+// Add appropriate menu items for the current container and clicked on object
+// (and container's parent, if appropriate).
+int wxRichTextContextMenuPropertiesInfo::AddItems(wxRichTextCtrl* ctrl, wxRichTextObject* container, wxRichTextObject* obj)
+{
+    Clear();
+    if (obj && ctrl->CanEditProperties(obj))
+        AddItem(ctrl->GetPropertiesMenuLabel(obj), obj);
+
+    if (container && container != obj && ctrl->CanEditProperties(container) && m_labels.Index(ctrl->GetPropertiesMenuLabel(container)) == wxNOT_FOUND)
+        AddItem(ctrl->GetPropertiesMenuLabel(container), container);
+
+    if (container && container->GetParent() && ctrl->CanEditProperties(container->GetParent()) && m_labels.Index(ctrl->GetPropertiesMenuLabel(container->GetParent())) == wxNOT_FOUND)
+        AddItem(ctrl->GetPropertiesMenuLabel(container->GetParent()), container->GetParent());
+
+    return GetCount();
+}
+

 #endif
     // wxUSE_RICHTEXT
 #endif
     // wxUSE_RICHTEXT