Commented out call that breaks metal style setting before Create

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index d470dd8c9f00b184fc5d631b1442740590162977..04712e599178cee6241d5ef1a86b97bfbd7100ba 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Modified by: 
+// Modified by:

 // Created:     2005-09-30
 // Created:     2005-09-30

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,21 +16,19 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_RICHTEXT
+
+#include "wx/richtext/richtextctrl.h"
+

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

-#include "wx/image.h"
-
-#if wxUSE_RICHTEXT
-

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

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

 #include "wx/arrimpl.cpp"
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED)
 #include "wx/arrimpl.cpp"
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_ITEM_SELECTED)


@@ -56,6 +54,8 @@ BEGIN_EVENT_TABLE( wxRichTextCtrl, wxScrolledWindow )
 #endif
     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
 #endif
     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)

+    EVT_IDLE(wxRichTextCtrl::OnIdle)
+    EVT_SCROLLWIN(wxRichTextCtrl::OnScroll)

     EVT_LEFT_DOWN(wxRichTextCtrl::OnLeftClick)
     EVT_MOTION(wxRichTextCtrl::OnMoveMouse)
     EVT_LEFT_UP(wxRichTextCtrl::OnLeftUp)
     EVT_LEFT_DOWN(wxRichTextCtrl::OnLeftClick)
     EVT_MOTION(wxRichTextCtrl::OnMoveMouse)
     EVT_LEFT_UP(wxRichTextCtrl::OnLeftUp)


@@ -128,7 +128,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos
     {
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     }
     {
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     }

-    
+

     GetBuffer().SetRichTextCtrl(this);
 
     wxTextAttrEx attributes;
     GetBuffer().SetRichTextCtrl(this);
 
     wxTextAttrEx attributes;


@@ -141,22 +141,17 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxPoint& pos
     SetDefaultStyle(attributes);
     SetBasicStyle(attributes);
 
     SetDefaultStyle(attributes);
     SetBasicStyle(attributes);
 

-    SetBackgroundColour(*wxWHITE);    
+    SetBackgroundColour(*wxWHITE);

     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 

-    // Tell the sizers to use the given or best size    
+    // Tell the sizers to use the given or best size

     SetBestFittingSize(size);
     SetBestFittingSize(size);

-    
+

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

-    wxCaret* caret = new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16);
-    SetCaret(caret);
-    caret->Show();
-    PositionCaret();
-

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

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -177,6 +172,10 @@ void wxRichTextCtrl::Init()
     m_editable = true;
     m_caretAtLineStart = false;
     m_dragging = false;
     m_editable = true;
     m_caretAtLineStart = false;
     m_dragging = false;

+    m_fullLayoutRequired = false;
+    m_fullLayoutTime = 0;
+    m_fullLayoutSavedPosition = 0;
+    m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;

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


@@ -186,14 +185,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);

     }
 }
 
     }
 }
 


@@ -209,7 +208,7 @@ void wxRichTextCtrl::Clear()
     if (m_freezeCount == 0)
     {
         SetupScrollbars();
     if (m_freezeCount == 0)
     {
         SetupScrollbars();

-        Refresh();
+        Refresh(false);

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


@@ -217,31 +216,41 @@ void wxRichTextCtrl::Clear()
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-    wxBufferedPaintDC dc(this, m_bufferBitmap);
+    if (GetCaret())
+        GetCaret()->Hide();

 
 

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

 
 

-    if (m_freezeCount > 0)
-        return;
+        PrepareDC(dc);

 
 

-    dc.SetFont(GetFont());
- 
-    // Paint the background
-    PaintBackground(dc);
+        if (m_freezeCount > 0)
+            return;

 
 

-    wxRegion dirtyRegion = GetUpdateRegion();
+        dc.SetFont(GetFont());

 
 

-    wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
-    wxRect availableSpace(wxPoint(0, 0), GetClientSize());
-    if (GetBuffer().GetDirty())
-    {
-        GetBuffer().Layout(dc, availableSpace, GetBuffer().GetRange(), wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
-        GetBuffer().SetDirty(false);
-        SetupScrollbars();
-        PositionCaret();
+        // Paint the background
+        PaintBackground(dc);
+
+        wxRegion dirtyRegion = GetUpdateRegion();
+
+        wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
+        wxRect availableSpace(GetClientSize());
+        if (GetBuffer().GetDirty())
+        {
+            GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
+            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();

 }
 
 // Empty implementation, to prevent flicker
 }
 
 // Empty implementation, to prevent flicker


@@ -251,14 +260,21 @@ void wxRichTextCtrl::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
 
 void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
 {
 
 void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
 {

+    wxCaret* caret = new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16);
+    SetCaret(caret);
+    caret->Show();
+    PositionCaret();
+

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

-        Refresh();
+        Refresh(false);

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

+    SetCaret(NULL);
+

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

-        Refresh();
+        Refresh(false);

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


@@ -269,7 +285,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());

- 
+

     long position = 0;
     int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position);
 
     long position = 0;
     int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position);
 


@@ -291,7 +307,7 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
             wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
             wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
 
             wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
             wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
 

-            if (line && para && line->GetRange().GetStart() == position && para->GetRange().GetStart() != position)
+            if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)

                 caretAtLineStart = true;
             position --;
         }
                 caretAtLineStart = true;
             position --;
         }


