GetSpacer returns a copy, not a reference to the size

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

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

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

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


@@ -13,26 +13,29 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
+#if wxUSE_RICHTEXT

 
 

-#include "wx/image.h"
+#include "wx/richtext/richtextctrl.h"
+#include "wx/richtext/richtextstyles.h"

 
 

-#if wxUSE_RICHTEXT
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+    #include "wx/settings.h"
+#endif

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

-#include "wx/settings.h"

 #include "wx/filename.h"
 #include "wx/dcbuffer.h"
 #include "wx/filename.h"
 #include "wx/dcbuffer.h"

-
-#include "wx/richtext/richtextctrl.h"

 #include "wx/arrimpl.cpp"
 
 #include "wx/arrimpl.cpp"
 

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

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK)


@@ -41,19 +44,11 @@ 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_LEFT_DCLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RETURN)
 

-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
 IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )

-#else
-IMPLEMENT_CLASS( wxRichTextCtrl, wxScrolledWindow )
-#endif

 
 IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
 
 
 IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
 

-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )
 BEGIN_EVENT_TABLE( wxRichTextCtrl, wxControl )

-#else
-BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow )
-#endif

     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
     EVT_IDLE(wxRichTextCtrl::OnIdle)
     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
     EVT_IDLE(wxRichTextCtrl::OnIdle)


@@ -97,34 +92,29 @@ END_EVENT_TABLE()
  */
 
 wxRichTextCtrl::wxRichTextCtrl()
  */
 
 wxRichTextCtrl::wxRichTextCtrl()

-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-    : wxScrollHelper(this)
-#endif
+              : wxScrollHelper(this)

 {
     Init();
 }
 
 {
     Init();
 }
 

-wxRichTextCtrl::wxRichTextCtrl( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-    : wxScrollHelper(this)
-#endif
+wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& value,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style)
+              : wxScrollHelper(this)

 {
     Init();
 {
     Init();

-    Create(parent, id, pos, size, style);
+    Create(parent, id, value, pos, size, style);

 }
 
 /// Creation
 }
 
 /// Creation

-bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
+bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style)

 {
 {

-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
-    if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE
-        ))
+    if (!wxTextCtrlBase::Create(parent, id, pos, size,
+                                style|wxFULL_REPAINT_ON_RESIZE))

         return false;
         return false;

-#else
-    if (!wxScrolledWindow::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE
-        ))
-        return false;
-#endif

 
     if (!GetFont().Ok())
     {
 
     if (!GetFont().Ok())
     {


@@ -138,22 +128,33 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos
     attributes.SetTextColour(*wxBLACK);
     attributes.SetBackgroundColour(*wxWHITE);
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     attributes.SetTextColour(*wxBLACK);
     attributes.SetBackgroundColour(*wxWHITE);
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);

+    attributes.SetLineSpacing(10);
+    attributes.SetParagraphSpacingAfter(10);
+    attributes.SetParagraphSpacingBefore(0);

     attributes.SetFlags(wxTEXT_ATTR_ALL);
     attributes.SetFlags(wxTEXT_ATTR_ALL);

-
-    SetDefaultStyle(attributes);

     SetBasicStyle(attributes);
 
     SetBasicStyle(attributes);
 

+    // The default attributes will be merged with base attributes, so
+    // can be empty to begin with
+    wxTextAttrEx defaultAttributes;
+    SetDefaultStyle(defaultAttributes);
+

     SetBackgroundColour(*wxWHITE);
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
     // Tell the sizers to use the given or best size
     SetBestFittingSize(size);
 
     SetBackgroundColour(*wxWHITE);
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
     // Tell the sizers to use the given or best size
     SetBestFittingSize(size);
 

+#if wxRICHTEXT_BUFFERED_PAINTING

     // Create a buffer
     RecreateBuffer(size);
     // Create a buffer
     RecreateBuffer(size);

+#endif

 
     SetCursor(wxCursor(wxCURSOR_IBEAM));
 
 
     SetCursor(wxCursor(wxCURSOR_IBEAM));
 

+    if (!value.IsEmpty())
+        SetValue(value);
+

     return true;
 }
 
     return true;
 }
 


@@ -178,6 +179,7 @@ void wxRichTextCtrl::Init()
     m_fullLayoutTime = 0;
     m_fullLayoutSavedPosition = 0;
     m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
     m_fullLayoutTime = 0;
     m_fullLayoutSavedPosition = 0;
     m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;

+    m_caretPositionForDefaultStyle = -2;

 }
 
 /// Call Freeze to prevent refresh
 }
 
 /// Call Freeze to prevent refresh


@@ -204,15 +206,18 @@ void wxRichTextCtrl::Clear()
     m_buffer.Reset();
     m_buffer.SetDirty(true);
     m_caretPosition = -1;
     m_buffer.Reset();
     m_buffer.SetDirty(true);
     m_caretPosition = -1;

+    m_caretPositionForDefaultStyle = -2;

     m_caretAtLineStart = false;
     m_selectionRange.SetRange(-2, -2);
 
     m_caretAtLineStart = false;
     m_selectionRange.SetRange(-2, -2);
 

+    SetScrollbars(0, 0, 0, 0, 0, 0);
+

     if (m_freezeCount == 0)
     {
         SetupScrollbars();
         Refresh(false);
     }
     if (m_freezeCount == 0)
     {
         SetupScrollbars();
         Refresh(false);
     }

-    SendUpdateEvent();
+    SendTextUpdatedEvent();

 }
 
 /// Painting
 }
 
 /// Painting


