Accidently checked for invalid image index rather than using the mask.

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 732a30dd8ef88e8b0e7a559048210ff4bc812a6d..32d4a691e85bf52259e6e88d547abd0f58b94275 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,32 @@
 #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/settings.h"
+    #include "wx/menu.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/stopwatch.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)


@@ -104,17 +110,17 @@ wxRichTextCtrl::wxRichTextCtrl()
     Init();
 }
 
     Init();
 }
 

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

 #if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
     : wxScrollHelper(this)
 #endif
 {
     Init();
 #if wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
     : wxScrollHelper(this)
 #endif
 {
     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 wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
     if (!wxTextCtrlBase::Create(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE


@@ -154,6 +160,9 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos
 
     SetCursor(wxCursor(wxCURSOR_IBEAM));
 
 
     SetCursor(wxCursor(wxCURSOR_IBEAM));
 

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

     return true;
 }
 
     return true;
 }
 


@@ -178,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


@@ -187,14 +197,14 @@ void wxRichTextCtrl::Freeze()
 }
 
 /// Call Thaw to refresh
 }
 
 /// Call Thaw to refresh

-void wxRichTextCtrl::Thaw(bool refresh)
+void wxRichTextCtrl::Thaw()

 {
     m_freezeCount --;
 
 {
     m_freezeCount --;
 

-    if (m_freezeCount == 0 && refresh)
+    if (m_freezeCount == 0)

     {
         SetupScrollbars();
     {
         SetupScrollbars();

-        Refresh();
+        Refresh(false);

     }
 }
 
     }
 }
 


@@ -204,13 +214,16 @@ 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();

-        Refresh();
+        Refresh(false);

     }
     SendUpdateEvent();
 }
     }
     SendUpdateEvent();
 }


@@ -218,22 +231,25 @@ void wxRichTextCtrl::Clear()
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

+    if (GetCaret())
+        GetCaret()->Hide();
+

     {
         wxBufferedPaintDC dc(this, m_bufferBitmap);
         //wxLogDebug(wxT("OnPaint"));
     {
         wxBufferedPaintDC dc(this, m_bufferBitmap);
         //wxLogDebug(wxT("OnPaint"));

-        
+

         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();
         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())


@@ -242,9 +258,13 @@ 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(), GetSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
     }

+
+    if (GetCaret())
+        GetCaret()->Show();
+

     PositionCaret();
 }
 
     PositionCaret();
 }
 


@@ -261,7 +281,7 @@ void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
     PositionCaret();
 
     if (!IsFrozen())
     PositionCaret();
 
     if (!IsFrozen())

-        Refresh();
+        Refresh(false);

 }
 
 void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 }
 
 void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))


@@ -269,7 +289,7 @@ void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
     SetCaret(NULL);
 
     if (!IsFrozen())
     SetCaret(NULL);
 
     if (!IsFrozen())

-        Refresh();
+        Refresh(false);

 }
 
 /// Left-click
 }
 
 /// Left-click


@@ -382,7 +402,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
             SetDefaultStyleToCursorStyle();
 
             if (extendSel)
             SetDefaultStyleToCursorStyle();
 
             if (extendSel)

-                Refresh();
+                Refresh(false);

         }
     }
 }
         }
     }
 }


@@ -424,13 +444,21 @@ 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)
     {

-        Navigate(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"));
 


@@ -449,6 +477,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)
     {


@@ -478,6 +508,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)
     {


@@ -519,11 +550,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         EndBatchUndo();
 
         SetDefaultStyleToCursorStyle();
         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.


@@ -577,10 +605,9 @@ Adding Shift does the above but starts/extends selection.
 
  */
 
 
  */
 

-bool wxRichTextCtrl::Navigate(int keyCode, int flags)
+bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags)

 {
     bool success = false;
 {
     bool success = false;

-    Freeze();

 
     if (keyCode == WXK_RIGHT)
     {
 
     if (keyCode == WXK_RIGHT)
     {


@@ -610,11 +637,11 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags)
         else
             success = MoveDown(1, flags);
     }
         else
             success = MoveDown(1, flags);
     }

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

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

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

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


@@ -639,8 +666,6 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags)
         SetDefaultStyleToCursorStyle();
     }
 
         SetDefaultStyleToCursorStyle();
     }
 

