simplify code so it always returns the same object

[wxWidgets.git] / src / x11 / textctrl.cpp

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 8a3e8061991791ad4020e01be284d61cc505dc04..d37b6670680ca3a6c23facb05ce649bef8df2a6c 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        src/x11/textctrl.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,16 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "textctrl.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/textctrl.h"
 
 #include "wx/textctrl.h"

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/settings.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/clipbrd.h"
 #include "wx/tokenzr.h"
 
 #include "wx/clipbrd.h"
 #include "wx/tokenzr.h"
 


@@ -35,10 +39,10 @@ wxSourceUndoStep::wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtr
     m_y1 = y1;
     m_y2 = y2;
     m_owner = owner;
     m_y1 = y1;
     m_y2 = y2;
     m_owner = owner;

-    
+

     m_cursorX = m_owner->GetCursorX();
     m_cursorY = m_owner->GetCursorY();
     m_cursorX = m_owner->GetCursorX();
     m_cursorY = m_owner->GetCursorY();

-    
+

     if (m_type == wxSOURCE_UNDO_LINE)
     {
         m_text = m_owner->m_lines[m_y1].m_text;
     if (m_type == wxSOURCE_UNDO_LINE)
     {
         m_text = m_owner->m_lines[m_y1].m_text;


@@ -52,7 +56,7 @@ wxSourceUndoStep::wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtr
         for (int i = m_y1; i < m_y2+2; i++)
         {
             if (i >= (int)m_owner->m_lines.GetCount())
         for (int i = m_y1; i < m_y2+2; i++)
         {
             if (i >= (int)m_owner->m_lines.GetCount())

-                m_lines.Add( "" );
+                m_lines.Add( wxEmptyString );

             else
                 m_lines.Add( m_owner->m_lines[i].m_text );
         }
             else
                 m_lines.Add( m_owner->m_lines[i].m_text );
         }


@@ -127,14 +131,14 @@ WX_DEFINE_OBJARRAY(wxSourceLineArray);
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

     EVT_PAINT(wxTextCtrl::OnPaint)
     EVT_PAINT(wxTextCtrl::OnPaint)

+    EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)

     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MOUSE_EVENTS(wxTextCtrl::OnMouse)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MOUSE_EVENTS(wxTextCtrl::OnMouse)

-    EVT_IDLE(wxTextCtrl::OnIdle)
-    
+    EVT_KILL_FOCUS(wxTextCtrl::OnKillFocus)
+    EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
+

     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)


@@ -150,43 +154,34 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 
 void wxTextCtrl::Init()
 {

-    m_editable = TRUE;
-    m_modified = FALSE;
-    
-    m_sourceFont = wxFont( 12, wxMODERN, wxNORMAL, wxNORMAL );
+    m_editable = true;
+    m_modified = false;

 
 

-    m_undos.DeleteContents( TRUE );
-    

     m_lang = wxSOURCE_LANG_NONE;
     m_lang = wxSOURCE_LANG_NONE;

-    
-    m_capturing = FALSE;
-    
-    wxClientDC dc(this);
-    dc.SetFont( m_sourceFont );
-    m_lineHeight = dc.GetCharHeight();
-    m_charWidth = dc.GetCharWidth();
-    
+
+    m_capturing = false;
+

     m_cursorX = 0;
     m_cursorY = 0;
     m_cursorX = 0;
     m_cursorY = 0;

-    
+

     m_longestLine = 0;
     m_longestLine = 0;

-    
+

     m_bracketX = -1;
     m_bracketY = -1;
     m_bracketX = -1;
     m_bracketY = -1;

-    
-    m_overwrite = FALSE;
-    m_ignoreInput = FALSE;
-    
+
+    m_overwrite = false;
+    m_ignoreInput = false;
+

     ClearSelection();
     ClearSelection();

-    
+

     m_keywordColour = wxColour( 10, 140, 10 );
     m_keywordColour = wxColour( 10, 140, 10 );

-    
+

     m_defineColour = *wxRED;
     m_defineColour = *wxRED;

-    
+

     m_variableColour = wxColour( 50, 120, 150 );
     m_variableColour = wxColour( 50, 120, 150 );

-    
+

     m_commentColour = wxColour( 130, 130, 130 );
     m_commentColour = wxColour( 130, 130, 130 );

-    
+

     m_stringColour = wxColour( 10, 140, 10 );
 }
 
     m_stringColour = wxColour( 10, 140, 10 );
 }
 


@@ -205,6 +200,11 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent,
     Create( parent, id, value, pos, size, style, validator, name );
 }
 
     Create( parent, id, value, pos, size, style, validator, name );
 }
 

+wxTextCtrl::~wxTextCtrl()
+{
+    WX_CLEAR_LIST(wxList, m_undos);
+}
+

 bool wxTextCtrl::Create( wxWindow *parent,
                          wxWindowID id,
                          const wxString &value,
 bool wxTextCtrl::Create( wxWindow *parent,
                          wxWindowID id,
                          const wxString &value,


@@ -216,17 +216,29 @@ bool wxTextCtrl::Create( wxWindow *parent,
 {
     if ((style & wxBORDER_MASK) == 0)
         style |= wxBORDER_SUNKEN;
 {
     if ((style & wxBORDER_MASK) == 0)
         style |= wxBORDER_SUNKEN;

-        
+

     if ((style & wxTE_MULTILINE) != 0)
         style |= wxALWAYS_SHOW_SB;
     if ((style & wxTE_MULTILINE) != 0)
         style |= wxALWAYS_SHOW_SB;

-        
-    wxTextCtrlBase::Create( parent, id, wxDefaultPosition, size,
-                              style|wxVSCROLL|wxHSCROLL|wxNO_FULL_REPAINT_ON_RESIZE );
-                              
+
+    wxTextCtrlBase::Create( parent, id, pos /* wxDefaultPosition */, size,
+                            style | wxVSCROLL | wxHSCROLL);
+

     SetBackgroundColour( *wxWHITE );
     SetBackgroundColour( *wxWHITE );

-    
+

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

-    
+
+    m_editable = ((m_windowStyle & wxTE_READONLY) == 0);
+
+    if (HasFlag(wxTE_PASSWORD))
+        m_sourceFont = wxFont( 12, wxMODERN, wxNORMAL, wxNORMAL );
+    else
+        m_sourceFont = GetFont();
+
+    wxClientDC dc(this);
+    dc.SetFont( m_sourceFont );
+    m_lineHeight = dc.GetCharHeight();
+    m_charWidth = dc.GetCharWidth();
+

     SetValue( value );
 
     wxSize size_best( DoGetBestSize() );
     SetValue( value );
 
     wxSize size_best( DoGetBestSize() );


@@ -237,11 +249,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
         new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
         new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );

-    
+

     // We create an input handler since it might be useful
     CreateInputHandler(wxINP_HANDLER_TEXTCTRL);
     // We create an input handler since it might be useful
     CreateInputHandler(wxINP_HANDLER_TEXTCTRL);

-    
-    return TRUE;
+
+    MyAdjustScrollbars();
+
+    return true;

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


@@ -254,66 +268,97 @@ wxString wxTextCtrl::GetValue() const
     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
         ret += m_lines[i].m_text;
     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
         ret += m_lines[i].m_text;

-        if (i < m_lines.GetCount())
+        if (i+1 < m_lines.GetCount())

             ret += wxT('\n');
     }
             ret += wxT('\n');
     }

-    
+

     return ret;
 }
 
     return ret;
 }
 

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

 {
 {

-    m_modified = TRUE;
+    m_modified = false;
+
+    wxString oldValue = GetValue();
+

     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();
     m_lines.Clear();
     m_longestLine = 0;
     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();
     m_lines.Clear();
     m_longestLine = 0;

-    
-    int pos = 0;
-    for (;;)
-    {
-        // TODO make more efficient
-        wxString tmp = value;
-        tmp.Remove( 0, pos );
-        pos = tmp.Find( '\n' );
-        if (pos == -1)
-        {
-            if (tmp.Len() > m_longestLine)
-                m_longestLine = tmp.Len();
-                
-            m_lines.Add( new wxSourceLine( tmp ) );
-            break;
-            
-        }
-        else
+
+    if (value.empty())
+    {
+        m_lines.Add( new wxSourceLine( wxEmptyString ) );
+    }
+    else
+    {
+        int begin = 0;
+        int pos = 0;
+        for (;;)

         {
         {

-            if (pos > m_longestLine)
-                m_longestLine = pos;
-                
-            tmp.Remove( pos, tmp.Len()-pos );
-            m_lines.Add( new wxSourceLine( tmp ) );
+            pos = value.find( wxT('\n'), begin );
+            if (pos < 0)
+            {
+                wxSourceLine *sl = new wxSourceLine( value.Mid( begin, value.Len()-begin ) );
+                m_lines.Add( sl );
+
+                // if (sl->m_text.Len() > m_longestLine)
+                //    m_longestLine = sl->m_text.Len();
+                int ww = 0;
+                GetTextExtent( sl->m_text, &ww, NULL, NULL, NULL );
+                ww /= m_charWidth;
+                if (ww > m_longestLine)
+                    m_longestLine = ww;
+
+                break;
+            }
+            else
+            {
+                wxSourceLine *sl = new wxSourceLine( value.Mid( begin, pos-begin ) );
+                m_lines.Add( sl );
+
+                // if (sl->m_text.Len() > m_longestLine)
+                //      m_longestLine = sl->m_text.Len();
+                int ww = 0;
+                GetTextExtent( sl->m_text, &ww, NULL, NULL, NULL );
+                ww /= m_charWidth;
+                if (ww > m_longestLine)
+                    m_longestLine = ww;
+
+                begin = pos+1;
+            }

         }
     }
         }
     }

-    
+
+    // Don't need to refresh if the value hasn't changed
+    if ((GetWindowStyle() & wxTE_MULTILINE) == 0)
+    {
+        if (value == oldValue)
+            return;
+    }
+

     MyAdjustScrollbars();
     MyAdjustScrollbars();

-    
+

     Refresh();
     Refresh();

+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     if (lineNo >= (long)m_lines.GetCount())
         return 0;
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     if (lineNo >= (long)m_lines.GetCount())
         return 0;

-        
+

     return m_lines[lineNo].m_text.Len();
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     if (lineNo >= (long)m_lines.GetCount())
     return m_lines[lineNo].m_text.Len();
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     if (lineNo >= (long)m_lines.GetCount())

-        return wxT("");
-        
+        return wxEmptyString;
+

     return m_lines[lineNo].m_text;
 }
 
     return m_lines[lineNo].m_text;
 }
 


@@ -334,18 +379,32 @@ bool wxTextCtrl::IsEditable() const
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {
 
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {

+    if (m_selStartX == -1 || m_selStartY == -1 ||
+        m_selEndX == -1 || m_selEndY == -1)
+    {
+        *from = GetInsertionPoint();
+        *to = GetInsertionPoint();
+    }
+    else
+    {
+        *from = XYToPosition(m_selStartX, m_selStartY);
+        *to = XYToPosition(m_selEndX, m_selEndY);
+    }

 }
 
 void wxTextCtrl::Clear()
 {
 }
 
 void wxTextCtrl::Clear()
 {

-    m_modified = TRUE;
+    m_modified = true;

     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();
     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();

+

     m_lines.Clear();
     m_lines.Clear();

+    m_lines.Add( new wxSourceLine( wxEmptyString ) );
+

     SetScrollbars( m_charWidth, m_lineHeight, 0, 0, 0, 0 );
     Refresh();
     SetScrollbars( m_charWidth, m_lineHeight, 0, 0, 0, 0 );
     Refresh();

-    m_undos.Clear();
+    WX_CLEAR_LIST(wxList, m_undos);

 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 }
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)


@@ -354,7 +413,6 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
 
 void wxTextCtrl::Remove(long from, long to)
 {
 
 void wxTextCtrl::Remove(long from, long to)
 {

-    

 }
 
 void wxTextCtrl::DiscardEdits()
 }
 
 void wxTextCtrl::DiscardEdits()


@@ -367,10 +425,64 @@ void wxTextCtrl::SetMaxLength(unsigned long len)
 {
 }
 
 {
 }
 

