Merged in latest changes from Mahogany. Untested.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/richedit/wxllist.cpp

@@ -1851,6 +1851,8 @@ wxLayoutList::MoveCursorWord(int n, bool untilNext)
             // moved to the end/beginning of text
             return false;
          }
+
+         offset = -1;
       }
 
       wxLayoutObject *obj = *i;
@@ -2476,10 +2478,10 @@ wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
 #else // !WXLAYOUT_USE_CARET
    dc.SetBrush(*wxWHITE_BRUSH);
    //FIXME: wxGTK XOR is borken at the moment!!!dc.SetLogicalFunction(wxXOR);
-   dc.SetLogicalFunction(wxXOR);
    dc.SetPen(wxPen(*wxBLACK,1,wxSOLID));
    if(active)
    {
+      dc.SetLogicalFunction(wxXOR);
       dc.DrawRectangle(coords.x, coords.y,
                        m_CursorSize.x, m_CursorSize.y);
       SetUpdateRect(coords.x, coords.y);
@@ -2487,6 +2489,7 @@ wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
    }
    else
    {
+      dc.SetLogicalFunction(wxCOPY);
       dc.DrawLine(coords.x, coords.y+m_CursorSize.y-1,
                   coords.x, coords.y);
       SetUpdateRect(coords.x, coords.y+m_CursorSize.y-1);