X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db6634e0d53fce875c78a089f4237a88ae206335..c40fd721e4fb645c97368d0492ddb1a7a8922c53:/src/richtext/richtextctrl.cpp

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 37a98dcd6a..ff48ec1d7d 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -32,6 +32,7 @@
 #include "wx/dcbuffer.h"
 #include "wx/arrimpl.cpp"
 #include "wx/fontenum.h"
+#include "wx/accel.h"
 
 // DLL options compatibility check:
 #include "wx/app.h"
@@ -54,6 +55,70 @@ 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)
+
+#if wxRICHTEXT_USE_OWN_CARET
+
+/*!
+ * wxRichTextCaret
+ *
+ * This implements a non-flashing cursor in case there
+ * are platform-specific problems with the generic caret.
+ * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
+ */
+
+class wxRichTextCaret: public wxCaret
+{
+public:
+    // ctors
+    // -----
+        // default - use Create()
+    wxRichTextCaret() { Init(); }
+        // creates a block caret associated with the given window
+    wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
+        : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+    wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
+        : wxCaret(window, size) { Init(); m_richTextCtrl = window; }
+
+    virtual ~wxRichTextCaret();
+
+    // implementation
+    // --------------
+
+    // called by wxWindow (not using the event tables)
+    virtual void OnSetFocus();
+    virtual void OnKillFocus();
+
+    // draw the caret on the given DC
+    void DoDraw(wxDC *dc);
+
+    // get the visible count
+    int GetVisibleCount() const { return m_countVisible; }
+
+    // delay repositioning
+    bool GetNeedsUpdate() const { return m_needsUpdate; }
+    void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
+
+protected:
+    virtual void DoShow();
+    virtual void DoHide();
+    virtual void DoMove();
+    virtual void DoSize();
+
+    // refresh the caret
+    void Refresh();
+
+private:
+    void Init();
+
+    int           m_xOld,
+                  m_yOld;
+    bool          m_hasFocus;       // true => our window has focus
+    bool          m_needsUpdate;    // must be repositioned
+
+    wxRichTextCtrl* m_richTextCtrl;
+};
+#endif
 
 IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
 
@@ -76,6 +141,7 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
     EVT_KILL_FOCUS(wxRichTextCtrl::OnKillFocus)
     EVT_MOUSE_CAPTURE_LOST(wxRichTextCtrl::OnCaptureLost)
     EVT_CONTEXT_MENU(wxRichTextCtrl::OnContextMenu)
+    EVT_SYS_COLOUR_CHANGED(wxRichTextCtrl::OnSysColourChanged)
 
     EVT_MENU(wxID_UNDO, wxRichTextCtrl::OnUndo)
     EVT_UPDATE_UI(wxID_UNDO, wxRichTextCtrl::OnUpdateUndo)
@@ -129,9 +195,9 @@ 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)
 {
-    if (!wxTextCtrlBase::Create(parent, id, pos, size,
-                                style|wxFULL_REPAINT_ON_RESIZE,
-                                validator, name))
+    if (!wxControl::Create(parent, id, pos, size,
+                           style|wxFULL_REPAINT_ON_RESIZE,
+                           validator, name))
         return false;
 
     if (!GetFont().Ok())
@@ -139,36 +205,37 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     }
 
-    GetBuffer().Reset();
-    GetBuffer().SetRichTextCtrl(this);
-
-    SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
-    GetCaret()->Show();
-
     if (style & wxTE_READONLY)
         SetEditable(false);
 
     // The base attributes must all have default values
-    wxTextAttrEx attributes;
+    wxTextAttr attributes;
     attributes.SetFont(GetFont());
-    attributes.SetTextColour(*wxBLACK);
+    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);
 
     // The default attributes will be merged with base attributes, so
     // can be empty to begin with
-    wxTextAttrEx defaultAttributes;
+    wxTextAttr defaultAttributes;
     SetDefaultStyle(defaultAttributes);
 
-    SetBackgroundColour(*wxWHITE);
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
+    GetBuffer().Reset();
+    GetBuffer().SetRichTextCtrl(this);
+
+#if wxRICHTEXT_USE_OWN_CARET
+    SetCaret(new wxRichTextCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
+#else
+    SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
+#endif
+
     // Tell the sizers to use the given or best size
     SetInitialSize(size);
 
@@ -187,6 +254,17 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
 
     GetBuffer().AddEventHandler(this);
 
+    // Accelerators
+    wxAcceleratorEntry entries[4];
+
+    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);
+
+    wxAcceleratorTable accel(4, entries);
+    SetAcceleratorTable(accel);
+
     return true;
 }
 