+int wxTextCtrl::PosToPixel( int line, int pos )
+{
+    // TODO add support for Tabs
+
+    if (line >= (int)m_lines.GetCount()) return 0;
+    if (pos < 0) return 0;
+
+    wxString text = m_lines[line].m_text;
+
+    if (text.empty()) return 0;
+
+    if (pos < (int)text.Len())
+        text.Remove( pos, text.Len()-pos );
+
+    int w = 0;
+
+    GetTextExtent( text, &w, NULL, NULL, NULL );
+
+    return w;
+}
+
+int wxTextCtrl::PixelToPos( int line, int pixel )
+{
+    if (pixel < 2) return 0;
+
+    if (line >= (int)m_lines.GetCount()) return 0;
+
+    wxString text = m_lines[line].m_text;
+
+    int w = 0;
+    int res = text.Len();
+    while (res > 0)
+    {
+        GetTextExtent( text, &w, NULL, NULL, NULL );
+
+        if (w < pixel)
+            return res;
+
+        res--;
+        text.Remove( res,1 );
+    }
+
+    return 0;
+}
+
+void wxTextCtrl::SetLanguage( wxSourceLanguage lang )
+{
+    m_lang = lang;
+
+    m_keywords.Clear();
+}
+

 void wxTextCtrl::WriteText(const wxString& text2)
 {
 void wxTextCtrl::WriteText(const wxString& text2)
 {

-    m_modified = TRUE;
-    
+    if (text2.empty()) return;
+
+    m_modified = true;
+

     wxString text( text2 );
     wxArrayString lines;
     int pos;
     wxString text( text2 );
     wxArrayString lines;
     int pos;


@@ -381,11 +493,11 @@ void wxTextCtrl::WriteText(const wxString& text2)
     }
     lines.Add( text );
     int count = (int)lines.GetCount();
     }
     lines.Add( text );
     int count = (int)lines.GetCount();

-    
+

     wxString tmp1( m_lines[m_cursorY].m_text );
     wxString tmp2( tmp1 );
     int len = (int)tmp1.Len();
     wxString tmp1( m_lines[m_cursorY].m_text );
     wxString tmp2( tmp1 );
     int len = (int)tmp1.Len();

-    
+

     if (len < m_cursorX)
     {
         wxString tmp;
     if (len < m_cursorX)
     {
         wxString tmp;


@@ -399,11 +511,11 @@ void wxTextCtrl::WriteText(const wxString& text2)
     tmp1.Remove( m_cursorX );
     tmp2.Remove( 0, m_cursorX );
     tmp1.Append( lines[0] );
     tmp1.Remove( m_cursorX );
     tmp2.Remove( 0, m_cursorX );
     tmp1.Append( lines[0] );

-    
+

     if (count == 1)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );
     if (count == 1)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );

-        
+

         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         RefreshLine( m_cursorY );
         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         RefreshLine( m_cursorY );


@@ -411,53 +523,85 @@ void wxTextCtrl::WriteText(const wxString& text2)
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_PASTE, m_cursorY, m_cursorY+count-1, this ) );
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_PASTE, m_cursorY, m_cursorY+count-1, this ) );

-        
+

         m_lines[m_cursorY].m_text = tmp1;
         int i;
         for (i = 1; i < count; i++)
             m_lines.Insert( new wxSourceLine( lines[i] ), m_cursorY+i );
         m_lines[m_cursorY+i-1].m_text.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         int i;
         for (i = 1; i < count; i++)
             m_lines.Insert( new wxSourceLine( lines[i] ), m_cursorY+i );
         m_lines[m_cursorY+i-1].m_text.Append( tmp2 );

-        
+

         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }
 }
 
         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }
 }
 

-void wxTextCtrl::AppendText(const wxString& text)
+void wxTextCtrl::AppendText(const wxString& text2)

 {
 {

-    // Leaves cursor garbage
+    if (text2.empty()) return;

 
 

-    m_cursorY = m_lines.GetCount()-1;
-    m_cursorX = m_lines[m_cursorY].m_text.Len();
-    
-    WriteText( text );
-    
-    Refresh();
+    m_modified = true;
+
+    wxString text( text2 );
+    wxArrayString lines;
+    int pos;
+    while ( (pos = text.Find('\n')) != -1 )
+    {
+       lines.Add( text.Left( pos ) );
+       text.Remove( 0, pos+1 );
+    }
+    lines.Add( text );
+    int count = (int)lines.GetCount();
+
+    size_t y = m_lines.GetCount()-1;
+
+    wxString tmp( m_lines[y].m_text );
+    tmp.Append( lines[0] );
+
+    if (count == 1)
+    {
+        m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, y, y, this ) );
+
+        m_lines[y].m_text = tmp;
+        RefreshLine( y );
+    }
+    else
+    {
+        m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_PASTE, y, y+count-1, this ) );
+
+        m_lines[y].m_text = tmp;
+        int i;
+        for (i = 1; i < count; i++)
+            m_lines.Insert( new wxSourceLine( lines[i] ), y+i );
+
+        MyAdjustScrollbars();
+        RefreshDown( y );
+    }

 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
 }
 
 bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {

-    return FALSE;
+    return false;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
     long ret = 0;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
     long ret = 0;

-    
+

     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
         if (i < (size_t)y)
         {
     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
         if (i < (size_t)y)
         {

-            ret += m_lines[i].m_text.Len();
+            // Add one for the end-of-line character
+            ret += m_lines[i].m_text.Len() + 1;

             continue;
         }
             continue;
         }

-        
-        if ((size_t)x < m_lines[i].m_text.Len())
+
+        if ((size_t)x < (m_lines[i].m_text.Len()+1))

             return (ret + x);
         else
             return (ret + x);
         else

-            return (ret + m_lines[i].m_text.Len());
+            return (ret + m_lines[i].m_text.Len() + 1);

     }
     }

-     
+

     return ret;
 }
 
     return ret;
 }
 


@@ -473,26 +617,32 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 
     long xx = 0;
     long yy = 0;
 
     long xx = 0;
     long yy = 0;

-    
+

     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {
     for (size_t i = 0; i < m_lines.GetCount(); i++)
     {

-        pos -= m_lines[i].m_text.Len();
-        if (pos <= 0)
+        //pos -= m_lines[i].m_text.Len();
+        //if (pos <= 0)
+
+        // Add one for the end-of-line character. (In Windows,
+        // there are _two_ positions for each end of line.)
+        if (pos <= ((int)m_lines[i].m_text.Len()))

         {
         {

-            xx = -pos;
+            xx = pos;

             if (x) *x = xx;
             if (y) *y = yy;
             if (x) *x = xx;
             if (y) *y = yy;

-            return TRUE;
+            return true;

         }
         }

+        pos -= (m_lines[i].m_text.Len() + 1);

         yy++;
     }
         yy++;
     }

-    
+

     // Last pos
     // Last pos

-    xx = m_lines[ m_lines.GetCount()-1 ].m_text.Len();
+    //xx = m_lines[ m_lines.GetCount()-1 ].m_text.Len();
+    xx = pos;

     if (x) *x = xx;
     if (y) *y = yy;
     if (x) *x = xx;
     if (y) *y = yy;

-    
-    return FALSE;
+
+    return false;

 }
 
 void wxTextCtrl::ShowPosition(long pos)
 }
 
 void wxTextCtrl::ShowPosition(long pos)


@@ -502,14 +652,14 @@ void wxTextCtrl::ShowPosition(long pos)
 void wxTextCtrl::Copy()
 {
     if (!HasSelection()) return;
 void wxTextCtrl::Copy()
 {
     if (!HasSelection()) return;

-    
+

     wxString sel;
     wxString sel;

-    
+

     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;
     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;

-    
+

     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {
     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {


@@ -520,32 +670,32 @@ void wxTextCtrl::Copy()
         selStartY = selEndY;
         selEndY = tmp;
     }
         selStartY = selEndY;
         selEndY = tmp;
     }

-    
+

     if (selStartY == selEndY)
     {
         sel = m_lines[selStartY].m_text;
     if (selStartY == selEndY)
     {
         sel = m_lines[selStartY].m_text;

-        
+

         if (selStartX >= (int)sel.Len()) return;
         if (selEndX > (int)sel.Len())
             selEndX = sel.Len();
         if (selStartX >= (int)sel.Len()) return;
         if (selEndX > (int)sel.Len())
             selEndX = sel.Len();

-        
+

         sel.Remove( selEndX, sel.Len()-selEndX );
         sel.Remove( 0, selStartX );
     }
     else
     {
         wxString tmp( m_lines[selStartY].m_text );
         sel.Remove( selEndX, sel.Len()-selEndX );
         sel.Remove( 0, selStartX );
     }
     else
     {
         wxString tmp( m_lines[selStartY].m_text );

-        
+

         if (selStartX < (int)tmp.Len())
         {
             tmp.Remove( 0, selStartX );
             sel = tmp;
         if (selStartX < (int)tmp.Len())
         {
             tmp.Remove( 0, selStartX );
             sel = tmp;

-            sel.Append( "\n" );
+            sel.Append( wxT("\n") );

         }
         for (int i = selStartY+1; i < selEndY; i++)
         {
             sel.Append( m_lines[i].m_text );
         }
         for (int i = selStartY+1; i < selEndY; i++)
         {
             sel.Append( m_lines[i].m_text );

-            sel.Append( "\n" );
+            sel.Append( wxT("\n") );

         }
         tmp = m_lines[selEndY].m_text;
         if (selEndX > (int)tmp.Len())
         }
         tmp = m_lines[selEndY].m_text;
         if (selEndX > (int)tmp.Len())


@@ -556,7 +706,7 @@ void wxTextCtrl::Copy()
             sel.Append( tmp );
         }
     }
             sel.Append( tmp );
         }
     }

-    
+

     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData( new wxTextDataObject( sel ) );
     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData( new wxTextDataObject( sel ) );


@@ -566,34 +716,34 @@ void wxTextCtrl::Copy()
 
 void wxTextCtrl::Cut()
 {
 
 void wxTextCtrl::Cut()
 {

-   Copy();
-   
-   Delete();
+    Copy();
+
+    Delete();

 }
 
 void wxTextCtrl::Paste()
 {
     Delete();
 }
 
 void wxTextCtrl::Paste()
 {
     Delete();

-    
+

     if (!wxTheClipboard->Open()) return;
     if (!wxTheClipboard->Open()) return;

-    
+

     if (!wxTheClipboard->IsSupported( wxDF_TEXT ))
     {
         wxTheClipboard->Close();
     if (!wxTheClipboard->IsSupported( wxDF_TEXT ))
     {
         wxTheClipboard->Close();

-        
+

         return;
     }
         return;
     }

-    
+

     wxTextDataObject data;
     wxTextDataObject data;

-    
+

     bool ret = wxTheClipboard->GetData( data );
     bool ret = wxTheClipboard->GetData( data );

-    
+

     wxTheClipboard->Close();
     wxTheClipboard->Close();

-    
+

     if (!ret) return;
     if (!ret) return;

-    
-    m_modified = TRUE;
-    
+
+    m_modified = true;
+

     wxString text( data.GetText() );
     wxArrayString lines;
     int pos;
     wxString text( data.GetText() );
     wxArrayString lines;
     int pos;


@@ -604,11 +754,11 @@ void wxTextCtrl::Paste()
     }
     lines.Add( text );
     int count = (int)lines.GetCount();
     }
     lines.Add( text );
     int count = (int)lines.GetCount();

-    
+

     wxString tmp1( m_lines[m_cursorY].m_text );
     wxString tmp2( tmp1 );
     int len = (int)tmp1.Len();
     wxString tmp1( m_lines[m_cursorY].m_text );
     wxString tmp2( tmp1 );
     int len = (int)tmp1.Len();

-    
+

     if (len < m_cursorX)
     {
         wxString tmp;
     if (len < m_cursorX)
     {
         wxString tmp;


@@ -622,11 +772,11 @@ void wxTextCtrl::Paste()
     tmp1.Remove( m_cursorX );
     tmp2.Remove( 0, m_cursorX );
     tmp1.Append( lines[0] );
     tmp1.Remove( m_cursorX );
     tmp2.Remove( 0, m_cursorX );
     tmp1.Append( lines[0] );

-    
+

     if (count == 1)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );
     if (count == 1)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );

-        
+

         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         RefreshLine( m_cursorY );
         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         RefreshLine( m_cursorY );


@@ -634,13 +784,13 @@ void wxTextCtrl::Paste()
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_PASTE, m_cursorY, m_cursorY+count-1, this ) );
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_PASTE, m_cursorY, m_cursorY+count-1, this ) );

-        
+

         m_lines[m_cursorY].m_text = tmp1;
         int i;
         for (i = 1; i < count; i++)
             m_lines.Insert( new wxSourceLine( lines[i] ), m_cursorY+i );
         m_lines[m_cursorY+i-1].m_text.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         int i;
         for (i = 1; i < count; i++)
             m_lines.Insert( new wxSourceLine( lines[i] ), m_cursorY+i );
         m_lines[m_cursorY+i-1].m_text.Append( tmp2 );

-        
+

         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }
         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }


@@ -649,23 +799,32 @@ void wxTextCtrl::Paste()
 void wxTextCtrl::Undo()
 {
     if (m_undos.GetCount() == 0) return;
 void wxTextCtrl::Undo()
 {
     if (m_undos.GetCount() == 0) return;

-    
-    wxNode *node = m_undos.Nth( m_undos.GetCount()-1 );
-    wxSourceUndoStep *undo = (wxSourceUndoStep*) node->Data();
-    
+
+    wxList::compatibility_iterator node = m_undos.Item( m_undos.GetCount()-1 );
+    wxSourceUndoStep *undo = (wxSourceUndoStep*) node->GetData();
+

     undo->Undo();
     undo->Undo();

-    
-    delete node;
-    
-    m_modified = TRUE;
+
+    delete undo;
+    m_undos.Erase( node );
+
+    m_modified = true;

 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {
 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {

+    ClearSelection();
+    long x, y;
+    PositionToXY(pos, & x, & y);
+    m_cursorX = x;
+    m_cursorY = y;
+    // TODO: scroll to this position if necessary
+    Refresh();

 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

+    SetInsertionPoint(GetLastPosition());

 }
 
 long wxTextCtrl::GetInsertionPoint() const
 }
 
 long wxTextCtrl::GetInsertionPoint() const


@@ -673,10 +832,12 @@ long wxTextCtrl::GetInsertionPoint() const
     return XYToPosition( m_cursorX, m_cursorY );
 }
 
     return XYToPosition( m_cursorX, m_cursorY );
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

 {
     size_t lineCount = m_lines.GetCount() - 1;
 {
     size_t lineCount = m_lines.GetCount() - 1;

-    return XYToPosition( m_lines[lineCount].m_text.Len()-1, lineCount );
+    // It's the length of the line, not the length - 1,
+    // because there's a position after the last character.
+    return XYToPosition( m_lines[lineCount].m_text.Len(), lineCount );

 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 }
 
 void wxTextCtrl::SetSelection(long from, long to)


@@ -690,12 +851,25 @@ void wxTextCtrl::SetEditable(bool editable)
 
 bool wxTextCtrl::Enable( bool enable )
 {
 
 bool wxTextCtrl::Enable( bool enable )
 {

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrl::SetFont(const wxFont& font)
 {
 }
 
 bool wxTextCtrl::SetFont(const wxFont& font)
 {

-    return FALSE;
+    wxTextCtrlBase::SetFont( font );
+
+    m_sourceFont = font;
+
+    wxClientDC dc(this);
+    dc.SetFont( m_sourceFont );
+    m_lineHeight = dc.GetCharHeight();
+    m_charWidth = dc.GetCharWidth();
+
+    // TODO: recalc longest lines
+
+    MyAdjustScrollbars();
+
+    return true;

 }
 
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 }
 
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)


@@ -716,26 +890,26 @@ void wxTextCtrl::SearchForBrackets()
 {
     int oldBracketY = m_bracketY;
     int oldBracketX = m_bracketX;
 {
     int oldBracketY = m_bracketY;
     int oldBracketX = m_bracketX;

-    
+

     if (m_cursorY < 0 || m_cursorY >= (int)m_lines.GetCount()) return;
     if (m_cursorY < 0 || m_cursorY >= (int)m_lines.GetCount()) return;

-        
+

     wxString current = m_lines[m_cursorY].m_text;
     wxString current = m_lines[m_cursorY].m_text;

-    
+

     // reverse search first
 
     char bracket = ' ';
     // reverse search first
 
     char bracket = ' ';

-    
+

     if (m_cursorX > 0)
     if (m_cursorX > 0)

-        bracket = current[m_cursorX-1];
-        
+        bracket = current[(size_t) (m_cursorX-1)];
+

     if (bracket == ')' || bracket == ']' || bracket == '}')
     {
         char antibracket = '(';
         if (bracket == ']') antibracket = '[';
         if (bracket == '}') antibracket = '{';
     if (bracket == ')' || bracket == ']' || bracket == '}')
     {
         char antibracket = '(';
         if (bracket == ']') antibracket = '[';
         if (bracket == '}') antibracket = '{';

-        
+

         int count = 1;
         int count = 1;

-    
+

         int endY = m_cursorY-60;
         if (endY < 0) endY = 0;
         for (int y = m_cursorY; y >= endY; y--)
         int endY = m_cursorY-60;
         if (endY < 0) endY = 0;
         for (int y = m_cursorY; y >= endY; y--)


@@ -743,40 +917,40 @@ void wxTextCtrl::SearchForBrackets()
             current = m_lines[y].m_text;
             if (y == m_cursorY)
                 current.erase(m_cursorX-1,current.Len()-m_cursorX+1);
             current = m_lines[y].m_text;
             if (y == m_cursorY)
                 current.erase(m_cursorX-1,current.Len()-m_cursorX+1);

-            
+

             for (int n = current.Len()-1; n >= 0; n--)
             {
                 // ignore chars
             for (int n = current.Len()-1; n >= 0; n--)
             {
                 // ignore chars

-                if (current[n] == '\'')
+                if (current[(size_t) (n)] == '\'')

                 {
                     for (int m = n-1; m >= 0; m--)
                     {
                 {
                     for (int m = n-1; m >= 0; m--)
                     {

-                        if (current[m] == '\'')
+                        if (current[(size_t) (m)] == '\'')

                         {
                         {

-                            if (m == 0 || current[m-1] != '\\')
+                            if (m == 0 || current[(size_t) (m-1)] != '\\')

                                 break;
                         }
                         n = m-1;
                     }
                     continue;
                 }
                                 break;
                         }
                         n = m-1;
                     }
                     continue;
                 }

-                
+

                 // ignore strings
                 // ignore strings

-                if (current[n] == '\"')
+                if (current[(size_t) (n)] == '\"')

                 {
                     for (int m = n-1; m >= 0; m--)
                     {
                 {
                     for (int m = n-1; m >= 0; m--)
                     {

-                        if (current[m] == '\"')
+                        if (current[(size_t) (m)] == '\"')

                         {
                         {

-                            if (m == 0 || current[m-1] != '\\')
+                            if (m == 0 || current[(size_t) (m-1)] != '\\')

                                 break;
                         }
                         n = m-1;
                     }
                     continue;
                 }
                                 break;
                         }
                         n = m-1;
                     }
                     continue;
                 }

-            
-                if (current[n] == antibracket)
+
+                if (current[(size_t) (n)] == antibracket)

                 {
                     count--;
                     if (count == 0)
                 {
                     count--;
                     if (count == 0)


@@ -790,27 +964,27 @@ void wxTextCtrl::SearchForBrackets()
                         return;
                     }
                 }
                         return;
                     }
                 }

-                else if (current[n] == bracket)
+                else if (current[(size_t) (n)] == bracket)

                 {
                     count++;
                 }
             }
         }
     }
                 {
                     count++;
                 }
             }
         }
     }

-    
+

     // then forward
 
     bracket = ' ';
     if ((int)current.Len() > m_cursorX)
     // then forward
 
     bracket = ' ';
     if ((int)current.Len() > m_cursorX)

-        bracket = current[m_cursorX];
+        bracket = current[(size_t) (m_cursorX)];

     if (bracket == '(' || bracket == '[' || bracket == '{')
     {
         char antibracket = ')';
         if (bracket == '[') antibracket = ']';
         if (bracket == '{') antibracket = '}';
     if (bracket == '(' || bracket == '[' || bracket == '{')
     {
         char antibracket = ')';
         if (bracket == '[') antibracket = ']';
         if (bracket == '{') antibracket = '}';

-        
+

         int count = 1;
         int count = 1;

-    
+

         int endY = m_cursorY+60;
         if (endY > (int)(m_lines.GetCount()-1)) endY = m_lines.GetCount()-1;
         for (int y = m_cursorY; y <= endY; y++)
         int endY = m_cursorY+60;
         if (endY > (int)(m_lines.GetCount()-1)) endY = m_lines.GetCount()-1;
         for (int y = m_cursorY; y <= endY; y++)


@@ -819,40 +993,40 @@ void wxTextCtrl::SearchForBrackets()
             int start = 0;
             if (y == m_cursorY)
                 start = m_cursorX+1;
             int start = 0;
             if (y == m_cursorY)
                 start = m_cursorX+1;

-            
+

             for (int n = start; n < (int)current.Len(); n++)
             {
                 // ignore chars
             for (int n = start; n < (int)current.Len(); n++)
             {
                 // ignore chars

-                if (current[n] == '\'')
+                if (current[(size_t) (n)] == '\'')

                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {
                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {

-                        if (current[m] == '\'')
+                        if (current[(size_t) (m)] == '\'')

                         {
                         {

-                            if (m == 0 || (current[m-1] != '\\') || (m >= 2 && current[m-2] == '\\'))
+                            if (m == 0 || (current[(size_t) (m-1)] != '\\') || (m >= 2 && current[(size_t) (m-2)] == '\\'))

                                 break;
                         }
                         n = m+1;
                     }
                     continue;
                 }
                                 break;
                         }
                         n = m+1;
                     }
                     continue;
                 }

-                
+

                 // ignore strings
                 // ignore strings

-                if (current[n] == '\"')
+                if (current[(size_t) (n)] == '\"')

                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {
                 {
                     for (int m = n+1; m < (int)current.Len(); m++)
                     {

-                        if (current[m] == '\"')
+                        if (current[(size_t) (m)] == '\"')

                         {
                         {

-                            if (m == 0 || (current[m-1] != '\\') || (m >= 2 && current[m-2] == '\\'))
+                            if (m == 0 || (current[(size_t) (m-1)] != '\\') || (m >= 2 && current[(size_t) (m-2)] == '\\'))

                                 break;
                         }
                         n = m+1;
                     }
                     continue;
                 }
                                 break;
                         }
                         n = m+1;
                     }
                     continue;
                 }

-                
-                if (current[n] == antibracket)
+
+                if (current[(size_t) (n)] == antibracket)

                 {
                     count--;
                     if (count == 0)
                 {
                     count--;
                     if (count == 0)


@@ -866,14 +1040,14 @@ void wxTextCtrl::SearchForBrackets()
                         return;
                     }
                 }
                         return;
                     }
                 }

-                else if (current[n] == bracket)
+                else if (current[(size_t) (n)] == bracket)

                 {
                     count++;
                 }
             }
         }
     }
                 {
                     count++;
                 }
             }
         }
     }

-    
+

     if (oldBracketY != -1)
     {
         m_bracketY = -1;
     if (oldBracketY != -1)
     {
         m_bracketY = -1;


@@ -884,14 +1058,14 @@ void wxTextCtrl::SearchForBrackets()
 void wxTextCtrl::Delete()
 {
     if (!HasSelection()) return;
 void wxTextCtrl::Delete()
 {
     if (!HasSelection()) return;

-    
-    m_modified = TRUE;
-    
+
+    m_modified = true;
+

     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;
     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;

-    
+

     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {
     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {


@@ -902,13 +1076,13 @@ void wxTextCtrl::Delete()
         selStartY = selEndY;
         selEndY = tmp;
     }
         selStartY = selEndY;
         selEndY = tmp;
     }

-    
+

     int len = (int)m_lines[selStartY].m_text.Len();
     int len = (int)m_lines[selStartY].m_text.Len();

-        
+

     if (selStartY == selEndY)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, selStartY, selStartY, this ) );
     if (selStartY == selEndY)
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, selStartY, selStartY, this ) );