-    Thaw(false);
-

     return success;
 }
 
     return success;
 }
 


@@ -692,16 +717,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();
 


@@ -710,18 +735,22 @@ 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_RIGHT || keyCode == WXK_END || keyCode == WXK_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 (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;
             }
         }


@@ -730,28 +759,28 @@ 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_LEFT || keyCode == WXK_HOME || keyCode == WXK_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;
             }
         }


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


@@ -790,7 +823,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)


@@ -932,7 +965,7 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else


@@ -961,7 +994,7 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else


@@ -1052,11 +1085,11 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
         return true;
     }

-    else
-        return false;
+
+    return false;

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


@@ -1075,7 +1108,7 @@ bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1098,7 +1131,7 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1123,7 +1156,7 @@ bool wxRichTextCtrl::MoveToLineEnd(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1150,7 +1183,7 @@ bool wxRichTextCtrl::MoveToLineStart(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1171,7 +1204,7 @@ bool wxRichTextCtrl::MoveHome(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else


@@ -1194,7 +1227,7 @@ bool wxRichTextCtrl::MoveEnd(int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else


@@ -1235,7 +1268,7 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
                 SetDefaultStyleToCursorStyle();
 
                 if (extendSel)
                 SetDefaultStyleToCursorStyle();
 
                 if (extendSel)

-                    Refresh();
+                    Refresh(false);

                 return true;
             }
         }
                 return true;
             }
         }


@@ -1334,7 +1367,7 @@ bool wxRichTextCtrl::WordLeft(int WXUNUSED(n), int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1358,7 +1391,7 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)
         SetDefaultStyleToCursorStyle();
 
         if (extendSel)

-            Refresh();
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1374,7 +1407,7 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event)
         m_fullLayoutRequired = true;
         m_fullLayoutTime = wxGetLocalTimeMillis();
         m_fullLayoutSavedPosition = GetFirstVisiblePosition();
         m_fullLayoutRequired = true;
         m_fullLayoutTime = wxGetLocalTimeMillis();
         m_fullLayoutSavedPosition = GetFirstVisiblePosition();

-        Layout(true /* onlyVisibleRect */);
+        LayoutContent(true /* onlyVisibleRect */);

     }
     else
         GetBuffer().Invalidate(wxRICHTEXT_ALL);
     }
     else
         GetBuffer().Invalidate(wxRICHTEXT_ALL);


@@ -1396,8 +1429,17 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
         m_fullLayoutTime = 0;
         GetBuffer().Invalidate(wxRICHTEXT_ALL);
         ShowPosition(m_fullLayoutSavedPosition);
         m_fullLayoutTime = 0;
         GetBuffer().Invalidate(wxRICHTEXT_ALL);
         ShowPosition(m_fullLayoutSavedPosition);

-        Refresh();
+        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();
 }
 


@@ -1422,19 +1464,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


@@ -1490,10 +1533,10 @@ bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
 
     DiscardEdits();
     SetInsertionPoint(0);
 
     DiscardEdits();
     SetInsertionPoint(0);

-    Layout();
+    LayoutContent();

     PositionCaret();
     SetupScrollbars(true);
     PositionCaret();
     SetupScrollbars(true);

-    Refresh();
+    Refresh(false);

     SendUpdateEvent();
 
     if (success)
     SendUpdateEvent();
 
     if (success)


@@ -1575,17 +1618,20 @@ wxString wxRichTextCtrl::GetStringSelection() const
 }
 
 // do the window-specific processing after processing the update event
 }
 
 // do the window-specific processing after processing the update event

+#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
 void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {

-    if ( event.GetSetEnabled() )
-        Enable(event.GetEnabled());
+    // call inherited
+    wxWindowBase::DoUpdateWindowUI(event);

 
 

+    // update text

     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());
     }
 }
     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());
     }
 }

+#endif // !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 
 // ----------------------------------------------------------------------------
 // hit testing
 
 // ----------------------------------------------------------------------------
 // hit testing