@@ -200,7 +278,6 @@ wxRichTextCtrl::~wxRichTextCtrl()
 /// Member initialisation
 void wxRichTextCtrl::Init()
 {
-    m_freezeCount = 0;
     m_contextMenu = NULL;
     m_caret = NULL;
     m_caretPosition = -1;
@@ -216,22 +293,13 @@ void wxRichTextCtrl::Init()
     m_caretPositionForDefaultStyle = -2;
 }
 
-/// Call Freeze to prevent refresh
-void wxRichTextCtrl::Freeze()
-{
-    m_freezeCount ++;
-}
-
-/// Call Thaw to refresh
-void wxRichTextCtrl::Thaw()
+void wxRichTextCtrl::DoThaw()
 {
-    m_freezeCount --;
-
-    if (m_freezeCount == 0)
-    {
+    if (GetBuffer().GetDirty())
+        LayoutContent();
+    else
         SetupScrollbars();
-        Refresh(false);
-    }
+    Refresh(false);
 }
 
 /// Clear all text
@@ -244,21 +312,24 @@ void wxRichTextCtrl::Clear()
     m_caretAtLineStart = false;
     m_selectionRange.SetRange(-2, -2);
 
-    SetScrollbars(0, 0, 0, 0, 0, 0);
+    Scroll(0,0);
 
-    if (m_freezeCount == 0)
+    if (!IsFrozen())
     {
-        SetupScrollbars();
+        LayoutContent();
         Refresh(false);
     }
-    SendTextUpdatedEvent();
+
+    wxTextCtrl::SendTextUpdatedEvent(this);
 }
 
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-    if (GetCaret() && GetCaret()->IsVisible())
+#if !wxRICHTEXT_USE_OWN_CARET
+    if (GetCaret() && !IsFrozen())
         GetCaret()->Hide();
+#endif
 
     {
 #if wxRICHTEXT_BUFFERED_PAINTING
@@ -266,11 +337,12 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 #else
         wxPaintDC dc(this);
 #endif
-        PrepareDC(dc);
 
-        if (m_freezeCount > 0)
+        if (IsFrozen())
             return;
 
+        PrepareDC(dc);
+
         dc.SetFont(GetFont());
 
         // Paint the background
@@ -290,12 +362,19 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         }
 
         GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
+#if wxRICHTEXT_USE_OWN_CARET
+        if (GetCaret()->IsVisible())
+        {
+            ((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
+        }
+#endif
     }
 
-    if (GetCaret() && !GetCaret()->IsVisible())
+#if !wxRICHTEXT_USE_OWN_CARET
+    if (GetCaret())
         GetCaret()->Show();
-
     PositionCaret();
+#endif
 }
 
 // Empty implementation, to prevent flicker
@@ -307,22 +386,33 @@ void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
 {
     if (GetCaret())
     {
-        if (!GetCaret()->IsVisible())
-            GetCaret()->Show();
+#if !wxRICHTEXT_USE_OWN_CARET
         PositionCaret();
+#endif
+        GetCaret()->Show();
     }
 
-    // if (!IsFrozen())
-    //    Refresh(false);
+#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
+    // Work around dropouts when control is focused
+    if (!IsFrozen())
+    {
+        Refresh(false);
+    }
+#endif
 }
 
 void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 {
-    if (GetCaret() && GetCaret()->IsVisible())
+    if (GetCaret())
         GetCaret()->Hide();
 
-    // if (!IsFrozen())
-    //    Refresh(false);
+#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
+    // Work around dropouts when control is focused
+    if (!IsFrozen())
+    {
+        Refresh(false);
+    }
+#endif
 }
 
 void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
@@ -348,8 +438,6 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
         m_dragging = true;
         CaptureMouse();
 
-        SelectNone();
-
         bool caretAtLineStart = false;
 
         if (hit & wxRICHTEXT_HITTEST_BEFORE)
@@ -365,8 +453,20 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
             position --;
         }
 
+        long oldCaretPos = m_caretPosition;
+
         MoveCaret(position, caretAtLineStart);
         SetDefaultStyleToCursorStyle();
+
+        if (event.ShiftDown())
+        {
+            if (m_selectionRange.GetStart() == -2)
+                ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
+            else
+                ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
+        }
+        else
+            SelectNone();
     }
 
     event.Skip();
@@ -390,7 +490,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
         wxPoint logicalPt = event.GetLogicalPosition(dc);
         int hit = GetBuffer().HitTest(dc, logicalPt, position);
 