@@ -222,21 +227,21 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         GetCaret()->Hide();
 
     {
         GetCaret()->Hide();
 
     {

+#if wxRICHTEXT_BUFFERED_PAINTING

         wxBufferedPaintDC dc(this, m_bufferBitmap);
         wxBufferedPaintDC dc(this, m_bufferBitmap);

-        //wxLogDebug(wxT("OnPaint"));
-        
+#else
+        wxPaintDC dc(this);
+#endif

         PrepareDC(dc);
         PrepareDC(dc);

-        
+

         if (m_freezeCount > 0)
             return;
         if (m_freezeCount > 0)
             return;

-        
+

         dc.SetFont(GetFont());
         dc.SetFont(GetFont());

-        
+

         // Paint the background
         PaintBackground(dc);
         // Paint the background
         PaintBackground(dc);

-        
-        wxRegion dirtyRegion = GetUpdateRegion();
-        
+

         wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
         wxRect availableSpace(GetClientSize());
         if (GetBuffer().GetDirty())
         wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
         wxRect availableSpace(GetClientSize());
         if (GetBuffer().GetDirty())


@@ -245,8 +250,8 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             GetBuffer().SetDirty(false);
             SetupScrollbars();
         }
             GetBuffer().SetDirty(false);
             SetupScrollbars();
         }

-        
-        GetBuffer().Draw(dc, GetBuffer().GetRange(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
+
+        GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);

     }
 
     if (GetCaret())
     }
 
     if (GetCaret())


@@ -316,19 +321,6 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
 
         MoveCaret(position, caretAtLineStart);
         SetDefaultStyleToCursorStyle();
 
         MoveCaret(position, caretAtLineStart);
         SetDefaultStyleToCursorStyle();

-
-#if 0
-        wxWindow* p = GetParent();
-        while (p && !p->IsKindOf(CLASSINFO(wxFrame)))
-            p = p->GetParent();
-
-        wxFrame* frame = wxDynamicCast(p, wxFrame);
-        if (frame)
-        {
-            wxString msg = wxString::Format(wxT("Found position %ld"), position);
-            frame->SetStatusText(msg, 1);
-        }
-#endif

     }
 
     event.Skip();
     }
 
     event.Skip();


@@ -404,6 +396,7 @@ void wxRichTextCtrl::OnRightClick(wxMouseEvent& event)
 /// Left-double-click
 void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& event)
 {
 /// Left-double-click
 void wxRichTextCtrl::OnLeftDClick(wxMouseEvent& event)
 {

+    SelectWord(GetCaretPosition()+1);

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -417,7 +410,7 @@ void wxRichTextCtrl::OnMiddleClick(wxMouseEvent& event)
 void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 {
     int flags = 0;
 void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 {
     int flags = 0;

-    if (event.ControlDown())
+    if (event.CmdDown())

         flags |= wxRICHTEXT_CTRL_DOWN;
     if (event.ShiftDown())
         flags |= wxRICHTEXT_SHIFT_DOWN;
         flags |= wxRICHTEXT_CTRL_DOWN;
     if (event.ShiftDown())
         flags |= wxRICHTEXT_SHIFT_DOWN;


@@ -431,13 +424,30 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         event.GetKeyCode() == WXK_HOME ||
         event.GetKeyCode() == WXK_PAGEUP ||
         event.GetKeyCode() == WXK_PAGEDOWN ||
         event.GetKeyCode() == WXK_HOME ||
         event.GetKeyCode() == WXK_PAGEUP ||
         event.GetKeyCode() == WXK_PAGEDOWN ||

-        event.GetKeyCode() == WXK_PRIOR ||
-        event.GetKeyCode() == WXK_NEXT ||
-        event.GetKeyCode() == WXK_END)
+        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);
     {
         KeyboardNavigate(event.GetKeyCode(), flags);

+        return;

     }
     }

-    else if (event.GetKeyCode() == WXK_RETURN)
+
+    // all the other keys modify the controls contents which shouldn't be
+    // possible if we're read-only
+    if ( !IsEditable() )
+    {
+        event.Skip();
+        return;
+    }
+
+    if (event.GetKeyCode() == WXK_RETURN)

     {
         BeginBatchUndo(_("Insert Text"));
 
     {
         BeginBatchUndo(_("Insert Text"));
 


@@ -445,7 +455,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
         DeleteSelectedContent(& newPos);
 
 
         DeleteSelectedContent(& newPos);
 

-        GetBuffer().InsertNewlineWithUndo(newPos+1, this);
+        GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);

 
         wxRichTextEvent cmdEvent(
             wxEVT_COMMAND_RICHTEXT_RETURN,
 
         wxRichTextEvent cmdEvent(
             wxEVT_COMMAND_RICHTEXT_RETURN,


@@ -456,6 +466,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();

+
+        ScrollIntoView(m_caretPosition, WXK_RIGHT);

     }
     else if (event.GetKeyCode() == WXK_BACK)
     {
     }
     else if (event.GetKeyCode() == WXK_BACK)
     {


@@ -485,6 +497,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             SetDefaultStyleToCursorStyle();
         }
 
             SetDefaultStyleToCursorStyle();
         }
 

+        ScrollIntoView(m_caretPosition, WXK_LEFT);

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


@@ -515,22 +528,132 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
     }
     else
     {
     }
     else
     {

-        BeginBatchUndo(_("Insert Text"));
+        long keycode = event.GetKeyCode();
+        switch ( keycode )
+        {
+            case WXK_ESCAPE:
+            // case WXK_SPACE:
+            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:
+            {
+                event.Skip();
+                return;
+            }

 
 

-        long newPos = m_caretPosition;
-        DeleteSelectedContent(& newPos);
+            default:
+            {
+                if (event.CmdDown() || event.AltDown())
+                {
+                    event.Skip();
+                    return;
+                }

 
 

-        wxString str = (wxChar) event.GetKeyCode();
-        GetBuffer().InsertTextWithUndo(newPos+1, str, this);
+                BeginBatchUndo(_("Insert Text"));

 
 

-        EndBatchUndo();
+                long newPos = m_caretPosition;
+                DeleteSelectedContent(& newPos);

 
 

-        SetDefaultStyleToCursorStyle();
+                wxString str = (wxChar) event.GetKeyCode();
+                GetBuffer().InsertTextWithUndo(newPos+1, str, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+
+                EndBatchUndo();
+
+                SetDefaultStyleToCursorStyle();
+                ScrollIntoView(m_caretPosition, WXK_RIGHT);
+            }
+        }

     }
     }

-#if 0
-    else
-        event.Skip();
-#endif

 }
 
 /// Delete content if there is a selection, e.g. when pressing a key.
 }
 
 /// Delete content if there is a selection, e.g. when pressing a key.