-    
+

         wxString tmp( m_lines[selStartY].m_text );
         if (selStartX < len)
         {
         wxString tmp( m_lines[selStartY].m_text );
         if (selStartX < len)
         {


@@ -924,25 +1098,25 @@ void wxTextCtrl::Delete()
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, selStartY, selEndY, this ) );
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, selStartY, selEndY, this ) );

-    
+

         if (selStartX < len)
             m_lines[selStartY].m_text.Remove( selStartX );
         if (selStartX < len)
             m_lines[selStartY].m_text.Remove( selStartX );

-        
+

         for (int i = 0; i < selEndY-selStartY-1; i++)
             m_lines.RemoveAt( selStartY+1 );
         for (int i = 0; i < selEndY-selStartY-1; i++)
             m_lines.RemoveAt( selStartY+1 );

-            
+

         if (selEndX < (int)m_lines[selStartY+1].m_text.Len())
             m_lines[selStartY+1].m_text.Remove( 0, selEndX );
         else
             m_lines[selStartY+1].m_text.Remove( 0 );
         if (selEndX < (int)m_lines[selStartY+1].m_text.Len())
             m_lines[selStartY+1].m_text.Remove( 0, selEndX );
         else
             m_lines[selStartY+1].m_text.Remove( 0 );

-            
+

         m_lines[selStartY].m_text.Append( m_lines[selStartY+1].m_text );
         m_lines.RemoveAt( selStartY+1 );
         m_lines[selStartY].m_text.Append( m_lines[selStartY+1].m_text );
         m_lines.RemoveAt( selStartY+1 );

-    
+

         ClearSelection();
         MoveCursor( selStartX, selStartY );
         MyAdjustScrollbars();
         ClearSelection();
         MoveCursor( selStartX, selStartY );
         MyAdjustScrollbars();

-        
+

         RefreshDown( selStartY );
     }
 }
         RefreshDown( selStartY );
     }
 }


@@ -950,25 +1124,25 @@ void wxTextCtrl::Delete()
 void wxTextCtrl::DeleteLine()
 {
     if (HasSelection()) return;
 void wxTextCtrl::DeleteLine()
 {
     if (HasSelection()) return;

-    
+

     if (m_cursorY < 0 || m_cursorY >= (int)m_lines.GetCount()-1) return;  // TODO
     if (m_cursorY < 0 || m_cursorY >= (int)m_lines.GetCount()-1) return;  // TODO

-        
+

     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, m_cursorY, m_cursorY+1, this ) );
     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, m_cursorY, m_cursorY+1, this ) );

-    
+

     m_lines.RemoveAt( m_cursorY );
     m_cursorX = 0;
     if (m_cursorY >= (int)m_lines.GetCount()) m_cursorY--;
     m_lines.RemoveAt( m_cursorY );
     m_cursorX = 0;
     if (m_cursorY >= (int)m_lines.GetCount()) m_cursorY--;

-    
+

     MyAdjustScrollbars();
     RefreshDown( m_cursorY );
 }
 
 void wxTextCtrl::DoChar( char c )
 {
     MyAdjustScrollbars();
     RefreshDown( m_cursorY );
 }
 
 void wxTextCtrl::DoChar( char c )
 {

-    m_modified = TRUE;
-    
+    m_modified = true;
+

     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );
     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );

-    
+

     wxString tmp( m_lines[m_cursorY].m_text );
     tmp.Trim();
     if (m_cursorX >= (int)tmp.Len())
     wxString tmp( m_lines[m_cursorY].m_text );
     tmp.Trim();
     if (m_cursorX >= (int)tmp.Len())


@@ -985,48 +1159,64 @@ void wxTextCtrl::DoChar( char c )
         else
             tmp.insert( m_cursorX, 1, c );
     }
         else
             tmp.insert( m_cursorX, 1, c );
     }

-    
+

     m_lines[m_cursorY].m_text = tmp;
     m_lines[m_cursorY].m_text = tmp;

-    
-    if (tmp.Len() > m_longestLine)
+
+//    if (tmp.Len() > m_longestLine)
+//    {
+//        m_longestLine = tmp.Len();
+//        MyAdjustScrollbars();
+//    }
+
+    int ww = 0;
+    GetTextExtent( tmp, &ww, NULL, NULL, NULL );
+    ww /= m_charWidth;
+    if (ww > m_longestLine)

     {
     {

-        m_longestLine = tmp.Len();
+        m_longestLine = ww;

         MyAdjustScrollbars();
     }
         MyAdjustScrollbars();
     }

-    
+

     m_cursorX++;
     m_cursorX++;

-    
+

     int y = m_cursorY*m_lineHeight;
     int y = m_cursorY*m_lineHeight;

-    int x = (m_cursorX-1)*m_charWidth;
+    // int x = (m_cursorX-1)*m_charWidth;
+    int x = PosToPixel( m_cursorY, m_cursorX-1 );

     CalcScrolledPosition( x, y, &x, &y );
     wxRect rect( x+2, y+2, 10000, m_lineHeight );
     CalcScrolledPosition( x, y, &x, &y );
     wxRect rect( x+2, y+2, 10000, m_lineHeight );

-    Refresh( TRUE, &rect );
-    
+    Refresh( true, &rect );
+    // refresh whole line for syntax colour highlighting
+    rect.x = 0;
+    Refresh( false, &rect );
+

     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;
     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;

-    
+

     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );
     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );

-    
-    if (m_cursorX < view_x)
-        Scroll( m_cursorX, -1 );
-    else if (m_cursorX > view_x+size_x-1)
-        Scroll( m_cursorX-size_x+1, -1 );
+
+    //int xx = m_cursorX;
+    int xx = PosToPixel( m_cursorY, m_cursorX ) / m_charWidth;
+
+    if (xx < view_x)
+        Scroll( xx, -1 );
+    else if (xx > view_x+size_x-1)
+        Scroll( xx-size_x+1, -1 );

 }
 
 void wxTextCtrl::DoBack()
 {
 }
 
 void wxTextCtrl::DoBack()
 {

-    m_modified = TRUE;
-    
+    m_modified = true;
+

     if (m_cursorX == 0)
     {
         if (m_cursorY == 0) return;
     if (m_cursorX == 0)
     {
         if (m_cursorY == 0) return;

-        
+

         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_BACK, m_cursorY-1, m_cursorY, this ) );
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_BACK, m_cursorY-1, m_cursorY, this ) );

-        
+

         wxString tmp1( m_lines[m_cursorY-1].m_text );
         tmp1.Trim();
         wxString tmp2( m_lines[m_cursorY].m_text );
         wxString tmp1( m_lines[m_cursorY-1].m_text );
         tmp1.Trim();
         wxString tmp2( m_lines[m_cursorY].m_text );


@@ -1036,30 +1226,34 @@ void wxTextCtrl::DoBack()
         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         m_lines.RemoveAt( m_cursorY+1 );
         tmp1.Append( tmp2 );
         m_lines[m_cursorY].m_text = tmp1;
         m_lines.RemoveAt( m_cursorY+1 );

-        
+

         MyAdjustScrollbars();
         RefreshDown( m_cursorY-1 );
     }
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );
         MyAdjustScrollbars();
         RefreshDown( m_cursorY-1 );
     }
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );

-        
+

         if (m_cursorX <= (int)m_lines[m_cursorY].m_text.Len())
             m_lines[m_cursorY].m_text.Remove( m_cursorX-1, 1 );
         m_cursorX--;
         if (m_cursorX <= (int)m_lines[m_cursorY].m_text.Len())
             m_lines[m_cursorY].m_text.Remove( m_cursorX-1, 1 );
         m_cursorX--;

-        
+

         int y = m_cursorY*m_lineHeight;
         int y = m_cursorY*m_lineHeight;

-        int x = m_cursorX*m_charWidth;
+        // int x = m_cursorX*m_charWidth;
+        int x = PosToPixel( m_cursorY, m_cursorX );

         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 10000, m_lineHeight );
         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 10000, m_lineHeight );

-        Refresh( TRUE, &rect );
+        Refresh( true, &rect );
+        // refresh whole line for syntax colour highlighting
+        rect.x = 0;
+        Refresh( false, &rect );

     }
 }
 
 void wxTextCtrl::DoDelete()
 {
     }
 }
 
 void wxTextCtrl::DoDelete()
 {

-    m_modified = TRUE;
-    
+    m_modified = true;
+

     wxString tmp( m_lines[m_cursorY].m_text );
     tmp.Trim();
     int len = (int)tmp.Len();
     wxString tmp( m_lines[m_cursorY].m_text );
     tmp.Trim();
     int len = (int)tmp.Len();


@@ -1068,39 +1262,43 @@ void wxTextCtrl::DoDelete()
         if (m_cursorY == (int)m_lines.GetCount()-1) return;
 
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, m_cursorY, m_cursorY+1, this ) );
         if (m_cursorY == (int)m_lines.GetCount()-1) return;
 
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_DELETE, m_cursorY, m_cursorY+1, this ) );

-        
+

         for (int i = 0; i < (m_cursorX-len); i++)
             tmp += ' ';
         for (int i = 0; i < (m_cursorX-len); i++)
             tmp += ' ';

-            
+

         tmp += m_lines[m_cursorY+1].m_text;
         tmp += m_lines[m_cursorY+1].m_text;

-        
+

         m_lines[m_cursorY] = tmp;
         m_lines.RemoveAt( m_cursorY+1 );
         m_lines[m_cursorY] = tmp;
         m_lines.RemoveAt( m_cursorY+1 );

-        
+

         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );
         MyAdjustScrollbars();
         RefreshDown( m_cursorY );
     }
     else
     {
         m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, m_cursorY, m_cursorY, this ) );

-    
+

         tmp.Remove( m_cursorX, 1 );
         m_lines[m_cursorY].m_text = tmp;
         tmp.Remove( m_cursorX, 1 );
         m_lines[m_cursorY].m_text = tmp;

-        
+

         int y = m_cursorY*m_lineHeight;
         int y = m_cursorY*m_lineHeight;

-        int x = m_cursorX*m_charWidth;
+        // int x = m_cursorX*m_charWidth;
+        int x = PosToPixel( m_cursorY, m_cursorX );

         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 10000, m_lineHeight );
         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 10000, m_lineHeight );

-        Refresh( TRUE, &rect );
+        Refresh( true, &rect );
+        // refresh whole line for syntax colour highlighting
+        rect.x = 0;
+        Refresh( false, &rect );

     }
 }
 
 void wxTextCtrl::DoReturn()
 {
     }
 }
 
 void wxTextCtrl::DoReturn()
 {

-    m_modified = TRUE;
-    
+    m_modified = true;
+

     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_ENTER, m_cursorY, m_cursorY, this ) );
     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_ENTER, m_cursorY, m_cursorY, this ) );

-    
+

     wxString tmp( m_lines[m_cursorY].m_text );
     size_t indent = tmp.find_first_not_of( ' ' );
     if (indent == wxSTRING_MAXLEN) indent = 0;
     wxString tmp( m_lines[m_cursorY].m_text );
     size_t indent = tmp.find_first_not_of( ' ' );
     if (indent == wxSTRING_MAXLEN) indent = 0;