-        if (hit != wxRICHTEXT_HITTEST_NONE)
+        if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
         {
             wxRichTextEvent cmdEvent(
                 wxEVT_COMMAND_RICHTEXT_LEFT_CLICK,
@@ -400,7 +500,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
 
             if (!GetEventHandler()->ProcessEvent(cmdEvent))
             {
-                wxTextAttrEx attr;
+                wxTextAttr attr;
                 if (GetStyle(position, attr))
                 {
                     if (attr.HasFlag(wxTEXT_ATTR_URL))
@@ -409,7 +509,7 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                         if (!urlTarget.IsEmpty())
                         {
                             wxMouseEvent mouseEvent(event);
-                            
+
                             long startPos = 0, endPos = 0;
                             wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
                             if (obj)
@@ -417,12 +517,12 @@ void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event)
                                 startPos = obj->GetRange().GetStart();
                                 endPos = obj->GetRange().GetEnd();
                             }
-                            
+
                             wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos);
                             InitCommandEvent(urlEvent);
-                            
+
                             urlEvent.SetString(urlTarget);
-                            
+
                             GetEventHandler()->ProcessEvent(urlEvent);
                         }
                     }
@@ -448,7 +548,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
     {
         if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
         {
-            wxTextAttrEx attr;
+            wxTextAttr attr;
             if (GetStyle(position, attr))
             {
                 if (attr.HasFlag(wxTEXT_ATTR_URL))
@@ -492,19 +592,16 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
 
         if (m_caretPosition != position)
         {
-            bool extendSel = ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+            ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
 
             MoveCaret(position, caretAtLineStart);
             SetDefaultStyleToCursorStyle();
-
-            if (extendSel)
-                Refresh(false);
         }
     }
 }
 
 /// Right-click
-void wxRichTextCtrl::OnRightClick(wxMouseEvent& WXUNUSED(event))
+void wxRichTextCtrl::OnRightClick(wxMouseEvent& event)
 {
     SetFocus();
 
@@ -513,8 +610,9 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& WXUNUSED(event))
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
-    
-    GetEventHandler()->ProcessEvent(cmdEvent);
+
+    if (!GetEventHandler()->ProcessEvent(cmdEvent))
+        event.Skip();
 }
 
 /// Left-double-click
@@ -525,7 +623,7 @@ void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& WXUNUSED(event))
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
-    
+
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
     {
         SelectWord(GetCaretPosition()+1);
@@ -540,7 +638,7 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event)
         GetId());
     cmdEvent.SetEventObject(this);
     cmdEvent.SetPosition(m_caretPosition+1);
-    
+
     if (!GetEventHandler()->ProcessEvent(cmdEvent))
         event.Skip();
 }
@@ -599,9 +697,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             wxString text;
             text = wxRichTextLineBreakChar;
             GetBuffer().InsertTextWithUndo(newPos+1, text, this);
+            m_caretAtLineStart = true;
+            PositionCaret();
         }
         else
-            GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+            GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();
@@ -633,7 +733,19 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         // so subtract 1 for deleted character and add 1 for conversion to character position.
         if (m_caretPosition > -1 && !HasSelection())
         {
-            GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition, m_caretPosition), this);
+            bool processed = false;
+            if (event.CmdDown())
+            {
+                long pos = wxRichTextCtrl::FindNextWordPosition(-1);
+                if (pos != -1 && (pos < m_caretPosition))
+                {
+                    GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, m_caretPosition), this);
+                    processed = true;
+                }
+            }
+
+            if (!processed)
+                GetBuffer().DeleteRangeWithUndo(wxRichTextRange(m_caretPosition, m_caretPosition), this);
         }
         else
             DeleteSelectedContent();
@@ -985,6 +1097,8 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags)
 {
     if (flags & wxRICHTEXT_SHIFT_DOWN)
     {
+        wxRichTextRange oldSelection = m_selectionRange;
+
         // If not currently selecting, start selecting
         if (m_selectionRange.GetStart() == -2)
         {
@@ -1005,6 +1119,8 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags)
                 m_selectionRange.SetRange(newPos+1, m_selectionAnchor);
         }
 
+        RefreshForSelectionChange(oldSelection, m_selectionRange);
+
         if (m_selectionRange.GetStart() > m_selectionRange.GetEnd())
         {
             wxLogDebug(wxT("Strange selection range"));
@@ -1047,7 +1163,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
 
     // Going down
     if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN ||
-        keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_DOWN ||
+        keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT ||
         keyCode == WXK_END || keyCode == WXK_NUMPAD_END ||
         keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN)
     {
@@ -1119,7 +1235,11 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
             }
         }
     }