@@ -588,50 +711,50 @@ bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags)
 {
     bool success = false;
 
 {
     bool success = false;
 

-    if (keyCode == WXK_RIGHT)
+    if (keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = WordRight(1, flags);
         else
             success = MoveRight(1, flags);
     }
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = WordRight(1, flags);
         else
             success = MoveRight(1, flags);
     }

-    else if (keyCode == WXK_LEFT)
+    else if (keyCode == WXK_LEFT || keyCode == WXK_NUMPAD_LEFT)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = WordLeft(1, flags);
         else
             success = MoveLeft(1, flags);
     }
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = WordLeft(1, flags);
         else
             success = MoveLeft(1, flags);
     }

-    else if (keyCode == WXK_UP)
+    else if (keyCode == WXK_UP || keyCode == WXK_NUMPAD_UP)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveToParagraphStart(flags);
         else
             success = MoveUp(1, flags);
     }
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveToParagraphStart(flags);
         else
             success = MoveUp(1, flags);
     }

-    else if (keyCode == WXK_DOWN)
+    else if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveToParagraphEnd(flags);
         else
             success = MoveDown(1, flags);
     }
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveToParagraphEnd(flags);
         else
             success = MoveDown(1, flags);
     }

-    else if (keyCode == WXK_PAGEUP || keyCode == WXK_PRIOR)
+    else if (keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP)

     {
         success = PageUp(1, flags);
     }
     {
         success = PageUp(1, flags);
     }

-    else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NEXT)
+    else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN)

     {
         success = PageDown(1, flags);
     }
     {
         success = PageDown(1, flags);
     }

-    else if (keyCode == WXK_HOME)
+    else if (keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveHome(flags);
         else
             success = MoveToLineStart(flags);
     }
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveHome(flags);
         else
             success = MoveToLineStart(flags);
     }

-    else if (keyCode == WXK_END)
+    else if (keyCode == WXK_END || keyCode == WXK_NUMPAD_END)

     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveEnd(flags);
     {
         if (flags & wxRICHTEXT_CTRL_DOWN)
             success = MoveEnd(flags);


@@ -696,16 +819,16 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
     int ppuX, ppuY;
     GetScrollPixelsPerUnit(& ppuX, & ppuY);
 
     int ppuX, ppuY;
     GetScrollPixelsPerUnit(& ppuX, & ppuY);
 

-    int startX, startY;
-    GetViewStart(& startX, & startY);
-    startX = 0;
-    startY = startY * ppuY;
+    int startXUnits, startYUnits;
+    GetViewStart(& startXUnits, & startYUnits);
+    int startY = startYUnits * ppuY;

 
 

-    int sx, sy;
+    int sx = 0, sy = 0;

     GetVirtualSize(& sx, & sy);
     GetVirtualSize(& sx, & sy);

-    sx = 0;
+    int sxUnits = 0;
+    int syUnits = 0;

     if (ppuY != 0)
     if (ppuY != 0)

-        sy = sy/ppuY;
+        syUnits = sy/ppuY;

 
     wxRect rect = line->GetRect();
 
 
     wxRect rect = line->GetRect();
 


@@ -714,18 +837,25 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
     wxSize clientSize = GetClientSize();
 
     // Going down
     wxSize clientSize = GetClientSize();
 
     // Going down

-    if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_NEXT || keyCode == WXK_PAGEDOWN)
+    if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN ||
+        keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_DOWN ||
+        keyCode == WXK_END || keyCode == WXK_NUMPAD_END ||
+        keyCode == WXK_PAGEDOWN || keyCode == WXK_NUMPAD_PAGEDOWN)

     {
         if ((rect.y + rect.height) > (clientSize.y + startY))
         {
             // Make it scroll so this item is at the bottom
             // of the window
             int y = rect.y - (clientSize.y - rect.height);
     {
         if ((rect.y + rect.height) > (clientSize.y + startY))
         {
             // Make it scroll so this item is at the bottom
             // of the window
             int y = rect.y - (clientSize.y - rect.height);

-            y = (int) (0.5 + y/ppuY);
+            int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
+
+            // If we're still off the screen, scroll another line down
+            if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY)))
+                yUnits ++;

 
 

-            if (startY != y)
+            if (startYUnits != yUnits)

             {
             {

-                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);

                 scrolled = true;
             }
         }
                 scrolled = true;
             }
         }


@@ -734,28 +864,31 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
             // Make it scroll so this item is at the top
             // of the window
             int y = rect.y ;
             // Make it scroll so this item is at the top
             // of the window
             int y = rect.y ;

-            y = (int) (0.5 + y/ppuY);
+            int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);

 
 

-            if (startY != y)
+            if (startYUnits != yUnits)

             {
             {

-                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);

                 scrolled = true;
             }
         }
     }
     // Going up
                 scrolled = true;
             }
         }
     }
     // Going up

-    else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP)
+    else if (keyCode == WXK_UP  || keyCode == WXK_NUMPAD_UP ||
+             keyCode == WXK_LEFT || keyCode == WXK_NUMPAD_LEFT ||
+             keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME ||
+             keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP )

     {
         if (rect.y < startY)
         {
             // Make it scroll so this item is at the top
             // of the window
             int y = rect.y ;
     {
         if (rect.y < startY)
         {
             // Make it scroll so this item is at the top
             // of the window
             int y = rect.y ;

-            y = (int) (0.5 + y/ppuY);
+            int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);

 
 

-            if (startY != y)
+            if (startYUnits != yUnits)

             {
             {

-                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);

                 scrolled = true;
             }
         }
                 scrolled = true;
             }
         }


@@ -764,11 +897,15 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
             // Make it scroll so this item is at the bottom
             // of the window
             int y = rect.y - (clientSize.y - rect.height);
             // Make it scroll so this item is at the bottom
             // of the window
             int y = rect.y - (clientSize.y - rect.height);

-            y = (int) (0.5 + y/ppuY);
+            int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);

 
 