@@ -339,7 +355,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());

- 
+

     long position = 0;
     wxPoint logicalPt = event.GetLogicalPosition(dc);
     int hit = GetBuffer().HitTest(dc, logicalPt, position);
     long position = 0;
     wxPoint logicalPt = event.GetLogicalPosition(dc);
     int hit = GetBuffer().HitTest(dc, logicalPt, position);


@@ -358,7 +374,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
             wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
             wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
 
             wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
             wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
 

-            if (line && para && line->GetRange().GetStart() == position && para->GetRange().GetStart() != position)
+            if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)

                 caretAtLineStart = true;
             position --;
         }
                 caretAtLineStart = true;
             position --;
         }


@@ -366,12 +382,12 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
         if (m_caretPosition != position)
         {
             bool extendSel = ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
         if (m_caretPosition != position)
         {
             bool extendSel = ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);

-            
+

             MoveCaret(position, caretAtLineStart);
             SetDefaultStyleToCursorStyle();
             MoveCaret(position, caretAtLineStart);
             SetDefaultStyleToCursorStyle();

-            
+

             if (extendSel)
             if (extendSel)

-                Refresh();
+                Refresh(false);

         }
     }
 }
         }
     }
 }


@@ -417,7 +433,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         event.GetKeyCode() == WXK_NEXT ||
         event.GetKeyCode() == WXK_END)
     {
         event.GetKeyCode() == WXK_NEXT ||
         event.GetKeyCode() == WXK_END)
     {

-        Navigate(event.GetKeyCode(), flags);
+        KeyboardNavigate(event.GetKeyCode(), flags);

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


@@ -438,6 +454,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)
     {


@@ -467,6 +485,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)
     {


@@ -508,6 +527,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         EndBatchUndo();
 
         SetDefaultStyleToCursorStyle();
         EndBatchUndo();
 
         SetDefaultStyleToCursorStyle();

+        ScrollIntoView(m_caretPosition, WXK_RIGHT);

     }
 #if 0
     else
     }
 #if 0
     else


@@ -566,10 +586,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)
     {


@@ -628,9 +647,6 @@ bool wxRichTextCtrl::Navigate(int keyCode, int flags)
         SetDefaultStyleToCursorStyle();
     }
 
         SetDefaultStyleToCursorStyle();
     }
 

-    // Only refresh if something changed
-    Thaw(success);
-

     return success;
 }
 
     return success;
 }
 


@@ -663,7 +679,7 @@ bool wxRichTextCtrl::ExtendSelection(long oldPos, long newPos, int flags)
         {
             wxLogDebug(wxT("Strange selection range"));
         }
         {
             wxLogDebug(wxT("Strange selection range"));
         }

-        
+

         return true;
     }
     else
         return true;
     }
     else


@@ -687,7 +703,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
     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)


@@ -707,16 +723,27 @@ 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);

-            SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY));
+            y = (int) (0.5 + y/ppuY);
+
+            if (startY != y)
+            {
+                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                scrolled = true;
+            }

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

-            SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY));
+            y = (int) (0.5 + y/ppuY);
+
+            if (startY != y)
+            {
+                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                scrolled = true;
+            }

         }
         }

-        scrolled = true;

     }
     // Going up
     else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP)
     }
     // Going up
     else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP)


@@ -726,16 +753,27 @@ 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 ;

-            SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY));
+            y = (int) (0.5 + y/ppuY);
+
+            if (startY != y)
+            {
+                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                scrolled = true;
+            }

         }
         else 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);
         }
         else 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);

-            SetScrollbars(ppuX, ppuY, sx, sy, 0, (int) (0.5 + y/ppuY));
+            y = (int) (0.5 + y/ppuY);
+
+            if (startY != y)
+            {
+                SetScrollbars(ppuX, ppuY, sx, sy, 0, y);
+                scrolled = true;
+            }

         }
         }