-    PositionCaret();
+
+#if !wxRICHTEXT_USE_OWN_CARET
+    if (scrolled)
+#endif
+        PositionCaret();
 
     return scrolled;
 }
@@ -1140,17 +1260,10 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const
     startX = 0;
     startY = startY * ppuY;
 
-    int sx = 0, sy = 0;
-    GetVirtualSize(& sx, & sy);
-    sx = 0;
-    if (ppuY != 0)
-        sy = sy/ppuY;
-
     wxRect rect = line->GetRect();
-
     wxSize clientSize = GetClientSize();
 
-    return !(((rect.y + rect.height) > (clientSize.y + startY)) || rect.y < startY);
+    return (rect.GetBottom() > startY) && (rect.GetTop() < (startY + clientSize.y));
 }
 
 void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
@@ -1281,8 +1394,6 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
     else
@@ -1310,8 +1421,6 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
     else
@@ -1401,8 +1510,6 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1424,8 +1531,6 @@ bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1447,8 +1552,6 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1472,8 +1575,6 @@ bool wxRichTextCtrl::MoveToLineEnd(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1499,8 +1600,6 @@ bool wxRichTextCtrl::MoveToLineStart(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1520,8 +1619,6 @@ bool wxRichTextCtrl::MoveHome(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
     else
@@ -1543,8 +1640,6 @@ bool wxRichTextCtrl::MoveEnd(int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
     else
@@ -1584,8 +1679,6 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
                 PositionCaret();
                 SetDefaultStyleToCursorStyle();
 
-                if (extendSel)
-                    Refresh(false);
                 return true;
             }
         }
@@ -1703,8 +1796,6 @@ bool wxRichTextCtrl::WordLeft(int WXUNUSED(n), int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1727,8 +1818,6 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
-        if (extendSel)
-            Refresh(false);
         return true;
     }
 
@@ -1760,6 +1849,15 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 /// Idle-time processing
 void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 {
+#if wxRICHTEXT_USE_OWN_CARET
+    if (((wxRichTextCaret*) GetCaret())->GetNeedsUpdate())
+    {
+        ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate(false);
+        PositionCaret();
+        GetCaret()->Show();
+    }
+#endif
+
     const int layoutInterval = wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL;
 
     if (m_fullLayoutRequired && (wxGetLocalTimeMillis() > (m_fullLayoutTime + layoutInterval)))
@@ -1785,14 +1883,21 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 /// Scrolling
 void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
 {
-    // Not used
+#if wxRICHTEXT_USE_OWN_CARET
+    if (!((wxRichTextCaret*) GetCaret())->GetNeedsUpdate())
+    {
+        GetCaret()->Hide();
+        ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate();
+    }
+#endif
+
     event.Skip();
 }
 
 /// Set up scrollbars, e.g. after a resize
 void wxRichTextCtrl::SetupScrollbars(bool atTop)
 {
-    if (m_freezeCount)
+    if (IsFrozen())
         return;
 
     if (GetBuffer().IsEmpty())
@@ -1815,14 +1920,31 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
     if (!atTop)
         GetViewStart(& startX, & startY);
 
-    int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);
+    int maxPositionX = 0;
     int maxPositionY = (int) ((((float)(wxMax((unitsY*pixelsPerUnit) - clientSize.y, 0)))/((float)pixelsPerUnit)) + 0.5);
 
+    int newStartX = wxMin(maxPositionX, startX);
+    int newStartY = wxMin(maxPositionY, startY);
+
+    int oldPPUX, oldPPUY;
+    int oldStartX, oldStartY;
+    int oldVirtualSizeX = 0, oldVirtualSizeY = 0;
+    GetScrollPixelsPerUnit(& oldPPUX, & oldPPUY);
+    GetViewStart(& oldStartX, & oldStartY);
+    GetVirtualSize(& oldVirtualSizeX, & oldVirtualSizeY);
+    if (oldPPUY > 0)
+        oldVirtualSizeY /= oldPPUY;
+
+    if (oldPPUX == 0 && oldPPUY == pixelsPerUnit && oldVirtualSizeY == unitsY && oldStartX == newStartX && oldStartY == newStartY)
+        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))
+        return;
+
     // Move to previous scroll position if
     // possible
-    SetScrollbars(0, pixelsPerUnit,
-        0, unitsY,
-        wxMin(maxPositionX, startX), wxMin(maxPositionY, startY));
+    SetScrollbars(0, pixelsPerUnit, 0, unitsY, newStartX, newStartY);
 }
 
 /// Paint the background
@@ -1868,7 +1990,7 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 
 bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 {
-    bool success = GetBuffer().LoadFile(filename, fileType);
+    bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);
     if (success)
         m_filename = filename;
 