-            if (startY != y)
+            // If we're still off the screen, scroll another line down
+            if ((rect.y + rect.height) > (clientSize.y + (yUnits*ppuY)))
+                yUnits ++;
+
+            if (startYUnits != yUnits)

             {
             {

-                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);

                 scrolled = true;
             }
         }
                 scrolled = true;
             }
         }


@@ -794,7 +931,7 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const
     startX = 0;
     startY = startY * ppuY;
 
     startX = 0;
     startY = startY * ppuY;
 

-    int sx, sy;
+    int sx = 0, sy = 0;

     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)
     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)


@@ -1059,8 +1196,8 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
             Refresh(false);
         return true;
     }
             Refresh(false);
         return true;
     }

-    else
-        return false;
+
+    return false;

 }
 
 /// Move to the end of the paragraph
 }
 
 /// Move to the end of the paragraph


@@ -1383,7 +1520,9 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event)
     else
         GetBuffer().Invalidate(wxRICHTEXT_ALL);
 
     else
         GetBuffer().Invalidate(wxRICHTEXT_ALL);
 

+#if wxRICHTEXT_BUFFERED_PAINTING

     RecreateBuffer();
     RecreateBuffer();

+#endif

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -1402,6 +1541,15 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
         ShowPosition(m_fullLayoutSavedPosition);
         Refresh(false);
     }
         ShowPosition(m_fullLayoutSavedPosition);
         Refresh(false);
     }

+
+    if (m_caretPositionForDefaultStyle != -2)
+    {
+        // If the caret position has changed, no longer reflect the default style
+        // in the UI.
+        if (GetCaretPosition() != m_caretPositionForDefaultStyle)
+            m_caretPositionForDefaultStyle = -2;
+    }
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -1426,19 +1574,20 @@ void wxRichTextCtrl::SetupScrollbars(bool atTop)
 
     // TODO: reimplement scrolling so we scroll by line, not by fixed number
     // of pixels. See e.g. wxVScrolledWindow for ideas.
 
     // TODO: reimplement scrolling so we scroll by line, not by fixed number
     // of pixels. See e.g. wxVScrolledWindow for ideas.

-    int pixelsPerUnit = 5; // 10;
+    int pixelsPerUnit = 5;

     wxSize clientSize = GetClientSize();
 
     int maxHeight = GetBuffer().GetCachedSize().y;
 
     wxSize clientSize = GetClientSize();
 
     int maxHeight = GetBuffer().GetCachedSize().y;
 

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

 
     int startX = 0, startY = 0;
     if (!atTop)
         GetViewStart(& startX, & startY);
 
     int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);
 
     int startX = 0, startY = 0;
     if (!atTop)
         GetViewStart(& startX, & startY);
 
     int maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);

-    int maxPositionY = (wxMax(maxHeight - clientSize.y, 0))/pixelsPerUnit;
+    int maxPositionY = (int) ((((float)(wxMax((unitsY*pixelsPerUnit) - clientSize.y, 0)))/((float)pixelsPerUnit)) + 0.5);

 
     // Move to previous scroll position if
     // possible
 
     // Move to previous scroll position if
     // possible


@@ -1467,6 +1616,7 @@ void wxRichTextCtrl::PaintBackground(wxDC& dc)
     dc.DrawRectangle(windowRect);
 }
 
     dc.DrawRectangle(windowRect);
 }
 

+#if wxRICHTEXT_BUFFERED_PAINTING

 /// Recreate buffer bitmap if necessary
 bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 {
 /// Recreate buffer bitmap if necessary
 bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 {


@@ -1481,14 +1631,15 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
         m_bufferBitmap = wxBitmap(sz.x, sz.y);
     return m_bufferBitmap.Ok();
 }
         m_bufferBitmap = wxBitmap(sz.x, sz.y);
     return m_bufferBitmap.Ok();
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // file IO functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // file IO functions
 // ----------------------------------------------------------------------------
 

-bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
+bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)

 {
 {

-    bool success = GetBuffer().LoadFile(filename, type);
+    bool success = GetBuffer().LoadFile(filename, fileType);

     if (success)
         m_filename = filename;
 
     if (success)
         m_filename = filename;
 


@@ -1498,7 +1649,7 @@ bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
     PositionCaret();
     SetupScrollbars(true);
     Refresh(false);
     PositionCaret();
     SetupScrollbars(true);
     Refresh(false);

-    SendUpdateEvent();
+    SendTextUpdatedEvent();

 
     if (success)
         return true;
 
     if (success)
         return true;


@@ -1510,25 +1661,15 @@ bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
     }
 }
 
     }
 }
 

-bool wxRichTextCtrl::SaveFile(const wxString& filename, int type)
+bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)

 {
 {

-    wxString filenameToUse = filename.empty() ? m_filename : filename;
-    if ( filenameToUse.empty() )
+    if (GetBuffer().SaveFile(filename, fileType))

     {
     {

-        // what kind of message to give? is it an error or a program bug?
-        wxLogDebug(wxT("Can't save textctrl to file without filename."));
-
-        return false;
-    }
-
-    if (GetBuffer().SaveFile(filenameToUse, type))
-    {
-        m_filename = filenameToUse;
+        m_filename = filename;

 
         DiscardEdits();
 
         return true;
 
         DiscardEdits();
 
         return true;

-

     }
 
     wxLogError(_("The text couldn't be saved."));
     }
 
     wxLogError(_("The text couldn't be saved."));


@@ -1558,7 +1699,7 @@ wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
 
 void wxRichTextCtrl::SelectAll()
 {
 
 void wxRichTextCtrl::SelectAll()
 {

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

     m_selectionAnchor = -1;
 }
 
     m_selectionAnchor = -1;
 }
 


@@ -1570,25 +1711,65 @@ void wxRichTextCtrl::SelectNone()
     m_selectionAnchor = -2;
 }
 
     m_selectionAnchor = -2;
 }
 

-wxString wxRichTextCtrl::GetStringSelection() const
+static bool wxIsWordDelimiter(const wxString& text)

 {
 {

-    long from, to;
-    GetSelection(&from, &to);
-
-    return GetRange(from, to);
+    return !text.IsEmpty() && !wxIsalnum(text[0]);

 }
 
 }
 