@@ -1109,11 +1307,11 @@ void wxTextCtrl::DoReturn()
     {
         int cursorX = indent;
         int cursorY = m_cursorY + 1;
     {
         int cursorX = indent;
         int cursorY = m_cursorY + 1;

-        
+

         wxString new_tmp;
         for (size_t i = 0; i < indent; i++) new_tmp.Append( ' ' );
         m_lines.Insert( new wxSourceLine( new_tmp ), cursorY );
         wxString new_tmp;
         for (size_t i = 0; i < indent; i++) new_tmp.Append( ' ' );
         m_lines.Insert( new wxSourceLine( new_tmp ), cursorY );

-        
+

         MyAdjustScrollbars();
         MoveCursor( cursorX, cursorY );
         RefreshDown( m_cursorY );
         MyAdjustScrollbars();
         MoveCursor( cursorX, cursorY );
         RefreshDown( m_cursorY );


@@ -1123,18 +1321,18 @@ void wxTextCtrl::DoReturn()
         wxString tmp1( tmp );
         tmp1.Remove( m_cursorX, tmp.Len()-m_cursorX );
         m_lines[m_cursorY].m_text = tmp1;
         wxString tmp1( tmp );
         tmp1.Remove( m_cursorX, tmp.Len()-m_cursorX );
         m_lines[m_cursorY].m_text = tmp1;

-       
+

         wxString tmp2( tmp );
         tmp2.Remove( 0, m_cursorX );
         wxString tmp2( tmp );
         tmp2.Remove( 0, m_cursorX );

-       
+

         int cursorX = indent;
         int cursorY = m_cursorY + 1;
         int cursorX = indent;
         int cursorY = m_cursorY + 1;

-        
+

         wxString new_tmp;
         for (size_t i = 0; i < indent; i++) new_tmp.Append( ' ' );
         new_tmp.Append( tmp2 );
         m_lines.Insert( new wxSourceLine( new_tmp ), cursorY );
         wxString new_tmp;
         for (size_t i = 0; i < indent; i++) new_tmp.Append( ' ' );
         new_tmp.Append( tmp2 );
         m_lines.Insert( new wxSourceLine( new_tmp ), cursorY );

-        
+

         MyAdjustScrollbars();
         MoveCursor( cursorX, cursorY );
         RefreshDown( m_cursorY-1 );
         MyAdjustScrollbars();
         MoveCursor( cursorX, cursorY );
         RefreshDown( m_cursorY-1 );


@@ -1146,7 +1344,7 @@ void wxTextCtrl::DoDClick()
     wxString line( m_lines[ m_cursorY ].m_text );
     if (m_cursorX >= (int)line.Len()) return;
     int p = m_cursorX;
     wxString line( m_lines[ m_cursorY ].m_text );
     if (m_cursorX >= (int)line.Len()) return;
     int p = m_cursorX;

-    char ch = line[p];
+    char ch = line[(size_t) (p)];

     if (((ch >= 'a') && (ch <= 'z')) ||
         ((ch >= 'A') && (ch <= 'Z')) ||
         ((ch >= '0') && (ch <= '9')) ||
     if (((ch >= 'a') && (ch <= 'z')) ||
         ((ch >= 'A') && (ch <= 'Z')) ||
         ((ch >= '0') && (ch <= '9')) ||


@@ -1156,7 +1354,7 @@ void wxTextCtrl::DoDClick()
         m_selEndY = m_cursorY;
         if (p > 0)
         {
         m_selEndY = m_cursorY;
         if (p > 0)
         {

-            ch = line[p-1];
+            ch = line[(size_t) (p-1)];

             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||
             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||


@@ -1164,15 +1362,15 @@ void wxTextCtrl::DoDClick()
             {
                 p--;
                 if (p == 0) break;
             {
                 p--;
                 if (p == 0) break;

-                ch = line[p-1];
+                ch = line[(size_t) (p-1)];

             }
         }
         m_selStartX = p;
             }
         }
         m_selStartX = p;

-        
+

         p = m_cursorX;
         if (p < (int)line.Len())
         {
         p = m_cursorX;
         if (p < (int)line.Len())
         {

-            ch = line[p];
+            ch = line[(size_t) (p)];

             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||
             while (((ch >= 'a') && (ch <= 'z')) ||
                    ((ch >= 'A') && (ch <= 'Z')) ||
                    ((ch >= '0') && (ch <= '9')) ||


@@ -1180,7 +1378,7 @@ void wxTextCtrl::DoDClick()
             {
                 if (p >= (int)line.Len()) break;
                 p++;
             {
                 if (p >= (int)line.Len()) break;
                 p++;

-                ch = line[p];
+                ch = line[(size_t) (p)];

             }
         }
         m_selEndX = p;
             }
         }
         m_selEndX = p;


@@ -1188,17 +1386,17 @@ void wxTextCtrl::DoDClick()
     }
 }
 
     }
 }
 

-wxString wxTextCtrl::GetNextToken( wxString &line, int &pos )
+wxString wxTextCtrl::GetNextToken( wxString &line, size_t &pos )

 {
     wxString ret;
 {
     wxString ret;

-    int len = (int)line.Len();
-    for (int p = pos; p < len; p++)
+    size_t len = line.Len();
+    for (size_t p = pos; p < len; p++)

     {
         if ((m_lang == wxSOURCE_LANG_PYTHON) || (m_lang == wxSOURCE_LANG_PERL))
         {
             if (line[p] == '#')
             {
     {
         if ((m_lang == wxSOURCE_LANG_PYTHON) || (m_lang == wxSOURCE_LANG_PERL))
         {
             if (line[p] == '#')
             {

-                for (int q = p; q < len; q++)
+                for (size_t q = p; q < len; q++)

                     ret.Append( line[q] );
                 pos = p;
                 return ret;
                     ret.Append( line[q] );
                 pos = p;
                 return ret;


@@ -1206,48 +1404,48 @@ wxString wxTextCtrl::GetNextToken( wxString &line, int &pos )
         }
         else
         {
         }
         else
         {

-            if ((line[p] == '/') && (p+1 < len) && (line[p+1] == '/'))
+            if ((line[p] == '/') && (p+1 < len) && (line[(size_t) (p+1)] == '/'))

             {
             {

-                for (int q = p; q < len; q++)
+                for (size_t q = p; q < len; q++)

                     ret.Append( line[q] );
                 pos = p;
                 return ret;
             }
         }
                     ret.Append( line[q] );
                 pos = p;
                 return ret;
             }
         }

-        
+

         if (line[p] == '"')
         {
             ret.Append( line[p] );
         if (line[p] == '"')
         {
             ret.Append( line[p] );

-            for (int q = p+1; q < len; q++)
+            for (size_t q = p+1; q < len; q++)

             {
                 ret.Append( line[q] );
             {
                 ret.Append( line[q] );

-                if ((line[q] == '"') && ((line[q-1] != '\\') || (q >= 2 && line[q-2] == '\\')))
+                if ((line[q] == '"') && ((line[(size_t) (q-1)] != '\\') || (q >= 2 && line[(size_t) (q-2)] == '\\')))

                    break;
             }
             pos = p;
             return ret;
         }
                    break;
             }
             pos = p;
             return ret;
         }

-    
+

         if (line[p] == '\'')
         {
             ret.Append( line[p] );
         if (line[p] == '\'')
         {
             ret.Append( line[p] );

-            for (int q = p+1; q < len; q++)
+            for (size_t q = p+1; q < len; q++)

             {
                 ret.Append( line[q] );
             {
                 ret.Append( line[q] );

-                if ((line[q] == '\'') && ((line[q-1] != '\\') || (q >= 2 && line[q-2] == '\\')))
+                if ((line[q] == '\'') && ((line[(size_t) (q-1)] != '\\') || (q >= 2 && line[(size_t) (q-2)] == '\\')))

                    break;
             }
             pos = p;
             return ret;
         }
                    break;
             }
             pos = p;
             return ret;
         }

-    
+

         if (((line[p] >= 'a') && (line[p] <= 'z')) ||
             ((line[p] >= 'A') && (line[p] <= 'Z')) ||
             (line[p] == '_') ||
             (line[p] == '#'))
         {
            ret.Append( line[p] );
         if (((line[p] >= 'a') && (line[p] <= 'z')) ||
             ((line[p] >= 'A') && (line[p] <= 'Z')) ||
             (line[p] == '_') ||
             (line[p] == '#'))
         {
            ret.Append( line[p] );

-           for (int q = p+1; q < len; q++)
+           for (size_t q = p+1; q < len; q++)

            {
                 if (((line[q] >= 'a') && (line[q] <= 'z')) ||
                    ((line[q] >= 'A') && (line[q] <= 'Z')) ||
            {
                 if (((line[q] >= 'a') && (line[q] <= 'z')) ||
                    ((line[q] >= 'A') && (line[q] <= 'Z')) ||


@@ -1267,17 +1465,55 @@ wxString wxTextCtrl::GetNextToken( wxString &line, int &pos )
            return ret;
         }
     }
            return ret;
         }
     }

-    
+

     return ret;
 }
 
     return ret;
 }
 

+void wxTextCtrl::OnEraseBackground( wxEraseEvent &event )
+{
+    event.Skip();
+}
+
+void wxTextCtrl::DrawLinePart( wxDC &dc, int x, int y, const wxString &toDraw, const wxString &origin, const wxColour &colour )
+{
+    size_t pos = 0;
+    size_t len = origin.Len();
+    dc.SetTextForeground( colour );
+    while (pos < len)
+    {
+        while (toDraw[pos] == wxT(' '))
+        {
+            pos++;
+            if (pos == len) return;
+        }
+
+        size_t start = pos;
+
+        wxString current;
+        current += toDraw[pos];
+        pos++;
+        while ( (toDraw[pos] == origin[pos]) && (pos < len))
+        {
+            current += toDraw[pos];
+            pos++;
+        }
+
+        int xx = 0;
+        wxString tmp = origin.Left( start );
+        GetTextExtent( tmp, &xx, NULL, NULL, NULL );
+        xx += x;
+        int yy = y;
+        dc.DrawText( current, xx, yy );
+    }
+}
+

 void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int lineNum )
 {
     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;
 void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int lineNum )
 {
     int selStartY = m_selStartY;
     int selEndY = m_selEndY;
     int selStartX = m_selStartX;
     int selEndX = m_selEndX;

-    
+

     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {
     if ((selStartY > selEndY) ||
         ((selStartY == selEndY) && (selStartX > selEndX)))
     {


@@ -1301,198 +1537,183 @@ void wxTextCtrl::DrawLine( wxDC &dc, int x, int y, const wxString &line2, int li
     wxString variable( ' ', line.Len() );
     wxString comment( ' ', line.Len() );
     wxString my_string( ' ', line.Len() );
     wxString variable( ' ', line.Len() );
     wxString comment( ' ', line.Len() );
     wxString my_string( ' ', line.Len() );

-    
-    if (lineNum == m_bracketY)
-    {
-        wxString red( ' ', line.Len() );
-        if (m_bracketX < (int)line.Len())
-        {
-            red.SetChar( m_bracketX, line[m_bracketX] );
-            line.SetChar( m_bracketX, ' ' );
-            dc.SetTextForeground( *wxRED );
-            dc.DrawText( red, x, y );
-            dc.SetTextForeground( *wxBLACK );
-        }
-    }
+    wxString selection( ' ', line.Len() );

 
 

-    int pos = 0;
-    wxString token( GetNextToken( line, pos) );
-    while (!token.IsNull())
+    if (m_lang != wxSOURCE_LANG_NONE)

     {
     {

-        if (m_keywords.Index( token ) != wxNOT_FOUND)
+        if (lineNum == m_bracketY)

         {
         {

-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+            wxString red( ' ', line.Len() );
+            if (m_bracketX < (int)line.Len())

             {
             {

-                keyword.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
+                red.SetChar( m_bracketX, line[(size_t) (m_bracketX)] );
+                line.SetChar( m_bracketX, ' ' );
+                dc.SetTextForeground( *wxRED );
+                dc.DrawText( red, x, y );
+                dc.SetTextForeground( *wxBLACK );

             }
             }

-        } else
-        if (m_defines.Index( token ) != wxNOT_FOUND)
+        }
+
+        size_t pos = 0;
+        wxString token( GetNextToken( line, pos ) );
+        while ( !token.empty() )

         {
         {

-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+            if (m_keywords.Index( token ) != wxNOT_FOUND)

             {
             {

-                define.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
-            }
-        } else
-        if ((m_variables.Index( token ) != wxNOT_FOUND) ||
-            ((token.Len() > 2) && (token[0] == 'w') && (token[1] == 'x')))
-        {
-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    keyword[i] = line[i];
+                    line[i] = ' ';
+                }
+            } else
+            if (m_defines.Index( token ) != wxNOT_FOUND)

             {
             {

-                variable.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
-            }
-        } else
-        if ((token.Len() >= 2) && (token[0] == '/') && (token[1] == '/') && (m_lang == wxSOURCE_LANG_CPP))
-        {
-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    define[i] = line[i];
+                    line[i] = ' ';
+                }
+            } else
+            if ((m_variables.Index( token ) != wxNOT_FOUND) ||
+                ((token.Len() > 2) && (token[(size_t) (0)] == 'w') && (token[(size_t) (1)] == 'x')))

             {
             {

-                comment.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
-            }
-        } else
-        if ((token[0] == '#') &&
-            ((m_lang == wxSOURCE_LANG_PYTHON) || (m_lang == wxSOURCE_LANG_PERL)))
-        {
-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    variable[i] = line[i];
+                    line[i] = ' ';
+                }
+            } else
+            if ((token.Len() >= 2) && (token[(size_t) (0)] == '/') && (token[(size_t) (1)] == '/') && (m_lang == wxSOURCE_LANG_CPP))

             {
             {

-                comment.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
-            }
-            
-        } else
-        if ((token[0] == '"') || (token[0] == '\''))
-        {
-            int end_pos = pos + (int)token.Len();
-            for (int i = pos; i < end_pos; i++)
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    comment[i] = line[i];
+                    line[i] = ' ';
+                }
+            } else
+            if ((token[(size_t) (0)] == '#') &&
+                ((m_lang == wxSOURCE_LANG_PYTHON) || (m_lang == wxSOURCE_LANG_PERL)))
+            {
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    comment[i] = line[i];
+                    line[i] = ' ';
+                }
+            } else
+            if ((token[(size_t) (0)] == '"') || (token[(size_t) (0)] == '\''))

             {
             {

-                my_string.SetChar( i, line[i] );
-                line.SetChar( i, ' ' );
+                size_t end_pos = pos + token.Len();
+                for (size_t i = pos; i < end_pos; i++)
+                {
+                    my_string[i] = line[i];
+                    line[i] = ' ';
+                }

             }
             }

+            pos += token.Len();
+            token = GetNextToken( line, pos );

         }
         }

-        pos += token.Len();
-        token = GetNextToken( line, pos);

     }
 
     if ((lineNum < selStartY) || (lineNum > selEndY))
     {
     }
 
     if ((lineNum < selStartY) || (lineNum > selEndY))
     {

-        dc.DrawText( line, x, y );
-        dc.SetTextForeground( m_keywordColour );
-        dc.DrawText( keyword, x, y );
-        dc.SetTextForeground( m_defineColour );
-        dc.DrawText( define, x, y );
-        dc.SetTextForeground( m_variableColour );
-        dc.DrawText( variable, x, y );
-        dc.SetTextForeground( m_commentColour );
-        dc.DrawText( comment, x, y );
-        dc.SetTextForeground( m_stringColour );
-        dc.DrawText( my_string, x, y );
-        dc.SetTextForeground( *wxBLACK );
+        DrawLinePart( dc, x, y, line, line2, *wxBLACK );
+        DrawLinePart( dc, x, y, selection, line2, *wxWHITE );
+        DrawLinePart( dc, x, y, keyword, line2, m_keywordColour );
+        DrawLinePart( dc, x, y, define, line2, m_defineColour );
+        DrawLinePart( dc, x, y, variable, line2, m_variableColour );
+        DrawLinePart( dc, x, y, comment, line2, m_commentColour );
+        DrawLinePart( dc, x, y, my_string, line2, m_stringColour );

         return;
     }
         return;
     }

-    
+

     if (selStartY == selEndY)
     {
     if (selStartY == selEndY)
     {

-        int i;
-        wxString tmp1( line );
-        wxString tmp2( line );
-        dc.DrawRectangle( selStartX*m_charWidth+2, lineNum*m_lineHeight+2, 
-                          (selEndX-selStartX)*m_charWidth, m_lineHeight );
-        for (i = selStartX; i < selEndX; i++)
-            if ((int)tmp1.Len() > i)
-                tmp1.SetChar( i, ' ' );
-        dc.DrawText( tmp1, x, y );
-        for (i = 0; i < selStartX; i++)
-            if ((int)tmp2.Len() > i)
-                tmp2.SetChar( i, ' ' );
-        for (i = selEndX; i < (int)tmp2.Len(); i++)
-            if ((int)tmp2.Len() > i)
-                tmp2.SetChar( i, ' ' );
-        dc.SetTextForeground( *wxWHITE );
-        dc.DrawText( tmp2, x, y );
-        dc.SetTextForeground( *wxBLACK );
+        // int xx = selStartX*m_charWidth;
+        int xx = PosToPixel( lineNum, selStartX );
+        // int ww = (selEndX-selStartX)*m_charWidth;
+        int ww = PosToPixel( lineNum, selEndX ) - xx;
+        dc.DrawRectangle( xx+2, lineNum*m_lineHeight+2, ww, m_lineHeight );
+
+        for (size_t i = (size_t)selStartX; i < (size_t)selEndX; i++)
+        {
+            selection[i] = line[i];
+            line[i] = ' ';
+        }

     } else
     if ((lineNum > selStartY) && (lineNum < selEndY))
     {
         dc.DrawRectangle( 0+2, lineNum*m_lineHeight+2, 10000, m_lineHeight );
     } else
     if ((lineNum > selStartY) && (lineNum < selEndY))
     {
         dc.DrawRectangle( 0+2, lineNum*m_lineHeight+2, 10000, m_lineHeight );

-        dc.SetTextForeground( *wxWHITE );
-        dc.DrawText( line, x, y );
-        dc.SetTextForeground( *wxBLACK );
+
+        for (size_t i = 0; i < line.Len(); i++)
+        {
+            selection[i] = line[i];
+            line[i] = ' ';
+        }

     } else
     if (lineNum == selStartY)
     {
     } else
     if (lineNum == selStartY)
     {

-        int i;
-        wxString tmp1( line );
-        wxString tmp2( line );
-        dc.DrawRectangle( selStartX*m_charWidth+2, lineNum*m_lineHeight+2, 
-                          10000, m_lineHeight );
-        for (i = selStartX; i < (int)tmp1.Len(); i++)
-            tmp1.SetChar( i, ' ' );
-        dc.DrawText( tmp1, x, y );
-        for (i = 0; i < selStartX; i++)
-            if ((int)tmp2.Len() > i)
-                tmp2.SetChar( i, ' ' );
-        dc.SetTextForeground( *wxWHITE );
-        dc.DrawText( tmp2, x, y );
-        dc.SetTextForeground( *wxBLACK );
+        // int xx = selStartX*m_charWidth;
+        int xx = PosToPixel( lineNum, selStartX );
+        dc.DrawRectangle( xx+2, lineNum*m_lineHeight+2, 10000, m_lineHeight );
+
+        for (size_t i = (size_t)selStartX; i < line.Len(); i++)
+        {
+            selection[i] = line[i];
+            line[i] = ' ';
+        }

     } else
     if (lineNum == selEndY)
     {
     } else
     if (lineNum == selEndY)
     {

-        int i;
-        wxString tmp1( line );
-        wxString tmp2( line );
-        dc.DrawRectangle( 0+2, lineNum*m_lineHeight+2, 
-                          selEndX*m_charWidth, m_lineHeight );
-        for (i = 0; i < selEndX; i++)
-            if ((int)tmp1.Len() > i)
-               tmp1.SetChar( i, ' ' );
-        dc.DrawText( tmp1, x, y );
-        for (i = selEndX; i < (int)tmp2.Len(); i++)
-            tmp2.SetChar( i, ' ' );
-        dc.SetTextForeground( *wxWHITE );
-        dc.DrawText( tmp2, x, y );
-        dc.SetTextForeground( *wxBLACK );
-    }
-    
-    dc.SetTextForeground( m_keywordColour );
-    dc.DrawText( keyword, x, y );
-    dc.SetTextForeground( m_defineColour );
-    dc.DrawText( define, x, y );
-    dc.SetTextForeground( m_variableColour );
-    dc.DrawText( variable, x, y );
-    dc.SetTextForeground( m_commentColour );
-    dc.DrawText( comment, x, y );
-    dc.SetTextForeground( m_stringColour );
-    dc.DrawText( my_string, x, y );
-    dc.SetTextForeground( *wxBLACK );
+        // int ww = selEndX*m_charWidth;
+        int ww = PosToPixel( lineNum, selEndX );
+        dc.DrawRectangle( 0+2, lineNum*m_lineHeight+2, ww, m_lineHeight );
+
+        for (size_t i = 0; i < (size_t)selEndX; i++)
+        {
+            selection[i] = line[i];
+            line[i] = ' ';
+        }
+    }
+
+    DrawLinePart( dc, x, y, line, line2, *wxBLACK );
+    DrawLinePart( dc, x, y, selection, line2, *wxWHITE );
+    DrawLinePart( dc, x, y, keyword, line2, m_keywordColour );
+    DrawLinePart( dc, x, y, define, line2, m_defineColour );
+    DrawLinePart( dc, x, y, variable, line2, m_variableColour );
+    DrawLinePart( dc, x, y, comment, line2, m_commentColour );
+    DrawLinePart( dc, x, y, my_string, line2, m_stringColour );

 }
 
 void wxTextCtrl::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc(this);
 }
 
 void wxTextCtrl::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc(this);

-    
+

     if (m_lines.GetCount() == 0) return;
     if (m_lines.GetCount() == 0) return;

-    
+

     PrepareDC( dc );
     PrepareDC( dc );

-    
+

     dc.SetFont( m_sourceFont );
     dc.SetFont( m_sourceFont );

-    
+

     int scroll_y = 0;
     GetViewStart( NULL, &scroll_y );
     int scroll_y = 0;
     GetViewStart( NULL, &scroll_y );

-    
+
+    // We have a inner border of two pixels
+    // around the text, so scroll units do
+    // not correspond to lines.
+    if (scroll_y > 0) scroll_y--;
+

     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );

-    
+

     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush( wxTHEME_COLOUR(HIGHLIGHT), wxSOLID ) );
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush( wxTHEME_COLOUR(HIGHLIGHT), wxSOLID ) );