@@ -1878,7 +2000,7 @@ bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
     PositionCaret();
     SetupScrollbars(true);
     Refresh(false);
-    SendTextUpdatedEvent();
+    wxTextCtrl::SendTextUpdatedEvent(this);
 
     if (success)
         return true;
@@ -1892,7 +2014,7 @@ bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 
 bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
 {
-    if (GetBuffer().SaveFile(filename, fileType))
+    if (GetBuffer().SaveFile(filename, (wxRichTextFileType)fileType))
     {
         m_filename = filename;
 
@@ -1913,13 +2035,17 @@ 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)
 {
-    return GetBuffer().AddParagraph(text);
+    wxRichTextRange range = GetBuffer().AddParagraph(text);
+    LayoutContent();
+    return range;
 }
 
 /// Add an image
 wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
 {
-    return GetBuffer().AddImage(image);
+    wxRichTextRange range = GetBuffer().AddImage(image);
+    LayoutContent();
+    return range;
 }
 
 // ----------------------------------------------------------------------------
@@ -1936,7 +2062,13 @@ void wxRichTextCtrl::SelectAll()
 void wxRichTextCtrl::SelectNone()
 {
     if (!(GetSelectionRange() == wxRichTextRange(-2, -2)))
-        SetSelection(-2, -2);
+    {
+        wxRichTextRange oldSelection = m_selectionRange;
+
+        m_selectionRange = wxRichTextRange(-2, -2);
+
+        RefreshForSelectionChange(oldSelection, m_selectionRange);
+    }
     m_selectionAnchor = -2;
 }
 
@@ -1955,6 +2087,9 @@ bool wxRichTextCtrl::SelectWord(long position)
     if (!para)
         return false;
 
+    if (position == para->GetRange().GetEnd())
+        position --;
+
     long positionStart = position;
     long positionEnd = position;
 
@@ -1982,6 +2117,9 @@ bool wxRichTextCtrl::SelectWord(long position)
     if (positionEnd >= para->GetRange().GetEnd())
         positionEnd = para->GetRange().GetEnd();
 
+    if (positionEnd < positionStart)
+        return false;
+
     SetSelection(positionStart, positionEnd+1);
 
     if (positionStart >= 0)
@@ -2039,7 +2177,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
         return wxTE_HT_BEFORE;
     else if ((hit & wxRICHTEXT_HITTEST_AFTER) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
         return wxTE_HT_BEYOND;
-    else if (hit & wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_AFTER)
+    else if (hit & (wxRICHTEXT_HITTEST_BEFORE|wxRICHTEXT_HITTEST_AFTER))
         return wxTE_HT_ON_TEXT;
 
     return wxTE_HT_UNKNOWN;
@@ -2062,32 +2200,37 @@ wxString wxRichTextCtrl::GetRange(long from, long to) const
 
 void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
 {
-    Clear();
+    // Don't call Clear here, since it always sends a text updated event
+    m_buffer.ResetAndClearCommands();
+    m_buffer.SetDirty(true);
+    m_caretPosition = -1;
+    m_caretPositionForDefaultStyle = -2;
+    m_caretAtLineStart = false;
+    m_selectionRange.SetRange(-2, -2);
+
+    Scroll(0,0);
+
+    if (!IsFrozen())
+    {
+        LayoutContent();
+        Refresh(false);
+    }
 
-    // if the text is long enough, it's faster to just set it instead of first
-    // comparing it with the old one (chances are that it will be different
-    // anyhow, this comparison is there to avoid flicker for small single-line
-    // edit controls mostly)
-    if ( (value.length() > 0x400) || (value != GetValue()) )
+    if (!value.IsEmpty())
     {
-        DoWriteText(value);
+        // Remove empty paragraph
+        GetBuffer().Clear();
+        DoWriteText(value, flags);
 
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }
-    else // same text
+    else
     {
-        if ( flags & SetValue_SendEvent )
-        {
-            // still send an event for consistency
-            SendTextUpdatedEvent();
-        }
+        // still send an event for consistency
+        if (flags & SetValue_SendEvent)
+            wxTextCtrl::SendTextUpdatedEvent(this);
     }
-
-    // we should reset the modified flag even if the value didn't really change
-
-    // mark the control as being not dirty - we changed its text, not the
-    // user
     DiscardEdits();
 }
 
@@ -2103,7 +2246,7 @@ void wxRichTextCtrl::DoWriteText(const wxString& value, int flags)
     GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
 
     if ( flags & SetValue_SendEvent )
-        SendTextUpdatedEvent();
+        wxTextCtrl::SendTextUpdatedEvent(this);
 }
 
 void wxRichTextCtrl::AppendText(const wxString& text)
@@ -2114,7 +2257,7 @@ void wxRichTextCtrl::AppendText(const wxString& text)
 }
 
 /// Write an image at the current insertion point
-bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType)
 {
     wxRichTextImageBlock imageBlock;
 
@@ -2125,7 +2268,7 @@ bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType)
     return false;
 }
 
-bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType)
 {
     wxRichTextImageBlock imageBlock;
 
@@ -2141,7 +2284,7 @@ bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)
     return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
 }
 
-bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType)
 {
     if (bitmap.Ok())
     {
@@ -2262,6 +2405,8 @@ void wxRichTextCtrl::SetInsertionPoint(long pos)
     SelectNone();
 
     m_caretPosition = pos - 1;
+
+    PositionCaret();
 }
 
 void wxRichTextCtrl::SetInsertionPointEnd()
@@ -2314,13 +2459,21 @@ void wxRichTextCtrl::SetSelection(long from, long to)
 
 void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
 {
-    m_selectionAnchor = from;
-    m_selectionRange.SetRange(from, to-1);
-    if (from > -2)
-        m_caretPosition = from-1;
+    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;
 
-    Refresh(false);
-    PositionCaret();
+        RefreshForSelectionChange(oldSelection, m_selectionRange);
+        PositionCaret();
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -2343,7 +2496,7 @@ void wxRichTextCtrl::Remove(long from, long to)
 {
     SelectNone();
 
-    GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to), this);
+    GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to-1), this);
 
     LayoutContent();
     if (!IsFrozen())
@@ -2536,8 +2689,14 @@ void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
-void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event))
+void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
+    if (event.GetEventObject() != this)
+    {
+        event.Skip();
+        return;
+    }
+
     if (!m_contextMenu)
     {
         m_contextMenu = new wxMenu;
@@ -2555,17 +2714,12 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event))
     return;
 }
 
-bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style)
-{
-    return GetBuffer().SetStyle(wxRichTextRange(start, end-1), style);
-}
-
 bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
-    return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttrEx(style));
+    return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttr(style));
 }
 
-bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
+bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style)
 {
     return GetBuffer().SetStyle(range.ToInternal(), style);
 }
@@ -2573,34 +2727,15 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr
 // 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(long start, long end, const wxTextAttrEx& style, int flags)
-{
-    return GetBuffer().SetStyle(wxRichTextRange(start, end-1), style, flags);
-}
-
-bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttrEx& style, int flags)
-{
-    return GetBuffer().SetStyle(range.ToInternal(), style, flags);
-}
 
-bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
+bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttr& style, int flags)
 {
     return GetBuffer().SetStyle(range.ToInternal(), style, flags);
 }
 
-bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style)
-{
-    return GetBuffer().SetDefaultStyle(style);
-}
-
 bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
 {
-    return GetBuffer().SetDefaultStyle(wxTextAttrEx(style));
-}
-
-const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const
-{
-    return GetBuffer().GetDefaultStyle();
+    return GetBuffer().SetDefaultStyle(wxTextAttr(style));
 }
 
 const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
@@ -2609,65 +2744,18 @@ const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
 }
 
 bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style)
-{
-    wxTextAttrEx attr(style);
-    if (GetBuffer().GetStyle(position, attr))
-    {
-        style = attr;
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style)
-{
-    return GetBuffer().GetStyle(position, style);
-}
-
-bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style)
 {
     return GetBuffer().GetStyle(position, style);
 }
 
 // get the common set of styles for the range
-bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style)
-{
-    wxTextAttrEx styleEx;
-    if (GetBuffer().GetStyleForRange(range.ToInternal(), styleEx))
-    {
-        style = styleEx;
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttrEx& style)
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)
 {
     return GetBuffer().GetStyleForRange(range.ToInternal(), style);
 }
 
 /// Get the content (uncombined) attributes for this position.
-
 bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
-{
-    wxTextAttrEx attr(style);
-    if (GetBuffer().GetUncombinedStyle(position, attr))
-    {
-        style = attr;
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttrEx& style)
-{
-    return GetBuffer().GetUncombinedStyle(position, style);
-}
-
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style)
 {
     return GetBuffer().GetUncombinedStyle(position, style);
 }
@@ -2677,7 +2765,7 @@ bool wxRichTextCtrl::SetFont(const wxFont& font)
 {
     wxControl::SetFont(font);
 
-    wxTextAttrEx attr = GetBuffer().GetAttributes();
+    wxTextAttr attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);
 