-// do the window-specific processing after processing the update event
-void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
+/// Select the word at the given character position
+bool wxRichTextCtrl::SelectWord(long position)

 {
 {

-    if ( event.GetSetEnabled() )
-        Enable(event.GetEnabled());
+    if (position < 0 || position > GetBuffer().GetRange().GetEnd())
+        return false;
+
+    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
+    if (!para)
+        return false;
+
+    long positionStart = position;
+    long positionEnd = position;
+
+    for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --)
+    {
+        wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionStart, positionStart));
+        if (wxIsWordDelimiter(text))
+        {
+            positionStart ++;
+            break;
+        }
+    }
+    if (positionStart < para->GetRange().GetStart())
+        positionStart = para->GetRange().GetStart();

 
 

-    if ( event.GetSetText() )
+    for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++)

     {
     {

-        if ( event.GetText() != GetValue() )
-            SetValue(event.GetText());
+        wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionEnd, positionEnd));
+        if (wxIsWordDelimiter(text))
+        {
+            positionEnd --;
+            break;
+        }
+    }
+    if (positionEnd >= para->GetRange().GetEnd())
+        positionEnd = para->GetRange().GetEnd();
+
+    SetSelection(positionStart, positionEnd+1);
+
+    if (positionStart >= 0)
+    {
+        MoveCaret(positionStart-1, true);
+        SetDefaultStyleToCursorStyle();

     }
     }

+
+    return true;
+}
+
+wxString wxRichTextCtrl::GetStringSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+
+    return GetRange(from, to);

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


@@ -1619,15 +1800,25 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
     wxClientDC dc((wxRichTextCtrl*) this);
     ((wxRichTextCtrl*)this)->PrepareDC(dc);
 
     wxClientDC dc((wxRichTextCtrl*) this);
     ((wxRichTextCtrl*)this)->PrepareDC(dc);
 

-    int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt, *pos);
-    if (hit == wxRICHTEXT_HITTEST_BEFORE)
-        return wxTE_HT_BEFORE;
-    else if (hit == wxRICHTEXT_HITTEST_AFTER)
-        return wxTE_HT_BEYOND;
-    else if (hit == wxRICHTEXT_HITTEST_ON)
-        return wxTE_HT_ON_TEXT;
-    else
-        return wxTE_HT_UNKNOWN;
+    // Buffer uses logical position (relative to start of buffer)
+    // so convert
+    wxPoint pt2 = GetLogicalPoint(pt);
+
+    int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt2, *pos);
+
+    switch ( hit )
+    {
+        case wxRICHTEXT_HITTEST_BEFORE:
+            return wxTE_HT_BEFORE;
+
+        case wxRICHTEXT_HITTEST_AFTER:
+            return wxTE_HT_BEYOND;
+
+        case wxRICHTEXT_HITTEST_ON:
+            return wxTE_HT_ON_TEXT;
+    }
+
+    return wxTE_HT_UNKNOWN;

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


@@ -1641,10 +1832,11 @@ wxString wxRichTextCtrl::GetValue() const
 
 wxString wxRichTextCtrl::GetRange(long from, long to) const
 {
 
 wxString wxRichTextCtrl::GetRange(long from, long to) const
 {

-    return GetBuffer().GetTextForRange(wxRichTextRange(from, to));
+    // Public API for range is different from internals
+    return GetBuffer().GetTextForRange(wxRichTextRange(from, to-1));

 }
 
 }
 

-void wxRichTextCtrl::SetValue(const wxString& value)
+void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)

 {
     Clear();
 
 {
     Clear();
 


@@ -1654,15 +1846,18 @@ void wxRichTextCtrl::SetValue(const wxString& value)
     // edit controls mostly)
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {
     // edit controls mostly)
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {

-        DoWriteText(value, false /* not selection only */);
+        DoWriteText(value);

 
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }
     else // same text
     {
 
         // for compatibility, don't move the cursor when doing SetValue()
         SetInsertionPoint(0);
     }
     else // same text
     {

-        // still send an event for consistency
-        SendUpdateEvent();
+        if ( flags & SetValue_SendEvent )
+        {
+            // still send an event for consistency
+            SendTextUpdatedEvent();
+        }

     }
 
     // we should reset the modified flag even if the value didn't really change
     }
 
     // we should reset the modified flag even if the value didn't really change


@@ -1677,9 +1872,14 @@ void wxRichTextCtrl::WriteText(const wxString& value)
     DoWriteText(value);
 }
 
     DoWriteText(value);
 }
 

-void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly))
+void wxRichTextCtrl::DoWriteText(const wxString& value, int flags)

 {
 {

-    GetBuffer().InsertTextWithUndo(m_caretPosition+1, value, this);
+    wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
+
+    GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this);
+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 void wxRichTextCtrl::AppendText(const wxString& text)
 }
 
 void wxRichTextCtrl::AppendText(const wxString& text)


@@ -1697,8 +1897,8 @@ bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType)
     wxImage image2 = image;
     if (imageBlock.MakeImageBlock(image2, bitmapType))
         return WriteImage(imageBlock);
     wxImage image2 = image;
     if (imageBlock.MakeImageBlock(image2, bitmapType))
         return WriteImage(imageBlock);

-    else
-        return false;
+
+    return false;

 }
 
 bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)
 }
 
 bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)


@@ -1708,8 +1908,8 @@ bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)
     wxImage image;
     if (imageBlock.MakeImageBlock(filename, bitmapType, image, false))
         return WriteImage(imageBlock);
     wxImage image;
     if (imageBlock.MakeImageBlock(filename, bitmapType, image, false))
         return WriteImage(imageBlock);

-    else
-        return false;
+
+    return false;

 }
 
 bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)
 }
 
 bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)


@@ -1726,9 +1926,8 @@ bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType)
         wxImage image = bitmap.ConvertToImage();
         if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType))
             return WriteImage(imageBlock);
         wxImage image = bitmap.ConvertToImage();
         if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType))
             return WriteImage(imageBlock);

-        else
-            return false;

     }
     }

+

     return false;
 }
 
     return false;
 }
 


