wxVariant support needs wx/icon.h earlier.

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 0bb40c3e34eed5e522e74df85844a8a25941ba54..a795c052f79e83b89eaa62c5f690abb94a72ae83 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtextctrl.h"
 #if wxUSE_RICHTEXT
 
 #include "wx/richtext/richtextctrl.h"

+#include "wx/richtext/richtextstyles.h"

 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"


@@ -141,10 +142,13 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     attributes.SetBackgroundColour(*wxWHITE);
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     attributes.SetFlags(wxTEXT_ATTR_ALL);
     attributes.SetBackgroundColour(*wxWHITE);
     attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
     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);
 
     SetBackgroundColour(*wxWHITE);
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 


@@ -155,7 +159,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     RecreateBuffer(size);
 
     SetCursor(wxCursor(wxCURSOR_IBEAM));
     RecreateBuffer(size);
 
     SetCursor(wxCursor(wxCURSOR_IBEAM));

-    
+

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


@@ -183,6 +187,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


@@ -209,9 +214,12 @@ 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();
     if (m_freezeCount == 0)
     {
         SetupScrollbars();


@@ -251,7 +259,7 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
             SetupScrollbars();
         }
 
             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())


@@ -321,19 +329,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();


@@ -409,6 +404,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();
 }
 


@@ -458,7 +454,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,


@@ -537,7 +533,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         DeleteSelectedContent(& newPos);
 
         wxString str = (wxChar) event.GetKeyCode();
         DeleteSelectedContent(& newPos);
 
         wxString str = (wxChar) event.GetKeyCode();

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

 
         EndBatchUndo();
 
 
         EndBatchUndo();
 


@@ -709,16 +705,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 = 0, sy = 0;
     GetVirtualSize(& sx, & sy);
 
     int sx = 0, sy = 0;
     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();
 


@@ -734,11 +730,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;
             }
         }


@@ -747,11 +747,11 @@ 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;
             }
         }
                 scrolled = true;
             }
         }


@@ -764,11 +764,11 @@ 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;
             }
         }
                 scrolled = true;
             }
         }


@@ -777,11 +777,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 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;
             }
         }


@@ -1415,6 +1419,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();
 }
 


@@ -1439,19 +1452,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


@@ -1499,9 +1513,30 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 // file IO functions
 // ----------------------------------------------------------------------------
 
 // file IO functions
 // ----------------------------------------------------------------------------
 

-bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
+#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
+bool wxRichTextCtrl::LoadFile(const wxString& filename, int fileType)
+{
+    return DoLoadFile(filename, fileType);
+}
+
+bool wxRichTextCtrl::SaveFile(const wxString& filename, int fileType)
+{
+    wxString filenameToUse = filename.empty() ? m_filename : filename;
+    if ( filenameToUse.empty() )
+    {
+        // 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;
+    }
+
+    return DoSaveFile(filenameToUse, fileType);
+}
+#endif
+
+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;
 


@@ -1523,25 +1558,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."));


@@ -1571,7 +1596,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;
 }
 


@@ -1583,6 +1608,60 @@ void wxRichTextCtrl::SelectNone()
     m_selectionAnchor = -2;
 }
 
     m_selectionAnchor = -2;
 }
 