@@ -1615,15 +1661,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;

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


@@ -1693,8 +1749,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)


@@ -1704,8 +1760,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)


@@ -1722,9 +1778,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;
 }
 


@@ -1756,8 +1811,8 @@ void wxRichTextCtrl::Cut()
         GetBuffer().CopyToClipboard(range);
 
         DeleteSelectedContent();
         GetBuffer().CopyToClipboard(range);
 
         DeleteSelectedContent();

-        Layout();
-        Refresh();
+        LayoutContent();
+        Refresh(false);

     }
 }
 
     }
 }
 


@@ -1880,7 +1935,7 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare
 {
     m_selectionAnchor = from;
     m_selectionRange.SetRange(from, to);
 {
     m_selectionAnchor = from;
     m_selectionRange.SetRange(from, to);

-    Refresh();
+    Refresh(false);

     PositionCaret();
 }
 
     PositionCaret();
 }
 


@@ -1908,9 +1963,9 @@ void wxRichTextCtrl::Remove(long from, long to)
         from,                           // New caret position
         this);
 
         from,                           // New caret position
         this);
 

-    Layout();
+    LayoutContent();

     if (!IsFrozen())
     if (!IsFrozen())

-        Refresh();
+        Refresh(false);

 }
 
 bool wxRichTextCtrl::IsModified() const
 }
 
 bool wxRichTextCtrl::IsModified() const


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


@@ -1999,10 +2055,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);


@@ -2155,6 +2211,11 @@ bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttrEx& style)
     return GetBuffer().SetStyle(wxRichTextRange(start, end), style);
 }
 
     return GetBuffer().SetStyle(wxRichTextRange(start, end), style);
 }
 

+bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
+{
+    return GetBuffer().SetStyle(wxRichTextRange(start, end), wxTextAttrEx(style));
+}
+

 bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
 {
     return GetBuffer().SetStyle(range, style);
 bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
 {
     return GetBuffer().SetStyle(range, style);


@@ -2165,11 +2226,33 @@ 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();
 }
 

+const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
+{
+    return GetBuffer().GetDefaultStyle();
+}
+
+bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style) const
+{
+    wxTextAttrEx attr;
+    if (GetBuffer().GetStyle(position, attr))
+    {
+        style = attr;
+        return true;
+    }
+    else
+        return false;
+}
+

 bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style) const
 {
     return GetBuffer().GetStyle(position, style);
 bool wxRichTextCtrl::GetStyle(long position, wxTextAttrEx& style) const
 {
     return GetBuffer().GetStyle(position, style);


@@ -2252,8 +2335,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


@@ -2282,7 +2365,7 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio
 bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
 {
     if (GetBuffer().GetDirty())
 bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
 {
     if (GetBuffer().GetDirty())

-        Layout();
+        LayoutContent();

 
     if (pos <= GetBuffer().GetRange().GetEnd())
     {
 
     if (pos <= GetBuffer().GetRange().GetEnd())
     {


@@ -2298,7 +2381,7 @@ bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
 
 /// Layout the buffer: which we must do before certain operations, such as
 /// setting the caret position.
 
 /// Layout the buffer: which we must do before certain operations, such as
 /// setting the caret position.

-bool wxRichTextCtrl::Layout(bool onlyVisibleRect)
+bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)

 {
     if (GetBuffer().GetDirty() || onlyVisibleRect)
     {
 {
     if (GetBuffer().GetDirty() || onlyVisibleRect)
     {


@@ -2314,17 +2397,17 @@ bool wxRichTextCtrl::Layout(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();
     }


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


@@ -2377,9 +2463,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;
         }
     }


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


@@ -2423,7 +2515,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;
 }
 


@@ -2437,7 +2529,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;
 }
 


@@ -2451,7 +2543,7 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
     else

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

     return true;
 }
 
     return true;
 }
 


@@ -2492,19 +2584,41 @@ bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
     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);
+}
+

 /// 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 (GetStyle(pos, attr))

     {
         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


@@ -2517,6 +2631,17 @@ 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;
+}
+

 #endif
     // wxUSE_RICHTEXT
 #endif
     // wxUSE_RICHTEXT

-