-    int upper = wxMin( (int)m_lines.GetCount(), scroll_y+(size_y/m_lineHeight)+1 );
+    int upper = wxMin( (int)m_lines.GetCount(), scroll_y+(size_y/m_lineHeight)+2 );

     for (int i = scroll_y; i < upper; i++)
     {
         int x = 0+2;
     for (int i = scroll_y; i < upper; i++)
     {
         int x = 0+2;


@@ -1503,52 +1724,59 @@ void wxTextCtrl::OnPaint( wxPaintEvent &event )
         if (IsExposed(x,y,w,h))
             DrawLine( dc, 0+2, i*m_lineHeight+2, m_lines[i].m_text, i );
     }
         if (IsExposed(x,y,w,h))
             DrawLine( dc, 0+2, i*m_lineHeight+2, m_lines[i].m_text, i );
     }

-    
-    dc.SetBrush( *wxRED_BRUSH );
-    dc.DrawRectangle( m_cursorX*m_charWidth+2, m_cursorY*m_lineHeight+2, 2, m_lineHeight );
+
+    if (m_editable && (FindFocus() == this))
+    {
+        ///dc.SetBrush( *wxRED_BRUSH );
+        dc.SetBrush( *wxBLACK_BRUSH );
+        // int xx = m_cursorX*m_charWidth;
+        int xx = PosToPixel( m_cursorY, m_cursorX );
+        dc.DrawRectangle( xx+2, m_cursorY*m_lineHeight+2, 2, m_lineHeight );
+    }

 }
 
 void wxTextCtrl::OnMouse( wxMouseEvent &event )
 {
     if (m_lines.GetCount() == 0) return;
 
 }
 
 void wxTextCtrl::OnMouse( wxMouseEvent &event )
 {
     if (m_lines.GetCount() == 0) return;
 

-    
+

 #if 0  // there is no middle button on iPAQs
     if (event.MiddleDown())
     {
 #if 0  // there is no middle button on iPAQs
     if (event.MiddleDown())
     {

-        Paste( TRUE );
+        Paste( true );

         return;
     }
 #endif
         return;
     }
 #endif

-    
+

     if (event.LeftDClick())
     {
         DoDClick();
         return;
     }
     if (event.LeftDClick())
     {
         DoDClick();
         return;
     }

-    
+

     if (event.LeftDown())
     if (event.LeftDown())

-    { 
-        m_capturing = TRUE;
+    {
+        m_capturing = true;

         CaptureMouse();
     }
         CaptureMouse();
     }

-    
+

     if (event.LeftUp())
     if (event.LeftUp())

-    {   
-        m_capturing = FALSE;
+    {
+        m_capturing = false;

         ReleaseMouse();
     }
 
         ReleaseMouse();
     }
 

-    if (event.LeftDown() || 
+    if (event.LeftDown() ||

         (event.LeftIsDown() && m_capturing))
     {
         int x = event.GetX();
         int y = event.GetY();
         CalcUnscrolledPosition( x, y, &x, &y );
         (event.LeftIsDown() && m_capturing))
     {
         int x = event.GetX();
         int y = event.GetY();
         CalcUnscrolledPosition( x, y, &x, &y );

-        x /= m_charWidth;

         y /= m_lineHeight;
         y /= m_lineHeight;

-        MoveCursor( 
-            wxMin( 1000, wxMax( 0, x ) ), 
+        // x /= m_charWidth;
+        x = PixelToPos( y, x );
+        MoveCursor(
+            wxMin( 1000, wxMax( 0, x ) ),

             wxMin( (int)m_lines.GetCount()-1, wxMax( 0, y ) ),
             event.ShiftDown() || !event.LeftDown() );
     }
             wxMin( (int)m_lines.GetCount()-1, wxMax( 0, y ) ),
             event.ShiftDown() || !event.LeftDown() );
     }


@@ -1558,29 +1786,31 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
 {
     if (m_lines.GetCount() == 0) return;
 
 {
     if (m_lines.GetCount() == 0) return;
 

+    if (!m_editable) return;
+

     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;
     size_y /= m_lineHeight;
     size_y--;
     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;
     size_y /= m_lineHeight;
     size_y--;

-    
+

     if (event.ShiftDown())
     {
         switch (event.GetKeyCode())
         {
     if (event.ShiftDown())
     {
         switch (event.GetKeyCode())
         {

-            case '4': event.m_keyCode = WXK_LEFT;   break;
-            case '8': event.m_keyCode = WXK_UP;     break;
-            case '6': event.m_keyCode = WXK_RIGHT;  break;
-            case '2': event.m_keyCode = WXK_DOWN;   break;
-            case '9': event.m_keyCode = WXK_PRIOR;  break;
-            case '3': event.m_keyCode = WXK_NEXT;   break;
-            case '7': event.m_keyCode = WXK_HOME;   break;
-            case '1': event.m_keyCode = WXK_END;    break;
-            case '0': event.m_keyCode = WXK_INSERT; break;
+            case '4': event.m_keyCode = WXK_LEFT;     break;
+            case '8': event.m_keyCode = WXK_UP;       break;
+            case '6': event.m_keyCode = WXK_RIGHT;    break;
+            case '2': event.m_keyCode = WXK_DOWN;     break;
+            case '9': event.m_keyCode = WXK_PAGEUP;   break;
+            case '3': event.m_keyCode = WXK_PAGEDOWN; break;
+            case '7': event.m_keyCode = WXK_HOME;     break;
+            case '1': event.m_keyCode = WXK_END;      break;
+            case '0': event.m_keyCode = WXK_INSERT;   break;

         }
     }
         }
     }

-    
+

     switch (event.GetKeyCode())
     {
         case WXK_UP:
     switch (event.GetKeyCode())
     {
         case WXK_UP:


@@ -1588,7 +1818,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
             if (m_ignoreInput) return;
             if (m_cursorY > 0)
                 MoveCursor( m_cursorX, m_cursorY-1, event.ShiftDown() );
             if (m_ignoreInput) return;
             if (m_cursorY > 0)
                 MoveCursor( m_cursorX, m_cursorY-1, event.ShiftDown() );

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
         case WXK_DOWN:
             return;
         }
         case WXK_DOWN:


@@ -1596,7 +1826,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
             if (m_ignoreInput) return;
             if (m_cursorY < (int)(m_lines.GetCount()-1))
                 MoveCursor( m_cursorX, m_cursorY+1, event.ShiftDown() );
             if (m_ignoreInput) return;
             if (m_cursorY < (int)(m_lines.GetCount()-1))
                 MoveCursor( m_cursorX, m_cursorY+1, event.ShiftDown() );

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
         case WXK_LEFT:
             return;
         }
         case WXK_LEFT:


@@ -1611,7 +1841,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
                 if (m_cursorY > 0)
                     MoveCursor( m_lines[m_cursorY-1].m_text.Len(), m_cursorY-1, event.ShiftDown() );
             }
                 if (m_cursorY > 0)
                     MoveCursor( m_lines[m_cursorY-1].m_text.Len(), m_cursorY-1, event.ShiftDown() );
             }

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
         case WXK_RIGHT:
             return;
         }
         case WXK_RIGHT:


@@ -1619,7 +1849,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
             if (m_ignoreInput) return;
             if (m_cursorX < 1000)
                 MoveCursor( m_cursorX+1, m_cursorY, event.ShiftDown() );
             if (m_ignoreInput) return;
             if (m_cursorX < 1000)
                 MoveCursor( m_cursorX+1, m_cursorY, event.ShiftDown() );

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
         case WXK_HOME:
             return;
         }
         case WXK_HOME:


@@ -1642,14 +1872,14 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
         {
             if (m_ignoreInput) return;
             MoveCursor( m_cursorX, wxMin( (int)(m_lines.GetCount()-1), m_cursorY+size_y ), event.ShiftDown() );
         {
             if (m_ignoreInput) return;
             MoveCursor( m_cursorX, wxMin( (int)(m_lines.GetCount()-1), m_cursorY+size_y ), event.ShiftDown() );

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
             return;
         }

-        case WXK_PRIOR:
+        case WXK_PAGEUP:

         {
             if (m_ignoreInput) return;
             MoveCursor( m_cursorX, wxMax( 0, m_cursorY-size_y ), event.ShiftDown() );
         {
             if (m_ignoreInput) return;
             MoveCursor( m_cursorX, wxMax( 0, m_cursorY-size_y ), event.ShiftDown() );

-            m_ignoreInput = TRUE;
+            m_ignoreInput = true;

             return;
         }
         case WXK_INSERT:
             return;
         }
         case WXK_INSERT:


@@ -1664,12 +1894,20 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
         }
         case WXK_RETURN:
         {
         }
         case WXK_RETURN:
         {

+            if (m_windowStyle & wxTE_PROCESS_ENTER)
+            {
+                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                event.SetEventObject(this);
+                event.SetString(GetValue());
+                if (HandleWindowEvent(event)) return;
+            }
+

             if (IsSingleLine())
             {
                 event.Skip();
                 return;
             }
             if (IsSingleLine())
             {
                 event.Skip();
                 return;
             }

-            
+

             if (HasSelection())
                 Delete();
             DoReturn();
             if (HasSelection())
                 Delete();
             DoReturn();


@@ -1680,7 +1918,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
             if (HasSelection())
                 Delete();
             bool save_overwrite = m_overwrite;
             if (HasSelection())
                 Delete();
             bool save_overwrite = m_overwrite;

-            m_overwrite = FALSE;
+            m_overwrite = false;

             int i = 4-(m_cursorX % 4);
             if (i == 0) i = 4;
             for (int c = 0; c < i; c++)
             int i = 4-(m_cursorX % 4);
             if (i == 0) i = 4;
             for (int c = 0; c < i; c++)


@@ -1704,39 +1942,40 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
                 DoDelete();
             return;
         }
                 DoDelete();
             return;
         }

-        default: 
+        default:

         {
         {

-            if (  (event.KeyCode() >= 'a') &&
-                  (event.KeyCode() <= 'z') &&
+            if (  (event.GetKeyCode() >= 'a') &&
+                  (event.GetKeyCode() <= 'z') &&

                   (event.AltDown()) )
             {
                 // Alt-F etc.
                 event.Skip();
                 return;
             }
                   (event.AltDown()) )
             {
                 // Alt-F etc.
                 event.Skip();
                 return;
             }

-            
-            if (  (event.KeyCode() >= 32) && 
-                  (event.KeyCode() <= 255) &&
+
+            if (  (event.GetKeyCode() >= 32) &&
+                  (event.GetKeyCode() <= 255) &&

                  !(event.ControlDown() && !event.AltDown()) ) // filters out Ctrl-X but leaves Alt-Gr
             {
                 if (HasSelection())
                     Delete();
                  !(event.ControlDown() && !event.AltDown()) ) // filters out Ctrl-X but leaves Alt-Gr
             {
                 if (HasSelection())
                     Delete();

-                DoChar( (char) event.KeyCode() );
+                DoChar( (char) event.GetKeyCode() );

                 return;
             }
         }
     }
                 return;
             }
         }
     }

-    
+

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

-void wxTextCtrl::OnIdle( wxIdleEvent &event )
+void wxTextCtrl::OnInternalIdle()

 {
 {

-    m_ignoreInput = FALSE;
-    
-    SearchForBrackets();
-    
-    event.Skip( TRUE );
+    wxControl::OnInternalIdle();
+
+    m_ignoreInput = false;
+
+    if (m_lang != wxSOURCE_LANG_NONE)
+        SearchForBrackets();

 }
 
 void wxTextCtrl::Indent()
 }
 
 void wxTextCtrl::Indent()


@@ -1754,12 +1993,12 @@ void wxTextCtrl::Indent()
             endY = tmp;
         }
     }
             endY = tmp;
         }
     }

-    
+

     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, startY, endY, this ) );
     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, startY, endY, this ) );

-    
+

     for (int i = startY; i <= endY; i++)
     {
     for (int i = startY; i <= endY; i++)
     {

-        m_lines[i].m_text.insert( 0u, "    " );
+        m_lines[i].m_text.insert( 0u, wxT("    ") );

         RefreshLine( i );
     }
 }
         RefreshLine( i );
     }
 }


@@ -1779,14 +2018,14 @@ void wxTextCtrl::Unindent()
             endY = tmp;
         }
     }
             endY = tmp;
         }
     }

-    
+

     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, startY, endY, this ) );
     m_undos.Append( new wxSourceUndoStep( wxSOURCE_UNDO_LINE, startY, endY, this ) );

-    
+

     for (int i = startY; i <= endY; i++)
     {
         for (int n = 0; n < 4; n++)
         {
     for (int i = startY; i <= endY; i++)
     {
         for (int n = 0; n < 4; n++)
         {

-            if (m_lines[i].m_text[0u] == ' ')
+            if (m_lines[i].m_text[0u] == wxT(' '))

                 m_lines[i].m_text.erase(0u,1u);
         }
         RefreshLine( i );
                 m_lines[i].m_text.erase(0u,1u);
         }
         RefreshLine( i );


@@ -1811,7 +2050,7 @@ void wxTextCtrl::RefreshLine( int n )
     int x = 0;
     CalcScrolledPosition( x, y, &x, &y );
     wxRect rect( 0+2, y+2, 10000, m_lineHeight );
     int x = 0;
     CalcScrolledPosition( x, y, &x, &y );
     wxRect rect( 0+2, y+2, 10000, m_lineHeight );

-    Refresh( TRUE, &rect );
+    Refresh( true, &rect );

 }
 
 void wxTextCtrl::RefreshDown( int n )
 }
 
 void wxTextCtrl::RefreshDown( int n )


@@ -1833,33 +2072,37 @@ void wxTextCtrl::RefreshDown( int n )
         int y = n*m_lineHeight;
         int x = 0;
         CalcScrolledPosition( x, y, &x, &y );
         int y = n*m_lineHeight;
         int x = 0;
         CalcScrolledPosition( x, y, &x, &y );

-    
+

         wxRect rect( 0+2, y+2, 10000, size_y );
         wxRect rect( 0+2, y+2, 10000, size_y );