@@ -2716,12 +2804,16 @@ void wxRichTextCtrl::PositionCaret()
     wxRect caretRect;
     if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
     {
-        wxPoint originalPt = caretRect.GetPosition();
-        wxPoint pt = GetPhysicalPoint(originalPt);
-        if (GetCaret()->GetPosition() != pt)
+        wxPoint newPt = caretRect.GetPosition();
+        wxSize newSz = caretRect.GetSize();
+        wxPoint pt = GetPhysicalPoint(newPt);
+        if (GetCaret()->GetPosition() != pt || GetCaret()->GetSize() != newSz)
         {
+            GetCaret()->Hide();
+            if (GetCaret()->GetSize() != newSz)
+                GetCaret()->SetSize(newSz);
             GetCaret()->Move(pt);
-            GetCaret()->SetSize(caretRect.GetSize());
+            GetCaret()->Show();
         }
     }
 }
@@ -2831,7 +2923,7 @@ bool wxRichTextCtrl::IsSelectionBold()
 {
     if (HasSelection())
     {
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         wxRichTextRange range = GetSelectionRange();
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         attr.SetFontWeight(wxBOLD);
@@ -2842,7 +2934,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.
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
@@ -2862,7 +2954,7 @@ bool wxRichTextCtrl::IsSelectionItalics()
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFontStyle(wxITALIC);
 
@@ -2872,7 +2964,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.
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
 
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
@@ -2892,7 +2984,7 @@ bool wxRichTextCtrl::IsSelectionUnderlined()
     if (HasSelection())
     {
         wxRichTextRange range = GetSelectionRange();
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         attr.SetFontUnderlined(true);
 
@@ -2902,7 +2994,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.
-        wxRichTextAttr attr;
+        wxTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         long pos = GetAdjustedCaretPosition(GetCaretPosition());
 
@@ -2919,42 +3011,54 @@ bool wxRichTextCtrl::IsSelectionUnderlined()
 /// Apply bold to the selection
 bool wxRichTextCtrl::ApplyBoldToSelection()
 {
-    wxRichTextAttr attr;
+    wxTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
     attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD);
 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
     else
-        SetAndShowDefaultStyle(attr);
+    {
+        wxRichTextAttr current = GetDefaultStyleEx();
+        current.Apply(attr);
+        SetAndShowDefaultStyle(current);
+    }
     return true;
 }
 
 /// Apply italic to the selection
 bool wxRichTextCtrl::ApplyItalicToSelection()
 {
-    wxRichTextAttr attr;
+    wxTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
     attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC);
 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
     else
-        SetAndShowDefaultStyle(attr);
+    {
+        wxRichTextAttr current = GetDefaultStyleEx();
+        current.Apply(attr);
+        SetAndShowDefaultStyle(current);
+    }
     return true;
 }
 
 /// Apply underline to the selection
 bool wxRichTextCtrl::ApplyUnderlineToSelection()
 {
-    wxRichTextAttr attr;
+    wxTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
     attr.SetFontUnderlined(!IsSelectionUnderlined());
 
     if (HasSelection())
         return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
     else
-        SetAndShowDefaultStyle(attr);
+    {
+        wxRichTextAttr current = GetDefaultStyleEx();
+        current.Apply(attr);
+        SetAndShowDefaultStyle(current);
+    }
     return true;
 }
 
@@ -2967,7 +3071,7 @@ bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
     else
         range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+2);
 
-    wxRichTextAttr attr;
+    wxTextAttr attr;
     attr.SetAlignment(alignment);
 
     return HasParagraphAttributes(range, attr);
@@ -2976,7 +3080,7 @@ bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)
 /// Apply alignment to the selection
 bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
 {
-    wxRichTextAttr attr;
+    wxTextAttr attr;
     attr.SetAlignment(alignment);
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
@@ -2994,9 +3098,9 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
 {
     // Flags are defined within each definition, so only certain
     // attributes are applied.
-    wxRichTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());
+    wxTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());
 
-    int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE;
+    int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET;
 
     if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition)))
     {
@@ -3032,7 +3136,9 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
         return SetStyleEx(GetSelectionRange(), attr, flags);
     else
     {
-        SetAndShowDefaultStyle(attr);
+        wxRichTextAttr current = GetDefaultStyleEx();
+        current.Apply(attr);
+        SetAndShowDefaultStyle(current);
         return true;
     }
 }
@@ -3058,7 +3164,7 @@ bool wxRichTextCtrl::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
 /// Sets the default style to the style under the cursor
 bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 {
-    wxTextAttrEx attr;
+    wxTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_CHARACTER);
 
     // If at the start of a paragraph, use the next position.