-        scrolled = true;

     }
     PositionCaret();
 
     }
     PositionCaret();
 


@@ -758,7 +796,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)


@@ -792,10 +830,12 @@ void wxRichTextCtrl::MoveCaretForward(long oldPosition)
 
         if (line)
         {
 
         if (line)
         {

+            wxRichTextRange lineRange = line->GetAbsoluteRange();
+

             // We're at the end of a line. See whether we need to
             // stay at the same actual caret position but change visual
             // position, or not.
             // We're at the end of a line. See whether we need to
             // stay at the same actual caret position but change visual
             // position, or not.

-            if (oldPosition == line->GetRange().GetEnd())
+            if (oldPosition == lineRange.GetEnd())

             {
                 if (m_caretAtLineStart)
                 {
             {
                 if (m_caretAtLineStart)
                 {


@@ -809,7 +849,7 @@ void wxRichTextCtrl::MoveCaretForward(long oldPosition)
                     // the same position but indicate that we're to show
                     // at the start of the next line.
                     m_caretPosition = oldPosition;
                     // the same position but indicate that we're to show
                     // at the start of the next line.
                     m_caretPosition = oldPosition;

-                    m_caretAtLineStart = true;                    
+                    m_caretAtLineStart = true;

                 }
                 SetDefaultStyleToCursorStyle();
                 return;
                 }
                 SetDefaultStyleToCursorStyle();
                 return;


@@ -835,16 +875,18 @@ void wxRichTextCtrl::MoveCaretBack(long oldPosition)
 
         if (line)
         {
 
         if (line)
         {

+            wxRichTextRange lineRange = line->GetAbsoluteRange();
+

             // We're at the start of a line. See whether we need to
             // stay at the same actual caret position but change visual
             // position, or not.
             // We're at the start of a line. See whether we need to
             // stay at the same actual caret position but change visual
             // position, or not.

-            if (oldPosition == line->GetRange().GetStart())
+            if (oldPosition == lineRange.GetStart())

             {
                 m_caretPosition = oldPosition-1;
                 m_caretAtLineStart = true;
                 return;
             }
             {
                 m_caretPosition = oldPosition-1;
                 m_caretAtLineStart = true;
                 return;
             }

-            else if (oldPosition == line->GetRange().GetEnd())
+            else if (oldPosition == lineRange.GetEnd())

             {
                 if (m_caretAtLineStart)
                 {
             {
                 if (m_caretAtLineStart)
                 {


@@ -895,12 +937,12 @@ bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh(); // TODO: optimize so that if we didn't change the selection, we don't refresh
+        if (extendSel)
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else

-        return false;    
+        return false;

 }
 
 /// Move left
 }
 
 /// Move left


@@ -924,12 +966,12 @@ bool wxRichTextCtrl::MoveLeft(int noPositions, int flags)
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else

-        return false;    
+        return false;

 }
 
 /// Move up
 }
 
 /// Move up


@@ -941,6 +983,9 @@ bool wxRichTextCtrl::MoveUp(int noLines, int flags)
 /// Move up
 bool wxRichTextCtrl::MoveDown(int noLines, int flags)
 {
 /// Move up
 bool wxRichTextCtrl::MoveDown(int noLines, int flags)
 {

+    if (!GetCaret())
+        return false;
+

     long lineNumber = GetBuffer().GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);
     wxPoint pt = GetCaret()->GetPosition();
     long newLine = lineNumber + noLines;
     long lineNumber = GetBuffer().GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);
     wxPoint pt = GetCaret()->GetPosition();
     long newLine = lineNumber + noLines;


@@ -963,8 +1008,8 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
 
     wxRichTextLine* lineObj = GetBuffer().GetLineForVisibleLineNumber(newLine);
     if (lineObj)
 
     wxRichTextLine* lineObj = GetBuffer().GetLineForVisibleLineNumber(newLine);
     if (lineObj)

-    {                
-        pt.y = lineObj->GetAbsolutePosition().y + 2;                
+    {
+        pt.y = lineObj->GetAbsolutePosition().y + 2;

     }
     else
         return false;
     }
     else
         return false;


@@ -973,9 +1018,9 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());
     wxClientDC dc(this);
     PrepareDC(dc);
     dc.SetFont(GetFont());

-    
+

     int hitTest = GetBuffer().HitTest(dc, pt, newPos);
     int hitTest = GetBuffer().HitTest(dc, pt, newPos);

-    
+

     if (hitTest != wxRICHTEXT_HITTEST_NONE)
     {
         // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,
     if (hitTest != wxRICHTEXT_HITTEST_NONE)
     {
         // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,


@@ -985,13 +1030,14 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
         if (hitTest == wxRICHTEXT_HITTEST_BEFORE)
         {
             wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);
         if (hitTest == wxRICHTEXT_HITTEST_BEFORE)
         {
             wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);

-            if (thisLine && (newPos-1) == thisLine->GetRange().GetEnd())
+            wxRichTextRange lineRange;
+            if (thisLine)
+                lineRange = thisLine->GetAbsoluteRange();
+
+            if (thisLine && (newPos-1) == lineRange.GetEnd())

             {
             {

-                // if (para->GetRange().GetStart() != thisLine->GetRange().GetStart())
-                {
-                    newPos --;
-                    caretLineStart = true;
-                }
+                newPos --;
+                caretLineStart = true;

             }
             else
             {
             }
             else
             {


@@ -1003,19 +1049,20 @@ bool wxRichTextCtrl::MoveDown(int noLines, int flags)
 
         long newSelEnd = newPos;
 
 
         long newSelEnd = newPos;
 

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

             SelectNone();
 
         SetCaretPosition(newPos, caretLineStart);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(newPos, caretLineStart);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            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


@@ -1025,15 +1072,16 @@ bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
     if (para)
     {
         long newPos = para->GetRange().GetEnd() - 1;
     if (para)
     {
         long newPos = para->GetRange().GetEnd() - 1;

-        if (!ExtendSelection(m_caretPosition, newPos, flags))
+        bool extendSel = ExtendSelection(m_caretPosition, newPos, flags);
+        if (!extendSel)

             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1047,15 +1095,16 @@ bool wxRichTextCtrl::MoveToParagraphStart(int flags)
     if (para)
     {
         long newPos = para->GetRange().GetStart() - 1;
     if (para)
     {
         long newPos = para->GetRange().GetStart() - 1;

-        if (!ExtendSelection(m_caretPosition, newPos, flags))
+        bool extendSel = ExtendSelection(m_caretPosition, newPos, flags);
+        if (!extendSel)

             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1069,16 +1118,18 @@ bool wxRichTextCtrl::MoveToLineEnd(int flags)
 
     if (line)
     {
 
     if (line)
     {

-        long newPos = line->GetRange().GetEnd();
-        if (!ExtendSelection(m_caretPosition, newPos, flags))
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
+        long newPos = lineRange.GetEnd();
+        bool extendSel = ExtendSelection(m_caretPosition, newPos, flags);
+        if (!extendSel)

             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(newPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1091,19 +1142,21 @@ bool wxRichTextCtrl::MoveToLineStart(int flags)
     wxRichTextLine* line = GetVisibleLineForCaretPosition(m_caretPosition);
     if (line)
     {
     wxRichTextLine* line = GetVisibleLineForCaretPosition(m_caretPosition);
     if (line)
     {

-        long newPos = line->GetRange().GetStart()-1;
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
+        long newPos = lineRange.GetStart()-1;

 
 

-        if (!ExtendSelection(m_caretPosition, newPos, flags))
+        bool extendSel = ExtendSelection(m_caretPosition, newPos, flags);
+        if (!extendSel)

             SelectNone();
 
         wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(line);
 
             SelectNone();
 
         wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(line);
 

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

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

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
 
         return true;
     }
 


@@ -1115,19 +1168,20 @@ bool wxRichTextCtrl::MoveHome(int flags)
 {
     if (m_caretPosition != -1)
     {
 {
     if (m_caretPosition != -1)
     {

-        if (!ExtendSelection(m_caretPosition, -1, flags))
+        bool extendSel = ExtendSelection(m_caretPosition, -1, flags);
+        if (!extendSel)

             SelectNone();
 
         SetCaretPosition(-1);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(-1);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else

-        return false;    
+        return false;

 }
 
 /// Move to the end of the buffer
 }
 
 /// Move to the end of the buffer


@@ -1137,19 +1191,20 @@ bool wxRichTextCtrl::MoveEnd(int flags)
 
     if (m_caretPosition != endPos)
     {
 
     if (m_caretPosition != endPos)
     {

-        if (!ExtendSelection(m_caretPosition, endPos, flags))
+        bool extendSel = ExtendSelection(m_caretPosition, endPos, flags);
+        if (!extendSel)

             SelectNone();
 
         SetCaretPosition(endPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
             SelectNone();
 
         SetCaretPosition(endPos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
     else
         return true;
     }
     else

-        return false;    
+        return false;

 }
 
 /// Move noPages pages up
 }
 
 /// Move noPages pages up


@@ -1171,20 +1226,22 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
         wxRichTextLine* newLine = GetBuffer().GetLineAtYPosition(newY);
         if (newLine)
         {
         wxRichTextLine* newLine = GetBuffer().GetLineAtYPosition(newY);
         if (newLine)
         {

-            long pos = newLine->GetRange().GetStart()-1;
+            wxRichTextRange lineRange = newLine->GetAbsoluteRange();
+            long pos = lineRange.GetStart()-1;

             if (pos != m_caretPosition)
             {
                 wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(newLine);
 
             if (pos != m_caretPosition)
             {
                 wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(newLine);
 

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

                     SelectNone();
 
                     SelectNone();
 

-                SetCaretPosition(pos, para->GetRange().GetStart() != newLine->GetRange().GetStart());
+                SetCaretPosition(pos, para->GetRange().GetStart() != lineRange.GetStart());

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

-                if (!IsFrozen())
-                    Refresh();
+                if (extendSel)
+                    Refresh(false);

                 return true;
             }
         }
                 return true;
             }
         }


@@ -1195,19 +1252,19 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
 
 // Finds the caret position for the next word
 long wxRichTextCtrl::FindNextWordPosition(int direction) const
 
 // Finds the caret position for the next word
 long wxRichTextCtrl::FindNextWordPosition(int direction) const

-{    
+{

     long endPos = GetBuffer().GetRange().GetEnd();
 
     if (direction > 0)
     {
         long i = m_caretPosition+1+direction; // +1 for conversion to character pos
     long endPos = GetBuffer().GetRange().GetEnd();
 
     if (direction > 0)
     {
         long i = m_caretPosition+1+direction; // +1 for conversion to character pos

-        
+

         // First skip current text to space
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
         // First skip current text to space
         while (i < endPos && i > -1)
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));

-            if (text != wxT(" ") && !text.IsEmpty())
+            if (text != wxT(" ") && !text.empty())

                 i += direction;
             else
             {
                 i += direction;
             else
             {


@@ -1218,9 +1275,9 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));

-            if (text.IsEmpty()) // End of paragraph, or maybe an image
+            if (text.empty()) // End of paragraph, or maybe an image

                 return wxMax(-1, i - 1);
                 return wxMax(-1, i - 1);

-            else if (text == wxT(" ") || text.IsEmpty())
+            else if (text == wxT(" ") || text.empty())

                 i += direction;
             else
             {
                 i += direction;
             else
             {


@@ -1241,9 +1298,9 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));

-            if (text.IsEmpty()) // End of paragraph, or maybe an image
+            if (text.empty()) // End of paragraph, or maybe an image

                 break;
                 break;

-            else if (text == wxT(" ") || text.IsEmpty())
+            else if (text == wxT(" ") || text.empty())

                 i += direction;
             else
                 break;
                 i += direction;
             else
                 break;


@@ -1253,12 +1310,11 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
         {
             // i is in character, not caret positions
             wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));

-            if (text != wxT(" ") /* && !text.IsEmpty() */)
+            if (text != wxT(" ") /* && !text.empty() */)

                 i += direction;
             else
             {
                 return i;
                 i += direction;
             else
             {
                 return i;

-                break;

             }
         }
         if (i < -1)
             }
         }
         if (i < -1)


@@ -1274,19 +1330,20 @@ bool wxRichTextCtrl::WordLeft(int WXUNUSED(n), int flags)
     if (pos != m_caretPosition)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
     if (pos != m_caretPosition)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);

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

             SelectNone();
             SelectNone();

-        
+

         SetCaretPosition(pos, para->GetRange().GetStart() != pos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         SetCaretPosition(pos, para->GetRange().GetStart() != pos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -1297,34 +1354,68 @@ bool wxRichTextCtrl::WordRight(int WXUNUSED(n), int flags)
     if (pos != m_caretPosition)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
     if (pos != m_caretPosition)
     {
         wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);

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

             SelectNone();
             SelectNone();

-        
+

         SetCaretPosition(pos, para->GetRange().GetStart() != pos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 
         SetCaretPosition(pos, para->GetRange().GetStart() != pos);
         PositionCaret();
         SetDefaultStyleToCursorStyle();
 

-        if (!IsFrozen())
-            Refresh();
+        if (extendSel)
+            Refresh(false);

         return true;
     }
         return true;
     }

-    
+

     return false;
 }
 
 /// Sizing
 void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 {
     return false;
 }
 
 /// Sizing
 void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 {

-    GetBuffer().SetDirty(true);
-    
+    // Only do sizing optimization for large buffers
+    if (GetBuffer().GetRange().GetEnd() > m_delayedLayoutThreshold)
+    {
+        m_fullLayoutRequired = true;
+        m_fullLayoutTime = wxGetLocalTimeMillis();
+        m_fullLayoutSavedPosition = GetFirstVisiblePosition();
+        LayoutContent(true /* onlyVisibleRect */);
+    }
+    else
+        GetBuffer().Invalidate(wxRICHTEXT_ALL);
+

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

+
+/// Idle-time processing
+void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
+{
+    const int layoutInterval = wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL;
+
+    if (m_fullLayoutRequired && (wxGetLocalTimeMillis() > (m_fullLayoutTime + layoutInterval)))
+    {
+        m_fullLayoutRequired = false;
+        m_fullLayoutTime = 0;
+        GetBuffer().Invalidate(wxRICHTEXT_ALL);
+        ShowPosition(m_fullLayoutSavedPosition);
+        Refresh(false);
+    }
+    event.Skip();
+}
+
+/// Scrolling
+void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
+{
+    // Not used
+    event.Skip();
+}
+

 /// Set up scrollbars, e.g. after a resize
 /// Set up scrollbars, e.g. after a resize

-void wxRichTextCtrl::SetupScrollbars()
+void wxRichTextCtrl::SetupScrollbars(bool atTop)

 {
     if (m_freezeCount)
         return;
 {
     if (m_freezeCount)
         return;


@@ -1344,12 +1435,13 @@ void wxRichTextCtrl::SetupScrollbars()
 
     int unitsY = maxHeight/pixelsPerUnit;
 
 
     int unitsY = maxHeight/pixelsPerUnit;
 

-    int startX, startY;
-    GetViewStart(& startX, & startY);
-    
+    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 maxPositionX = 0; // wxMax(sz.x - clientSize.x, 0);
     int maxPositionY = (wxMax(maxHeight - clientSize.y, 0))/pixelsPerUnit;

-    
+

     // Move to previous scroll position if
     // possible
     SetScrollbars(0, pixelsPerUnit,
     // Move to previous scroll position if
     // possible
     SetScrollbars(0, pixelsPerUnit,


@@ -1367,10 +1459,10 @@ void wxRichTextCtrl::PaintBackground(wxDC& dc)
     // Clear the background
     dc.SetBrush(wxBrush(backgroundColour));
     dc.SetPen(*wxTRANSPARENT_PEN);
     // Clear the background
     dc.SetBrush(wxBrush(backgroundColour));
     dc.SetPen(*wxTRANSPARENT_PEN);

-    wxRect windowRect(wxPoint(0, 0), GetClientSize());    
+    wxRect windowRect(GetClientSize());

     windowRect.x -= 2; windowRect.y -= 2;
     windowRect.width += 4; windowRect.height += 4;
     windowRect.x -= 2; windowRect.y -= 2;
     windowRect.width += 4; windowRect.height += 4;

-    
+

     // We need to shift the rectangle to take into account
     // scrolling. Converting device to logical coordinates.
     CalcUnscrolledPosition(windowRect.x, windowRect.y, & windowRect.x, & windowRect.y);
     // We need to shift the rectangle to take into account
     // scrolling. Converting device to logical coordinates.
     CalcUnscrolledPosition(windowRect.x, windowRect.y, & windowRect.x, & windowRect.y);


@@ -1383,10 +1475,10 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
     wxSize sz = size;
     if (sz == wxDefaultSize)
         sz = GetClientSize();
     wxSize sz = size;
     if (sz == wxDefaultSize)
         sz = GetClientSize();

-        
+

     if (sz.x < 1 || sz.y < 1)
         return false;
     if (sz.x < 1 || sz.y < 1)
         return false;

-        
+

     if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)
         m_bufferBitmap = wxBitmap(sz.x, sz.y);
     return m_bufferBitmap.Ok();
     if (!m_bufferBitmap.Ok() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)
         m_bufferBitmap = wxBitmap(sz.x, sz.y);
     return m_bufferBitmap.Ok();


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

-    Layout();
+    LayoutContent();

     PositionCaret();
     PositionCaret();

-    Refresh();
+    SetupScrollbars(true);
+    Refresh(false);

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


@@ -1414,7 +1507,7 @@ bool wxRichTextCtrl::LoadFile(const wxString& filename, int type)
     else
     {
         wxLogError(_("File couldn't be loaded."));
     else
     {
         wxLogError(_("File couldn't be loaded."));

-        
+

         return false;
     }
 }
         return false;
     }
 }


@@ -1474,7 +1567,8 @@ void wxRichTextCtrl::SelectAll()
 /// Select none
 void wxRichTextCtrl::SelectNone()
 {
 /// Select none
 void wxRichTextCtrl::SelectNone()
 {

-    SetSelection(-2, -2);
+    if (!(GetSelectionRange() == wxRichTextRange(-2, -2)))
+        SetSelection(-2, -2);

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


@@ -1487,17 +1581,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


@@ -1528,14 +1625,20 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
     ((wxRichTextCtrl*)this)->PrepareDC(dc);
 
     int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt, *pos);
     ((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;
+
+    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;

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


@@ -1605,8 +1708,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)


@@ -1616,8 +1719,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)


@@ -1630,13 +1733,12 @@ bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType)
     if (bitmap.Ok())
     {
         wxRichTextImageBlock imageBlock;
     if (bitmap.Ok())
     {
         wxRichTextImageBlock imageBlock;

-        
+

         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;
 }
 


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

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

     }
 }
 
     }
 }
 


@@ -1678,10 +1780,10 @@ void wxRichTextCtrl::Paste()
     if (CanPaste())
     {
         BeginBatchUndo(_("Paste"));
     if (CanPaste())
     {
         BeginBatchUndo(_("Paste"));

-        
+

         long newPos = m_caretPosition;
         DeleteSelectedContent(& newPos);
         long newPos = m_caretPosition;
         DeleteSelectedContent(& newPos);

-        
+

         GetBuffer().PasteFromClipboard(newPos);
 
         EndBatchUndo();
         GetBuffer().PasteFromClipboard(newPos);
 
         EndBatchUndo();


@@ -1792,8 +1894,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);

-    if (!IsFrozen())
-        Refresh();
+    Refresh(false);

     PositionCaret();
 }
 
     PositionCaret();
 }
 


@@ -1821,9 +1922,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


@@ -2110,8 +2211,8 @@ bool wxRichTextCtrl::SetFont(const wxFont& font)
     return true;
 }
 
     return true;
 }
 

-/// Transform logical to physical (unscrolling)
-wxPoint wxRichTextCtrl::GetPhysicalPoint(const wxPoint& ptLogical)
+/// Transform logical to physical
+wxPoint wxRichTextCtrl::GetPhysicalPoint(const wxPoint& ptLogical) const

 {
     wxPoint pt;
     CalcScrolledPosition(ptLogical.x, ptLogical.y, & pt.x, & pt.y);
 {
     wxPoint pt;
     CalcScrolledPosition(ptLogical.x, ptLogical.y, & pt.x, & pt.y);


@@ -2120,7 +2221,7 @@ wxPoint wxRichTextCtrl::GetPhysicalPoint(const wxPoint& ptLogical)
 }
 
 /// Transform physical to logical
 }
 
 /// Transform physical to logical

-wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical)
+wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical) const

 {
     wxPoint pt;
     CalcUnscrolledPosition(ptPhysical.x, ptPhysical.y, & pt.x, & pt.y);
 {
     wxPoint pt;
     CalcUnscrolledPosition(ptPhysical.x, ptPhysical.y, & pt.x, & pt.y);


@@ -2131,14 +2232,21 @@ wxPoint wxRichTextCtrl::GetLogicalPoint(const wxPoint& ptPhysical)
 /// Position the caret
 void wxRichTextCtrl::PositionCaret()
 {
 /// Position the caret
 void wxRichTextCtrl::PositionCaret()
 {

+    if (!GetCaret())
+        return;
+
+    //wxLogDebug(wxT("PositionCaret"));
+

     wxRect caretRect;
     if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
     {
         wxPoint originalPt = caretRect.GetPosition();
         wxPoint pt = GetPhysicalPoint(originalPt);
     wxRect caretRect;
     if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
     {
         wxPoint originalPt = caretRect.GetPosition();
         wxPoint pt = GetPhysicalPoint(originalPt);

-
-        GetCaret()->Move(pt);
-        GetCaret()->SetSize(caretRect.GetSize());
+        if (GetCaret()->GetPosition() != pt)
+        {
+            GetCaret()->Move(pt);
+            GetCaret()->SetSize(caretRect.GetSize());
+        }

     }
 }
 
     }
 }
 


@@ -2147,7 +2255,7 @@ bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
 {
     wxClientDC dc(this);
     dc.SetFont(GetFont());
 {
     wxClientDC dc(this);
     dc.SetFont(GetFont());

- 
+

     PrepareDC(dc);
 
     wxPoint pt;
     PrepareDC(dc);
 
     wxPoint pt;


@@ -2158,8 +2266,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


@@ -2172,8 +2280,9 @@ wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPositio
     wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPosition, true);
     if (line)
     {
     wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPosition, true);
     if (line)
     {

-        if (caretPosition == line->GetRange().GetStart()-1 &&
-            (para->GetRange().GetStart() != line->GetRange().GetStart()))
+        wxRichTextRange lineRange = line->GetAbsoluteRange();
+        if (caretPosition == lineRange.GetStart()-1 &&
+            (para->GetRange().GetStart() != lineRange.GetStart()))

         {
             if (!m_caretAtLineStart)
                 line = GetBuffer().GetLineAtPosition(caretPosition-1, true);
         {
             if (!m_caretAtLineStart)
                 line = GetBuffer().GetLineAtPosition(caretPosition-1, true);


@@ -2187,7 +2296,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())
     {


@@ -2203,26 +2312,36 @@ 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 wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)

 {
 {

-    wxRect availableSpace(wxPoint(0, 0), GetClientSize());
-    if (availableSpace.width == 0)
-        availableSpace.width = 10;
-    if (availableSpace.height == 0)
-        availableSpace.height = 10;
+    if (GetBuffer().GetDirty() || onlyVisibleRect)
+    {
+        wxRect availableSpace(GetClientSize());
+        if (availableSpace.width == 0)
+            availableSpace.width = 10;
+        if (availableSpace.height == 0)
+            availableSpace.height = 10;

 
 

-    wxClientDC dc(this);
-    dc.SetFont(GetFont());
- 
-    PrepareDC(dc);
+        int flags = wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT;
+        if (onlyVisibleRect)
+        {
+            flags |= wxRICHTEXT_LAYOUT_SPECIFIED_RECT;
+            availableSpace.SetPosition(GetLogicalPoint(wxPoint(0, 0)));
+        }

 
 

-    GetBuffer().Defragment();
-    GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
-    GetBuffer().Layout(dc, availableSpace, GetBuffer().GetRange(), wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
-    GetBuffer().SetDirty(false);
-    
-    if (!IsFrozen())
-        SetupScrollbars();
+        wxClientDC dc(this);
+        dc.SetFont(GetFont());
+
+        PrepareDC(dc);
+
+        GetBuffer().Defragment();
+        GetBuffer().UpdateRanges();     // If items were deleted, ranges need recalculation
+        GetBuffer().Layout(dc, availableSpace, flags);
+        GetBuffer().SetDirty(false);
+
+        if (!IsFrozen())
+            SetupScrollbars();
+    }

 
     return true;
 }
 
     return true;
 }


@@ -2236,7 +2355,7 @@ bool wxRichTextCtrl::IsSelectionBold() const
         wxRichTextRange range = GetSelectionRange();
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         attr.SetFontWeight(wxBOLD);
         wxRichTextRange range = GetSelectionRange();
         attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
         attr.SetFontWeight(wxBOLD);

-        
+

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


@@ -2263,7 +2382,7 @@ bool wxRichTextCtrl::IsSelectionItalics() const
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFontStyle(wxITALIC);
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
         attr.SetFontStyle(wxITALIC);

-        
+

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


@@ -2290,7 +2409,7 @@ bool wxRichTextCtrl::IsSelectionUnderlined() const
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         attr.SetFontUnderlined(true);
         wxRichTextAttr attr;
         attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
         attr.SetFontUnderlined(true);

-        
+

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


@@ -2341,7 +2460,7 @@ bool wxRichTextCtrl::ApplyUnderlineToSelection()
 {
     wxRichTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
 {
     wxRichTextAttr attr;
     attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);

-    attr.SetFontWeight(!IsSelectionUnderlined());
+    attr.SetFontUnderlined(!IsSelectionUnderlined());

 
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);
 
     if (HasSelection())
         return SetStyle(GetSelectionRange(), attr);


@@ -2358,7 +2477,7 @@ bool wxRichTextCtrl::IsSelectionAligned(wxTextAttrAlignment alignment) const
         wxRichTextRange range = GetSelectionRange();
         wxRichTextAttr attr;
         attr.SetAlignment(alignment);
         wxRichTextRange range = GetSelectionRange();
         wxRichTextAttr attr;
         attr.SetAlignment(alignment);

-        
+

         return HasParagraphAttributes(range, attr);
     }
     else
         return HasParagraphAttributes(range, attr);
     }
     else


@@ -2398,8 +2517,18 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
         SetDefaultStyle(attr);
         return true;
     }
         SetDefaultStyle(attr);
         return true;
     }

+
+    return false;
+}
+
+/// Returns the first visible position in the current view
+long wxRichTextCtrl::GetFirstVisiblePosition() const
+{
+    wxRichTextLine* line = GetBuffer().GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y);
+    if (line)
+        return line->GetAbsoluteRange().GetStart();

     else
     else

-        return false;
+        return 0;

 }
 
 #endif
 }
 
 #endif