+static bool wxIsWordDelimiter(const wxString& text)
+{
+    static wxString delimiters = wxT(" ,.:;!?-\"'~£$%^&*()_+-=`¬{}[]@#<>/\\|");
+    return !text.IsEmpty() && delimiters.Find(text) != wxNOT_FOUND;
+}
+
+/// Select the word at the given character position
+bool wxRichTextCtrl::SelectWord(long position)
+{
+    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();
+
+    for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++)
+    {
+        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;
 wxString wxRichTextCtrl::GetStringSelection() const
 {
     long from, to;


@@ -1634,7 +1713,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
 {
     wxClientDC dc((wxRichTextCtrl*) this);
     ((wxRichTextCtrl*)this)->PrepareDC(dc);
 {
     wxClientDC dc((wxRichTextCtrl*) this);
     ((wxRichTextCtrl*)this)->PrepareDC(dc);

-    
+

     // Buffer uses logical position (relative to start of buffer)
     // so convert
     wxPoint pt2 = GetLogicalPoint(pt);
     // Buffer uses logical position (relative to start of buffer)
     // so convert
     wxPoint pt2 = GetLogicalPoint(pt);


@@ -1667,7 +1746,8 @@ 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::SetValue(const wxString& value)


@@ -1705,7 +1785,9 @@ void wxRichTextCtrl::WriteText(const wxString& value)
 
 void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly))
 {
 
 void wxRichTextCtrl::DoWriteText(const wxString& value, bool WXUNUSED(selectionOnly))
 {

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

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


@@ -1772,7 +1854,7 @@ void wxRichTextCtrl::Copy()
 {
     if (CanCopy())
     {
 {
     if (CanCopy())
     {

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

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


@@ -1781,7 +1863,7 @@ void wxRichTextCtrl::Cut()
 {
     if (CanCut())
     {
 {
     if (CanCut())
     {

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

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


@@ -1881,6 +1963,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


@@ -1899,7 +1983,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);


@@ -1908,7 +1992,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();
 }


@@ -1954,6 +2039,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();
 }


@@ -2181,17 +2267,17 @@ 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)
 {
 }
 
 bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {

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

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


@@ -2211,12 +2297,12 @@ const wxTextAttrEx& wxRichTextCtrl::GetDefaultStyleEx() const
 
 const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
 {
 
 const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
 {

-    return GetBuffer().GetDefaultStyle();    
+    return GetBuffer().GetDefaultStyle();

 }
 
 }
 

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

 {
 {

-    wxTextAttrEx attr;
+    wxTextAttrEx attr(style);

     if (GetBuffer().GetStyle(position, attr))
     {
         style = attr;
     if (GetBuffer().GetStyle(position, attr))
     {
         style = attr;


@@ -2226,16 +2312,40 @@ bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style) const
         return false;
 }
 
         return false;
 }
 

-bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style) const
+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)
 {


@@ -2248,7 +2358,15 @@ bool wxRichTextCtrl::SetFont(const wxFont& font)
     wxTextAttrEx attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);
     wxTextAttrEx attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
     GetBuffer().SetBasicStyle(attr);

+
+#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
+    // Don't set the default style, since it will be inherited from
+    // the basic style.

     GetBuffer().SetDefaultStyle(attr);
     GetBuffer().SetDefaultStyle(attr);

+#endif
+
+    GetBuffer().Invalidate(wxRICHTEXT_ALL);
+    Refresh(false);

 
     return true;
 }
 
     return true;
 }


@@ -2389,12 +2507,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);
 


@@ -2406,9 +2524,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;
         }
     }


@@ -2416,11 +2537,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);


@@ -2433,9 +2554,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;
         }
     }


@@ -2443,11 +2567,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);


@@ -2460,9 +2584,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();
         }
     }


@@ -2479,7 +2606,7 @@ bool wxRichTextCtrl::ApplyBoldToSelection()
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else

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

     return true;
 }
 
     return true;
 }
 


@@ -2493,7 +2620,7 @@ bool wxRichTextCtrl::ApplyItalicToSelection()
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else

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

     return true;
 }
 
     return true;
 }
 


@@ -2507,29 +2634,23 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     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


@@ -2543,18 +2664,62 @@ 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 SetStyle(para->GetRange().FromInternal(), attr);

     }
     return true;
 }
 
     }
     return true;
 }
 

+/// Apply a named style to the selection
+void wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def)
+{
+    // Flags are defined within each definition, so only certain
+    // attributes are applied.
+    wxRichTextAttr attr(def->GetStyle());
+
+    // Make sure the attr has the style name
+    if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
+        attr.SetParagraphStyleName(def->GetName());
+    else
+        attr.SetCharacterStyleName(def->GetName());
+
+    if (HasSelection())
+        SetStyle(GetSelectionRange(), attr);
+    else
+        SetAndShowDefaultStyle(attr);
+}
+
+/// 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;


@@ -2573,5 +2738,39 @@ 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);
+}
+

 #endif
     // wxUSE_RICHTEXT
 #endif
     // wxUSE_RICHTEXT