@@ -1747,7 +1946,7 @@ void wxRichTextCtrl::Copy()
 {
     if (CanCopy())
     {
 {
     if (CanCopy())
     {

-        wxRichTextRange range = GetSelectionRange();
+        wxRichTextRange range = GetInternalSelectionRange();

         GetBuffer().CopyToClipboard(range);
     }
 }
         GetBuffer().CopyToClipboard(range);
     }
 }


@@ -1756,7 +1955,7 @@ void wxRichTextCtrl::Cut()
 {
     if (CanCut())
     {
 {
     if (CanCut())
     {

-        wxRichTextRange range = GetSelectionRange();
+        wxRichTextRange range = GetInternalSelectionRange();

         GetBuffer().CopyToClipboard(range);
 
         DeleteSelectedContent();
         GetBuffer().CopyToClipboard(range);
 
         DeleteSelectedContent();


@@ -1856,6 +2055,8 @@ void wxRichTextCtrl::GetSelection(long* from, long* to) const
 {
     *from = m_selectionRange.GetStart();
     *to = m_selectionRange.GetEnd();
 {
     *from = m_selectionRange.GetStart();
     *to = m_selectionRange.GetEnd();

+    if ((*to) != -1 && (*to) != -2)
+        (*to) ++;

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


@@ -1874,7 +2075,7 @@ void wxRichTextCtrl::SetSelection(long from, long to)
     if ( (from == -1) && (to == -1) )
     {
         from = 0;
     if ( (from == -1) && (to == -1) )
     {
         from = 0;

-        to = GetLastPosition();
+        to = GetLastPosition()+1;

     }
 
     DoSetSelection(from, to);
     }
 
     DoSetSelection(from, to);


@@ -1883,7 +2084,8 @@ void wxRichTextCtrl::SetSelection(long from, long to)
 void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
 {
     m_selectionAnchor = from;
 void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
 {
     m_selectionAnchor = from;

-    m_selectionRange.SetRange(from, to);
+    m_selectionRange.SetRange(from, to-1);
+

     Refresh(false);
     PositionCaret();
 }
     Refresh(false);
     PositionCaret();
 }


@@ -1892,13 +2094,14 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare
 // Editing
 // ----------------------------------------------------------------------------
 
 // Editing
 // ----------------------------------------------------------------------------
 

-void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to), const wxString& value)
+void wxRichTextCtrl::Replace(long WXUNUSED(from), long WXUNUSED(to),
+                             const wxString& value)

 {
     BeginBatchUndo(_("Replace"));
 
     DeleteSelectedContent();
 
 {
     BeginBatchUndo(_("Replace"));
 
     DeleteSelectedContent();
 

-    DoWriteText(value, true /* selection only */);
+    DoWriteText(value, SetValue_SelectionOnly);

 
     EndBatchUndo();
 }
 
     EndBatchUndo();
 }


@@ -1929,6 +2132,7 @@ void wxRichTextCtrl::MarkDirty()
 
 void wxRichTextCtrl::DiscardEdits()
 {
 
 void wxRichTextCtrl::DiscardEdits()
 {

+    m_caretPositionForDefaultStyle = -2;

     m_buffer.Modify(false);
     m_buffer.GetCommandProcessor()->ClearCommands();
 }
     m_buffer.Modify(false);
     m_buffer.GetCommandProcessor()->ClearCommands();
 }


@@ -2003,10 +2207,10 @@ bool wxRichTextCtrl::CanRedo() const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// implemenation details
+// implementation details

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxRichTextCtrl::Command(wxCommandEvent & event)
+void wxRichTextCtrl::Command(wxCommandEvent& event)

 {
     SetValue(event.GetString());
     GetEventHandler()->ProcessEvent(event);
 {
     SetValue(event.GetString());
     GetEventHandler()->ProcessEvent(event);


@@ -2021,39 +2225,6 @@ void wxRichTextCtrl::OnDropFiles(wxDropFilesEvent& event)
     }
 }
 
     }
 }
 

-// ----------------------------------------------------------------------------
-// text control event processing
-// ----------------------------------------------------------------------------
-
-bool wxRichTextCtrl::SendUpdateEvent()
-{
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
-    InitCommandEvent(event);
-
-    return GetEventHandler()->ProcessEvent(event);
-}
-
-void wxRichTextCtrl::InitCommandEvent(wxCommandEvent& event) const
-{
-    event.SetEventObject((wxControlBase *)this);    // const_cast
-
-    switch ( m_clientDataType )
-    {
-        case wxClientData_Void:
-            event.SetClientData(GetClientData());
-            break;
-
-        case wxClientData_Object:
-            event.SetClientObject(GetClientObject());
-            break;
-
-        case wxClientData_None:
-            // nothing to do
-            ;
-    }
-}
-
-

 wxSize wxRichTextCtrl::DoGetBestSize() const
 {
     return wxSize(10, 10);
 wxSize wxRichTextCtrl::DoGetBestSize() const
 {
     return wxSize(10, 10);


@@ -2156,12 +2327,35 @@ void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& WXUNUSED(event))
 
 bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style)
 {
 
 bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style)
 {

-    return GetBuffer().SetStyle(wxRichTextRange(start, end), 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));

 }
 
 bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
 {
 }
 
 bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
 {

-    return GetBuffer().SetStyle(range, style);
+    return GetBuffer().SetStyle(range.ToInternal(), style);
+}
+
+// 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)
+{
+    return GetBuffer().SetStyle(range.ToInternal(), style, flags);

 }
 
 bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style)
 }
 
 bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style)


@@ -2169,34 +2363,78 @@ bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttrEx& style)
     return GetBuffer().SetDefaultStyle(style);
 }
 
     return GetBuffer().SetDefaultStyle(style);
 }
 

+bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+{
+    return GetBuffer().SetDefaultStyle(wxTextAttrEx(style));
+}
+

 const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const
 {
     return GetBuffer().GetDefaultStyle();
 }
 
 const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const
 {
     return GetBuffer().GetDefaultStyle();
 }
 

-bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style) const
+const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
+{
+    return GetBuffer().GetDefaultStyle();
+}
+
+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);
 }
 
 {
     return GetBuffer().GetStyle(position, style);
 }
 

-bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style) const
+bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style)

 {
     return GetBuffer().GetStyle(position, style);
 }
 
 {
     return GetBuffer().GetStyle(position, 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);
+}
+

 /// Set font, and also the buffer attributes
 bool wxRichTextCtrl::SetFont(const wxFont& font)
 {
 /// Set font, and also the buffer attributes
 bool wxRichTextCtrl::SetFont(const wxFont& font)
 {

-#if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

     wxControl::SetFont(font);
     wxControl::SetFont(font);

-#else
-    wxScrolledWindow::SetFont(font);
-#endif

 
     wxTextAttrEx attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);
 
     wxTextAttrEx attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);

-    GetBuffer().SetDefaultStyle(attr);
+
+    GetBuffer().Invalidate(wxRICHTEXT_ALL);
+    Refresh(false);

 
     return true;
 }
 
     return true;
 }


@@ -2256,8 +2494,8 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
         rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height));
         return true;
     }
         rect = wxRect(pt, wxSize(wxRICHTEXT_DEFAULT_CARET_WIDTH, height));
         return true;
     }

-    else
-        return false;
+
+    return false;

 }
 
 /// Gets the line for the visible caret position. If the caret is
 }
 
 /// Gets the line for the visible caret position. If the caret is


@@ -2318,17 +2556,17 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
             flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
             availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0)));
         }
             flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
             availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0)));
         }

-        
+

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

-        
+

         PrepareDC(dc);
         PrepareDC(dc);

-        
+

         GetBuffer().Defragment();
         GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
         GetBuffer().Layout(dc, availableSpace, flags);
         GetBuffer().SetDirty(false);
         GetBuffer().Defragment();
         GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
         GetBuffer().Layout(dc, availableSpace, flags);
         GetBuffer().SetDirty(false);

-        
+

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


@@ -2337,12 +2575,12 @@ bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
 }
 
 /// Is all of the selection bold?
 }
 
 /// Is all of the selection bold?

-bool wxRichTextCtrl::IsSelectionBold() const
+bool wxRichTextCtrl::IsSelectionBold()

 {
     if (HasSelection())
     {
         wxRichTextAttr attr;
 {
     if (HasSelection())
     {
         wxRichTextAttr attr;

-        wxRichTextRange range = GetSelectionRange();
+        wxRichTextRange range = GetInternalSelectionRange();

         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         attr.SetFontWeight(wxBOLD);
 
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         attr.SetFontWeight(wxBOLD);
 


@@ -2354,9 +2592,12 @@ bool wxRichTextCtrl::IsSelectionBold() const
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);

-        if (GetStyle(GetCaretPosition()+1, attr))
+
+        long pos = GetAdjustedCaretPosition(GetCaretPosition());
+        if (GetStyle(pos, attr))

         {
         {

-            wxRichTextApplyStyle(attr, GetDefaultStyleEx());
+            if (IsDefaultStyleShowing())
+                wxRichTextApplyStyle(attr, GetDefaultStyleEx());

             return attr.GetFontWeight() == wxBOLD;
         }
     }
             return attr.GetFontWeight() == wxBOLD;
         }
     }


@@ -2364,11 +2605,11 @@ bool wxRichTextCtrl::IsSelectionBold() const
 }
 
 /// Is all of the selection italics?
 }
 
 /// Is all of the selection italics?

-bool wxRichTextCtrl::IsSelectionItalics() const
+bool wxRichTextCtrl::IsSelectionItalics()

 {
     if (HasSelection())
     {
 {
     if (HasSelection())
     {

-        wxRichTextRange range = GetSelectionRange();
+        wxRichTextRange range = GetInternalSelectionRange();

         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFontStyle(wxITALIC);
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFontStyle(wxITALIC);


@@ -2381,9 +2622,12 @@ bool wxRichTextCtrl::IsSelectionItalics() const
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);

-        if (GetStyle(GetCaretPosition()+1, attr))
+
+        long pos = GetAdjustedCaretPosition(GetCaretPosition());
+        if (GetStyle(pos, attr))

         {
         {

-            wxRichTextApplyStyle(attr, GetDefaultStyleEx());
+            if (IsDefaultStyleShowing())
+                wxRichTextApplyStyle(attr, GetDefaultStyleEx());

             return attr.GetFontStyle() == wxITALIC;
         }
     }
             return attr.GetFontStyle() == wxITALIC;
         }
     }


@@ -2391,11 +2635,11 @@ bool wxRichTextCtrl::IsSelectionItalics() const
 }
 
 /// Is all of the selection underlined?
 }
 
 /// Is all of the selection underlined?

-bool wxRichTextCtrl::IsSelectionUnderlined() const
+bool wxRichTextCtrl::IsSelectionUnderlined()

 {
     if (HasSelection())
     {
 {
     if (HasSelection())
     {

-        wxRichTextRange range = GetSelectionRange();
+        wxRichTextRange range = GetInternalSelectionRange();

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


@@ -2408,9 +2652,12 @@ bool wxRichTextCtrl::IsSelectionUnderlined() const
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         // to see what the effect would be if we started typing.
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);

-        if (GetStyle(GetCaretPosition()+1, attr))
+        long pos = GetAdjustedCaretPosition(GetCaretPosition());
+
+        if (GetStyle(pos, attr))

         {
         {

-            wxRichTextApplyStyle(attr, GetDefaultStyleEx());
+            if (IsDefaultStyleShowing())
+                wxRichTextApplyStyle(attr, GetDefaultStyleEx());

             return attr.GetFontUnderlined();
         }
     }
             return attr.GetFontUnderlined();
         }
     }


@@ -2425,9 +2672,9 @@ bool wxRichTextCtrl::ApplyBoldToSelection()
     attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD);
 
     if (HasSelection())
     attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD);
 
     if (HasSelection())

-        return SetStyle(GetSelectionRange(), attr);
+        return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);

     else
     else

-        SetDefaultStyle(attr);
+        SetAndShowDefaultStyle(attr);

     return true;
 }
 
     return true;
 }
 