@@ -3189,5 +3295,187 @@ void wxRichTextCtrl::ClearAvailableFontNames()
     sm_availableFontNames.Clear();
 }
 
+void wxRichTextCtrl::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+{
+    //wxLogDebug(wxT("wxRichTextCtrl::OnSysColourChanged"));
+
+    wxTextAttrEx basicStyle = GetBasicStyle();
+    basicStyle.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+    SetBasicStyle(basicStyle);
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+
+    Refresh();
+}
+
+// Refresh the area affected by a selection change
+bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelection, const wxRichTextRange& newSelection)
+{
+    // Calculate the refresh rectangle - just the affected lines
+    long firstPos, lastPos;
+    if (oldSelection.GetStart() == -2 && newSelection.GetStart() != -2)
+    {
+        firstPos = newSelection.GetStart();
+        lastPos = newSelection.GetEnd();
+    }
+    else if (oldSelection.GetStart() != -2 && newSelection.GetStart() == -2)
+    {
+        firstPos = oldSelection.GetStart();
+        lastPos = oldSelection.GetEnd();
+    }
+    else if (oldSelection.GetStart() == -2 && newSelection.GetStart() == -2)
+    {
+        return false;
+    }
+    else
+    {
+        firstPos = wxMin(oldSelection.GetStart(), newSelection.GetStart());
+        lastPos = wxMax(oldSelection.GetEnd(), newSelection.GetEnd());
+    }
+
+    wxRichTextLine* firstLine = GetBuffer().GetLineAtPosition(firstPos);
+    wxRichTextLine* lastLine = GetBuffer().GetLineAtPosition(lastPos);
+
+    if (firstLine && lastLine)
+    {
+        wxSize clientSize = GetClientSize();
+        wxPoint pt1 = GetPhysicalPoint(firstLine->GetAbsolutePosition());
+        wxPoint pt2 = GetPhysicalPoint(lastLine->GetAbsolutePosition()) + wxPoint(0, lastLine->GetSize().y);
+
+        pt1.x = 0;
+        pt1.y = wxMax(0, pt1.y);
+        pt2.x = 0;
+        pt2.y = wxMin(clientSize.y, pt2.y);
+
+        wxRect rect(pt1, wxSize(clientSize.x, pt2.y - pt1.y));
+        RefreshRect(rect, false);
+    }
+    else
+        Refresh(false);
+
+    return true;
+}
+
+#if wxRICHTEXT_USE_OWN_CARET
+
+// ----------------------------------------------------------------------------
+// initialization and destruction
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::Init()
+{
+    m_hasFocus = true;
+
+    m_xOld =
+    m_yOld = -1;
+    m_richTextCtrl = NULL;
+    m_needsUpdate = false;
+}
+
+wxRichTextCaret::~wxRichTextCaret()
+{
+}
+
+// ----------------------------------------------------------------------------
+// showing/hiding/moving the caret (base class interface)
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::DoShow()
+{
+    Refresh();
+}
+
+void wxRichTextCaret::DoHide()
+{
+    Refresh();
+}
+
+void wxRichTextCaret::DoMove()
+{
+    if (IsVisible())
+    {
+        Refresh();
+
+        if (m_xOld != -1 && m_yOld != -1)
+        {
+            if (m_richTextCtrl)
+            {
+                wxRect rect(GetPosition(), GetSize());
+                m_richTextCtrl->RefreshRect(rect, false);
+            }
+        }
+    }
+
+    m_xOld = m_x;
+    m_yOld = m_y;
+}
+
+void wxRichTextCaret::DoSize()
+{
+    int countVisible = m_countVisible;
+    if (countVisible > 0)
+    {
+        m_countVisible = 0;
+        DoHide();
+    }
+
+    if (countVisible > 0)
+    {
+        m_countVisible = countVisible;
+        DoShow();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// handling the focus
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::OnSetFocus()
+{
+    m_hasFocus = true;
+
+    if ( IsVisible() )
+        Refresh();
+}
+
+void wxRichTextCaret::OnKillFocus()
+{
+    m_hasFocus = false;
+}
+
+// ----------------------------------------------------------------------------
+// drawing the caret
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::Refresh()
+{
+    if (m_richTextCtrl)
+    {
+        wxRect rect(GetPosition(), GetSize());
+        m_richTextCtrl->RefreshRect(rect, false);
+    }
+}
+
+void wxRichTextCaret::DoDraw(wxDC *dc)
+{
+    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);
+    }
+    dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+#endif
+    // wxRICHTEXT_USE_OWN_CARET
+
 #endif
     // wxUSE_RICHTEXT