-        Refresh( TRUE, &rect );
+        Refresh( true, &rect );

     }
 }
 
 void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
 {
     }
 }
 
 void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
 {

-    // if (IsSingleLine())
+    if (!m_editable) return;
+
+    // if (IsSingleLine() || (m_lang == wxSOURCE_LANG_NONE))

     {
     {

-        if (new_x > m_lines[new_y].m_text.Len())
+        if (new_x > (int) (m_lines[new_y].m_text.Len()))

             new_x = m_lines[new_y].m_text.Len();
     }
 
     if ((new_x == m_cursorX) && (new_y == m_cursorY)) return;
 
             new_x = m_lines[new_y].m_text.Len();
     }
 
     if ((new_x == m_cursorX) && (new_y == m_cursorY)) return;
 

-    bool no_cursor_refresh = FALSE;
+    bool no_cursor_refresh = false;
+    bool has_selection = HasSelection();

 
     if (shift)
     {
         int x,y,w,h;
 
     if (shift)
     {
         int x,y,w,h;

-        
-        if (!HasSelection())
+        bool erase_background = true;
+
+        if (!has_selection)

         {
             m_selStartX = m_cursorX;
             m_selStartY = m_cursorY;
         {
             m_selStartX = m_cursorX;
             m_selStartY = m_cursorY;

-            
+

             x = 0;
             w = 10000;
             if (new_y > m_selStartY)
             x = 0;
             w = 10000;
             if (new_y > m_selStartY)


@@ -1869,6 +2112,13 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
             }
             else if (new_y == m_selStartY)
             {
             }
             else if (new_y == m_selStartY)
             {

+                x = PosToPixel( new_y, m_selStartX );
+                w = PosToPixel( new_y, new_x ) - x;
+                if (w < 0)
+                {
+                    x += w;
+                    w = -w + 2; // +2 for the cursor
+                }

                 y = m_selStartY*m_lineHeight;
                 h = m_lineHeight;
             }
                 y = m_selStartY*m_lineHeight;
                 h = m_lineHeight;
             }


@@ -1877,8 +2127,8 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
                 y = new_y*m_lineHeight;
                 h = (-new_y+m_selStartY+1)*m_lineHeight;
             }
                 y = new_y*m_lineHeight;
                 h = (-new_y+m_selStartY+1)*m_lineHeight;
             }

-            
-            no_cursor_refresh = TRUE;
+
+            no_cursor_refresh = true;

             m_cursorX = new_x;
             m_cursorY = new_y;
         }
             m_cursorX = new_x;
             m_cursorY = new_y;
         }


@@ -1890,13 +2140,17 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
                 h = m_lineHeight;
                 if (m_selEndX > new_x)
                 {
                 h = m_lineHeight;
                 if (m_selEndX > new_x)
                 {

-                    x = new_x*m_charWidth;
-                    w = (m_selEndX-new_x)*m_charWidth;
+                    // x = new_x*m_charWidth;
+                    x = PosToPixel( new_y, new_x );
+                    // w = (m_selEndX-new_x)*m_charWidth;
+                    w = PosToPixel( new_y, m_selEndX ) - x;

                 }
                 else
                 {
                 }
                 else
                 {

-                    x = m_selEndX*m_charWidth;
-                    w = (-m_selEndX+new_x)*m_charWidth;
+                    // x = m_selEndX*m_charWidth;
+                    x = PosToPixel( new_y, m_selEndX );
+                    // w = (-m_selEndX+new_x)*m_charWidth;
+                    w = PosToPixel( new_y, new_x ) - x;

                 }
             }
             else
                 }
             }
             else


@@ -1907,28 +2161,34 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
                 {
                     y = m_selEndY*m_lineHeight;
                     h = (new_y-m_selEndY+1) * m_lineHeight;
                 {
                     y = m_selEndY*m_lineHeight;
                     h = (new_y-m_selEndY+1) * m_lineHeight;

+
+                    erase_background = ((m_selEndY < m_selStartY) ||
+                                        ((m_selEndY == m_selStartY) && (m_selEndX < m_selStartX)));

                 }
                 else
                 {
                     y = new_y*m_lineHeight;
                     h = (-new_y+m_selEndY+1) * m_lineHeight;
                 }
                 else
                 {
                     y = new_y*m_lineHeight;
                     h = (-new_y+m_selEndY+1) * m_lineHeight;

+
+                    erase_background = ((m_selEndY > m_selStartY) ||
+                                        ((m_selEndY == m_selStartY) && (m_selEndX > m_selStartX)));

                 }
                 }

-                no_cursor_refresh = TRUE;
+                no_cursor_refresh = true;

                 m_cursorX = new_x;
                 m_cursorY = new_y;
             }
         }
                 m_cursorX = new_x;
                 m_cursorY = new_y;
             }
         }

-        
+

         m_selEndX = new_x;
         m_selEndY = new_y;
         m_selEndX = new_x;
         m_selEndY = new_y;

-        
+

         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, w, h );
         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, w, h );

-        Refresh( TRUE, &rect );
+        Refresh( erase_background, &rect );

     }
     else
     {
     }
     else
     {

-        if (HasSelection())
+        if (has_selection)

         {
             int ry1 = m_selEndY;
             int ry2 = m_selStartY;
         {
             int ry1 = m_selEndY;
             int ry2 = m_selStartY;


@@ -1936,59 +2196,66 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
             m_selEndY = -1;
             m_selStartX = -1;
             m_selStartY = -1;
             m_selEndY = -1;
             m_selStartX = -1;
             m_selStartY = -1;

-            
+

             if (ry1 > ry2)
             {
                 int tmp = ry2;
                 ry2 = ry1;
                 ry1 = tmp;
             }
             if (ry1 > ry2)
             {
                 int tmp = ry2;
                 ry2 = ry1;
                 ry1 = tmp;
             }

-        
+

             int x = 0;
             int y = ry1*m_lineHeight;
             CalcScrolledPosition( x, y, &x, &y );
             int x = 0;
             int y = ry1*m_lineHeight;
             CalcScrolledPosition( x, y, &x, &y );

-            wxRect rect( 0+2, y+2, 10000, (ry2-ry1+1)*m_lineHeight );
-        
-            Refresh( TRUE, &rect );
+            wxRect rect( 0, y+2, 10000, (ry2-ry1+1)*m_lineHeight );
+
+            Refresh( true, &rect );

         }
     }
         }
     }

-    
+

 /*
 /*

-    printf( "startx %d starty %d endx %d endy %d\n", 
+    printf( "startx %d starty %d endx %d endy %d\n",

             m_selStartX, m_selStartY, m_selEndX, m_selEndY );
             m_selStartX, m_selStartY, m_selEndX, m_selEndY );

-            
+

     printf( "has %d\n", (int)HasSelection() );
 */
 
     if (!no_cursor_refresh)
     {
     printf( "has %d\n", (int)HasSelection() );
 */
 
     if (!no_cursor_refresh)
     {

-        int x = m_cursorX*m_charWidth;
+        // int x = m_cursorX*m_charWidth;
+        int x = PosToPixel( m_cursorY, m_cursorX );

         int y = m_cursorY*m_lineHeight;
         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 4, m_lineHeight+2 );
         int y = m_cursorY*m_lineHeight;
         CalcScrolledPosition( x, y, &x, &y );
         wxRect rect( x+2, y+2, 4, m_lineHeight+2 );

-        
+

         m_cursorX = new_x;
         m_cursorY = new_y;
         m_cursorX = new_x;
         m_cursorY = new_y;

-    
-        Refresh( TRUE, &rect );
-        
-        wxClientDC dc(this);
-        PrepareDC( dc );
-        dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.SetBrush( *wxRED_BRUSH );
-        dc.DrawRectangle( m_cursorX*m_charWidth+2, m_cursorY*m_lineHeight+2, 2, m_lineHeight );
-    }
-    
+
+        Refresh( true, &rect );
+
+        if (FindFocus() == this)
+        {
+            wxClientDC dc(this);
+            PrepareDC( dc );
+            dc.SetPen( *wxTRANSPARENT_PEN );
+            //dc.SetBrush( *wxRED_BRUSH );
+            dc.SetBrush( *wxBLACK_BRUSH );
+            // int xx = m_cursorX*m_charWidth;
+            int xx = PosToPixel( m_cursorY, m_cursorX );
+            dc.DrawRectangle( xx+2, m_cursorY*m_lineHeight+2, 2, m_lineHeight );
+        }
+    }
+

     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;
     size_y /= m_lineHeight;
     int size_x = 0;
     int size_y = 0;
     GetClientSize( &size_x, &size_y );
     size_x /= m_charWidth;
     size_y /= m_lineHeight;

-    
+

     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );
     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );

-    
+

     if (centre)
     {
         int sy = m_cursorY - (size_y/2);
     if (centre)
     {
         int sy = m_cursorY - (size_y/2);


@@ -2002,11 +2269,14 @@ void wxTextCtrl::MoveCursor( int new_x, int new_y, bool shift, bool centre )
         else if (m_cursorY > view_y+size_y-1)
             Scroll( -1, m_cursorY-size_y+1 );
     }
         else if (m_cursorY > view_y+size_y-1)
             Scroll( -1, m_cursorY-size_y+1 );
     }

-    
-    if (m_cursorX < view_x)
-        Scroll( m_cursorX, -1 );
-    else if (m_cursorX > view_x+size_x-1)
-        Scroll( m_cursorX-size_x+1, -1 );
+
+    //int xx = m_cursorX;
+    int xx = PosToPixel( m_cursorY, m_cursorX ) / m_charWidth;
+
+    if (xx < view_x)
+        Scroll( xx, -1 );
+    else if (xx > view_x+size_x-1)
+        Scroll( xx-size_x+1, -1 );

 }
 
 void wxTextCtrl::MyAdjustScrollbars()
 }
 
 void wxTextCtrl::MyAdjustScrollbars()


@@ -2019,13 +2289,13 @@ void wxTextCtrl::MyAdjustScrollbars()
     int height = 0;
     GetClientSize( NULL, &height );
     height -= 4;
     int height = 0;
     GetClientSize( NULL, &height );
     height -= 4;

-    if (height >= m_lines.GetCount() *m_lineHeight)
+    if (height >= (int)m_lines.GetCount() *m_lineHeight)

         y_range = 0;
         y_range = 0;

-    
+

     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );
     int view_x = 0;
     int view_y = 0;
     GetViewStart( &view_x, &view_y );

-    
+

     SetScrollbars( m_charWidth, m_lineHeight, m_longestLine+2, y_range, view_x, view_y );
 }
 
     SetScrollbars( m_charWidth, m_lineHeight, m_longestLine+2, y_range, view_x, view_y );
 }
 


@@ -2088,13 +2358,13 @@ wxSize wxTextCtrl::DoGetBestSize() const
     if (IsSingleLine())
     {
         wxSize ret(80, m_lineHeight + 4);
     if (IsSingleLine())
     {
         wxSize ret(80, m_lineHeight + 4);

-        
+

         if (HasFlag(wxBORDER_SUNKEN) || HasFlag(wxBORDER_RAISED))
             ret.y += 4;
         if (HasFlag(wxBORDER_SUNKEN) || HasFlag(wxBORDER_RAISED))
             ret.y += 4;

-            
+

         if (HasFlag(wxBORDER_SIMPLE))
             ret.y += 2;
         if (HasFlag(wxBORDER_SIMPLE))
             ret.y += 2;

-            
+

         return ret;
     }
     else
         return ret;
     }
     else


@@ -2103,16 +2373,16 @@ wxSize wxTextCtrl::DoGetBestSize() const
     }
 }
 
     }
 }
 

-// ----------------------------------------------------------------------------
-// freeze/thaw
-// ----------------------------------------------------------------------------
-
-void wxTextCtrl::Freeze()
+void wxTextCtrl::OnSetFocus( wxFocusEvent& event )

 {
 {

+    // To hide or show caret, as appropriate
+    Refresh();

 }
 
 }
 

-void wxTextCtrl::Thaw()
+void wxTextCtrl::OnKillFocus( wxFocusEvent& event )

 {
 {

+    // To hide or show caret, as appropriate
+    Refresh();

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


@@ -2123,13 +2393,12 @@ bool wxTextCtrl::ScrollLines(int lines)
 {
     wxFAIL_MSG( "wxTextCtrl::ScrollLines not implemented");
 
 {
     wxFAIL_MSG( "wxTextCtrl::ScrollLines not implemented");
 

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {
     wxFAIL_MSG( "wxTextCtrl::ScrollPages not implemented");
 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {
     wxFAIL_MSG( "wxTextCtrl::ScrollPages not implemented");

-    
-    return FALSE;
-}

 
 

+    return false;
+}