@@ -2439,9 +2686,9 @@ bool wxRichTextCtrl::ApplyItalicToSelection()
     attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC);
 
     if (HasSelection())
     attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC);
 
     if (HasSelection())

-        return SetStyle(GetSelectionRange(), attr);
+        return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);

     else
     else

-        SetDefaultStyle(attr);
+        SetAndShowDefaultStyle(attr);

     return true;
 }
 
     return true;
 }
 


@@ -2453,31 +2700,25 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
     attr.SetFontUnderlined(!IsSelectionUnderlined());
 
     if (HasSelection())
     attr.SetFontUnderlined(!IsSelectionUnderlined());
 
     if (HasSelection())

-        return SetStyle(GetSelectionRange(), attr);
+        return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);

     else
     else

-        SetDefaultStyle(attr);
+        SetAndShowDefaultStyle(attr);

     return true;
 }
 
 /// Is all of the selection aligned according to the specified flag?
     return true;
 }
 
 /// Is all of the selection aligned according to the specified flag?

-bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment) const
+bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment)

 {
 {

+    wxRichTextRange range;

     if (HasSelection())
     if (HasSelection())

-    {
-        wxRichTextRange range = GetSelectionRange();
-        wxRichTextAttr attr;
-        attr.SetAlignment(alignment);
-
-        return HasParagraphAttributes(range, attr);
-    }
+        range = GetInternalSelectionRange();

     else
     else

-    {
-        // If no selection, then we need to get information from the current paragraph.
-        wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
-        if (para)
-            return para->GetAttributes().GetAlignment() == alignment;
-    }
-    return false;
+        range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+1);
+
+    wxRichTextAttr attr;
+    attr.SetAlignment(alignment);
+
+    return HasParagraphAttributes(range, attr);

 }
 
 /// Apply alignment to the selection
 }
 
 /// Apply alignment to the selection


@@ -2491,24 +2732,97 @@ bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
         if (para)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
         if (para)

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

     }
     return true;
 }
 
     }
     return true;
 }
 

+/// Apply a named style to the selection
+bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
+{
+    // Flags are defined within each definition, so only certain
+    // attributes are applied.
+    wxRichTextAttr attr(def->GetStyle());
+
+    int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE;
+
+    if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition)))
+    {
+        flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY;
+        
+        wxRichTextRange range;
+        
+        if (HasSelection())
+            range = GetSelectionRange();
+        else
+        {
+            long pos = GetAdjustedCaretPosition(GetCaretPosition());            
+            range = wxRichTextRange(pos, pos+1);
+        }
+        
+        return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags);        
+    }    
+    
+    // Make sure the attr has the style name
+    if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
+    {
+        attr.SetParagraphStyleName(def->GetName());
+
+        // If applying a paragraph style, we only want the paragraph nodes to adopt these
+        // attributes, and not the leaf nodes. This will allow the content (e.g. text)
+        // to change its style independently.
+        flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY;
+    }
+    else
+        attr.SetCharacterStyleName(def->GetName());
+
+    if (HasSelection())
+        return SetStyleEx(GetSelectionRange(), attr, flags);
+    else
+    {
+        SetAndShowDefaultStyle(attr);
+        return true;
+    }
+}
+
+/// Apply the style sheet to the buffer, for example if the styles have changed.
+bool wxRichTextCtrl::ApplyStyleSheet(wxRichTextStyleSheet* styleSheet)
+{
+    if (!styleSheet)
+        styleSheet = GetBuffer().GetStyleSheet();
+    if (!styleSheet)
+        return false;
+
+    if (GetBuffer().ApplyStyleSheet(styleSheet))
+    {
+        GetBuffer().Invalidate(wxRICHTEXT_ALL);
+        Refresh(false);
+        return true;
+    }
+    else
+        return false;
+}
+

 /// Sets the default style to the style under the cursor
 bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 {
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_CHARACTER);
 
 /// Sets the default style to the style under the cursor
 bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
 {
     wxTextAttrEx attr;
     attr.SetFlags(wxTEXT_ATTR_CHARACTER);
 

-    if (GetStyle(GetCaretPosition(), attr))
+    // If at the start of a paragraph, use the next position.
+    long pos = GetAdjustedCaretPosition(GetCaretPosition());
+
+#if wxRICHTEXT_USE_DYNAMIC_STYLES
+    if (GetUncombinedStyle(pos, attr))
+#else
+    if (GetStyle(pos, attr))
+#endif

     {
         SetDefaultStyle(attr);
         return true;
     }
     {
         SetDefaultStyle(attr);
         return true;
     }

-    else
-        return false;
+
+    return false;

 }
 
 /// Returns the first visible position in the current view
 }
 
 /// Returns the first visible position in the current view


@@ -2521,6 +2835,79 @@ long wxRichTextCtrl::GetFirstVisiblePosition() const
         return 0;
 }
 
         return 0;
 }
 

+/// The adjusted caret position is the character position adjusted to take
+/// into account whether we're at the start of a paragraph, in which case
+/// style information should be taken from the next position, not current one.
+long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const
+{
+    wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPos+1);
+
+    if (para && (caretPos+1 == para->GetRange().GetStart()))
+        caretPos ++;
+    return caretPos;
+}
+
+/// Get/set the selection range in character positions. -1, -1 means no selection.
+/// The range is in API convention, i.e. a single character selection is denoted
+/// by (n, n+1)
+wxRichTextRange wxRichTextCtrl::GetSelectionRange() const
+{
+    wxRichTextRange range = GetInternalSelectionRange();
+    if (range != wxRichTextRange(-2,-2) && range != wxRichTextRange(-1,-1))
+        range.SetEnd(range.GetEnd() + 1);
+    return 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);
+}
+
+/// 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);
+}
+
+bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
+{
+    return GetBuffer().SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+}
+
+/// Clear list for given range
+bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags)
+{
+    return GetBuffer().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)
+{
+    return GetBuffer().NumberList(range.ToInternal(), def, flags, startFrom, 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);    
+}
+
+/// 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);
+}
+
+bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
+{
+    return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);
+}
+

 #endif
     // wxUSE_RICHTEXT
 
 #endif
     // wxUSE_RICHTEXT