Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 1d7c6567d9d4d7e720b72d21af9e46c20b120eb0..041ea21d516a17f5a62c58d68ecb09bbdcfaa429 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -125,16 +125,17 @@
 
 #if wxUSE_TEXTCTRL
 
 
 #if wxUSE_TEXTCTRL
 

-#include <ctype.h>
+#include "wx/textctrl.h"

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

-

     #include "wx/dcclient.h"
     #include "wx/validate.h"
     #include "wx/dcclient.h"
     #include "wx/validate.h"

-    #include "wx/textctrl.h"
+    #include "wx/dataobj.h"

 #endif
 
 #endif
 

+#include <ctype.h>
+

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


@@ -148,26 +149,46 @@
 
 #include "wx/cmdproc.h"
 
 
 #include "wx/cmdproc.h"
 

-#if wxUSE_CLIPBOARD
-#include "wx/dataobj.h"
-#endif
-
-// turn extra wxTextCtrl-specific debugging on/off
-#define WXDEBUG_TEXT
-
-// turn wxTextCtrl::Replace() debugging on (slows down code a *lot*!)
-#define WXDEBUG_TEXT_REPLACE
+#if wxDEBUG_LEVEL >= 2
+    // turn extra wxTextCtrl-specific debugging on/off
+    #define WXDEBUG_TEXT

 
 

-#ifndef __WXDEBUG__
-    #undef WXDEBUG_TEXT
-    #undef WXDEBUG_TEXT_REPLACE
-#endif
+    // turn wxTextCtrl::Replace() debugging on (slows down code a *lot*!)
+    #define WXDEBUG_TEXT_REPLACE
+#endif // wxDEBUG_LEVEL >= 2

 
 // wxStringTokenize only needed for debug checks
 #ifdef WXDEBUG_TEXT_REPLACE
     #include "wx/tokenzr.h"
 #endif // WXDEBUG_TEXT_REPLACE
 
 
 // wxStringTokenize only needed for debug checks
 #ifdef WXDEBUG_TEXT_REPLACE
     #include "wx/tokenzr.h"
 #endif // WXDEBUG_TEXT_REPLACE
 

+// ----------------------------------------------------------------------------
+// wxStdTextCtrlInputHandler: this control handles only the mouse/kbd actions
+// common to Win32 and GTK, platform-specific things are implemented elsewhere
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
+{
+public:
+    wxStdTextCtrlInputHandler(wxInputHandler *inphand);
+
+    virtual bool HandleKey(wxInputConsumer *consumer,
+                           const wxKeyEvent& event,
+                           bool pressed);
+    virtual bool HandleMouse(wxInputConsumer *consumer,
+                             const wxMouseEvent& event);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,
+                                 const wxMouseEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
+
+protected:
+    // get the position of the mouse click
+    static wxTextPos HitTest(const wxTextCtrl *text, const wxPoint& pos);
+
+    // capture data
+    wxTextCtrl *m_winCapture;
+};
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -188,8 +209,8 @@ static inline void OrderPositions(wxTextPos& from, wxTextPos& to)
 // ----------------------------------------------------------------------------
 
 // names of text ctrl commands
 // ----------------------------------------------------------------------------
 
 // names of text ctrl commands

-#define wxTEXT_COMMAND_INSERT _T("insert")
-#define wxTEXT_COMMAND_REMOVE _T("remove")
+#define wxTEXT_COMMAND_INSERT wxT("insert")
+#define wxTEXT_COMMAND_REMOVE wxT("remove")

 
 // the value which is never used for text position, even not -1 which is
 // sometimes used for some special meaning
 
 // the value which is never used for text position, even not -1 which is
 // sometimes used for some special meaning


@@ -203,7 +224,7 @@ static const size_t PAGE_OVERLAP_IN_LINES = 1;
 // ----------------------------------------------------------------------------
 
 // the data only used by single line text controls
 // ----------------------------------------------------------------------------
 
 // the data only used by single line text controls

-struct WXDLLEXPORT wxTextSingleLineData
+struct wxTextSingleLineData

 {
     // the position of the first visible pixel and the first visible column
     wxCoord m_ofsHorz;
 {
     // the position of the first visible pixel and the first visible column
     wxCoord m_ofsHorz;


@@ -227,7 +248,7 @@ struct WXDLLEXPORT wxTextSingleLineData
 };
 
 // the data only used by multi line text controls
 };
 
 // the data only used by multi line text controls

-struct WXDLLEXPORT wxTextMultiLineData
+struct wxTextMultiLineData

 {
     // the lines of text
     wxArrayString m_lines;
 {
     // the lines of text
     wxArrayString m_lines;


@@ -276,7 +297,7 @@ struct WXDLLEXPORT wxTextMultiLineData
 };
 
 // the data only used by multi line text controls in line wrap mode
 };
 
 // the data only used by multi line text controls in line wrap mode

-class WXDLLEXPORT wxWrappedLineData
+class wxWrappedLineData

 {
     // these functions set all our values, so give them access to them
 friend void wxTextCtrl::LayoutLine(wxTextCoord line,
 {
     // these functions set all our values, so give them access to them
 friend void wxTextCtrl::LayoutLine(wxTextCoord line,


@@ -294,7 +315,7 @@ public:
     // for the first one)
     wxTextCoord GetRowStart(wxTextCoord row) const
     {
     // for the first one)
     wxTextCoord GetRowStart(wxTextCoord row) const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return row ? m_rowsStart[row - 1] : 0;
     }
 
         return row ? m_rowsStart[row - 1] : 0;
     }


@@ -304,7 +325,7 @@ public:
     // be given to us)
     wxTextCoord GetRowLength(wxTextCoord row, wxTextCoord lenLine) const
     {
     // be given to us)
     wxTextCoord GetRowLength(wxTextCoord row, wxTextCoord lenLine) const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         // note that m_rowsStart[row] is the same as GetRowStart(row + 1) (but
         // slightly more efficient) and lenLine is the same as the start of the
 
         // note that m_rowsStart[row] is the same as GetRowStart(row + 1) (but
         // slightly more efficient) and lenLine is the same as the start of the


@@ -316,7 +337,7 @@ public:
     // return the width of the row in pixels
     wxCoord GetRowWidth(wxTextCoord row) const
     {
     // return the width of the row in pixels
     wxCoord GetRowWidth(wxTextCoord row) const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowsWidth[row];
     }
 
         return m_rowsWidth[row];
     }


@@ -324,7 +345,7 @@ public:
     // return the number of rows
     size_t GetRowCount() const
     {
     // return the number of rows
     size_t GetRowCount() const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowsStart.GetCount() + 1;
     }
 
         return m_rowsStart.GetCount() + 1;
     }


@@ -332,7 +353,7 @@ public:
     // return the number of additional (i.e. after the first one) rows
     size_t GetExtraRowCount() const
     {
     // return the number of additional (i.e. after the first one) rows
     size_t GetExtraRowCount() const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowsStart.GetCount();
     }
 
         return m_rowsStart.GetCount();
     }


@@ -340,7 +361,7 @@ public:
     // return the first row of this line
     wxTextCoord GetFirstRow() const
     {
     // return the first row of this line
     wxTextCoord GetFirstRow() const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowFirst;
     }
 
         return m_rowFirst;
     }


@@ -348,7 +369,7 @@ public:
     // return the first row of the next line
     wxTextCoord GetNextRow() const
     {
     // return the first row of the next line
     wxTextCoord GetNextRow() const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowFirst + m_rowsStart.GetCount() + 1;
     }
 
         return m_rowFirst + m_rowsStart.GetCount() + 1;
     }


@@ -356,7 +377,7 @@ public:
     // this just provides direct access to m_rowsStart aerray for efficiency
     wxTextCoord GetExtraRowStart(wxTextCoord row) const
     {
     // this just provides direct access to m_rowsStart aerray for efficiency
     wxTextCoord GetExtraRowStart(wxTextCoord row) const
     {

-        wxASSERT_MSG( IsValid(), _T("this line hadn't been laid out") );
+        wxASSERT_MSG( IsValid(), wxT("this line hadn't been laid out") );

 
         return m_rowsStart[row];
     }
 
         return m_rowsStart[row];
     }


@@ -387,14 +408,14 @@ public:
                                                 : GetRowStart(n + 1);
 
                 wxASSERT_MSG( colRowEnd < colNextRowStart,
                                                 : GetRowStart(n + 1);
 
                 wxASSERT_MSG( colRowEnd < colNextRowStart,

-                              _T("this column is not in this row at all!") );
+                              wxT("this column is not in this row at all!") );

 
                 return colRowEnd == colNextRowStart - 1;
             }
         }
 
         // caller got it wrong
 
                 return colRowEnd == colNextRowStart - 1;
             }
         }
 
         // caller got it wrong

-        wxFAIL_MSG( _T("this column is not in the start of the row!") );
+        wxFAIL_MSG( wxT("this column is not in the start of the row!") );

 
         return false;
     }
 
         return false;
     }


@@ -436,7 +457,7 @@ WX_DECLARE_OBJARRAY(wxWrappedLineData, wxArrayWrappedLinesData);
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayWrappedLinesData);
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayWrappedLinesData);
 

-struct WXDLLEXPORT wxTextWrappedData : public wxTextMultiLineData
+struct wxTextWrappedData : public wxTextMultiLineData

 {
     // the width of the column to the right of the text rect used for the
     // indicator mark display for the wrapped lines
 {
     // the width of the column to the right of the text rect used for the
     // indicator mark display for the wrapped lines


@@ -501,8 +522,8 @@ public:
 
     // we don't use these methods as they don't make sense for us as we need a
     // wxTextCtrl to be applied
 
     // we don't use these methods as they don't make sense for us as we need a
     // wxTextCtrl to be applied

-    virtual bool Do() { wxFAIL_MSG(_T("shouldn't be called")); return false; }
-    virtual bool Undo() { wxFAIL_MSG(_T("shouldn't be called")); return false; }
+    virtual bool Do() { wxFAIL_MSG(wxT("shouldn't be called")); return false; }
+    virtual bool Undo() { wxFAIL_MSG(wxT("shouldn't be called")); return false; }

 
     // instead, our command processor uses these methods
     virtual bool Do(wxTextCtrl *text) = 0;
 
     // instead, our command processor uses these methods
     virtual bool Do(wxTextCtrl *text) = 0;


@@ -606,14 +627,12 @@ private:
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

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

     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-

 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------


@@ -626,6 +645,7 @@ void wxTextCtrl::Init()
 
     m_isModified = false;
     m_isEditable = true;
 
     m_isModified = false;
     m_isEditable = true;

+    m_wrapLines = false;

 
     m_posLast =
     m_curPos =
 
     m_posLast =
     m_curPos =


@@ -671,9 +691,18 @@ bool wxTextCtrl::Create(wxWindow *parent,
         // create data object for normal multiline or for controls with line
         // wrap as needed
         if ( style & wxHSCROLL )
         // create data object for normal multiline or for controls with line
         // wrap as needed
         if ( style & wxHSCROLL )

+        {

             m_data.mdata = new wxTextMultiLineData;
             m_data.mdata = new wxTextMultiLineData;

-        else
+        }
+        else // we must wrap lines if we don't have horizontal scrollbar
+        {
+            // NB: we can't rely on HasFlag(wxHSCROLL) as the flags can change
+            //     later and even wxWindow::Create() itself temporarily resets
+            //     wxHSCROLL in wxUniv, so remember that we have a wrapped data
+            //     and not just a multi line data in a separate variable
+            m_wrapLines = true;

             m_data.wdata = new wxTextWrappedData;
             m_data.wdata = new wxTextWrappedData;

+        }

     }
     else
     {
     }
     else
     {


@@ -711,12 +740,12 @@ bool wxTextCtrl::Create(wxWindow *parent,
         // we might support it but it's quite useless and other ports don't
         // support it anyhow
         wxASSERT_MSG( !(style & wxTE_PASSWORD),
         // we might support it but it's quite useless and other ports don't
         // support it anyhow
         wxASSERT_MSG( !(style & wxTE_PASSWORD),

-                      _T("wxTE_PASSWORD can't be used with multiline ctrls") );
+                      wxT("wxTE_PASSWORD can't be used with multiline ctrls") );

     }
 
     RecalcFontMetrics();
     SetValue(value);
     }
 
     RecalcFontMetrics();
     SetValue(value);

-    SetBestSize(size);
+    SetInitialSize(size);

 
     m_isEditable = !(style & wxTE_READONLY);
 
 
     m_isEditable = !(style & wxTE_READONLY);
 


@@ -754,22 +783,25 @@ wxTextCtrl::~wxTextCtrl()
 // set/get the value
 // ----------------------------------------------------------------------------
 
 // set/get the value
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    if ( IsSingleLine() && (value == GetValue()) )
+    if ( value != GetValue() )

     {
     {

-        // nothing changed
-        return;
-    }
+        EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));

 
 

-    Replace(0, GetLastPosition(), value);
+        Replace(0, GetLastPosition(), value);

 
 

-    if ( IsSingleLine() )
+        if ( IsSingleLine() )
+        {
+            SetInsertionPoint(0);
+        }
+    }
+    else // nothing changed

     {
     {

-        SetInsertionPoint(0);
+        // still send event for consistency
+        if ( flags & SetValue_SendEvent )
+            SendTextUpdatedEvent();

     }
     }

-
-    // TODO: should we generate the event or not, finally?

 }
 
 const wxArrayString& wxTextCtrl::GetLines() const
 }
 
 const wxArrayString& wxTextCtrl::GetLines() const


@@ -782,7 +814,7 @@ size_t wxTextCtrl::GetLineCount() const
     return MData().m_lines.GetCount();
 }
 
     return MData().m_lines.GetCount();
 }
 

-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const

 {
     // for multiline controls we don't always store the total value but only
     // recompute it when asked - and to invalidate it we just empty it in
 {
     // for multiline controls we don't always store the total value but only
     // recompute it when asked - and to invalidate it we just empty it in


@@ -800,7 +832,7 @@ wxString wxTextCtrl::GetValue() const
         size_t count = lines.GetCount();
         for ( size_t n = 1; n < count; n++ )
         {
         size_t count = lines.GetCount();
         for ( size_t n = 1; n < count; n++ )
         {

-            self->m_value << _T('\n') << lines[n];
+            self->m_value << wxT('\n') << lines[n];

         }
     }
 
         }
     }
 


@@ -915,7 +947,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
          !PositionToXY(from, &colStart, &lineStart) ||
          !PositionToXY(to, &colEnd, &lineEnd) )
     {
          !PositionToXY(from, &colStart, &lineStart) ||
          !PositionToXY(to, &colEnd, &lineEnd) )
     {

-        wxFAIL_MSG(_T("invalid range in wxTextCtrl::Replace"));
+        wxFAIL_MSG(wxT("invalid range in wxTextCtrl::Replace"));

 
         return;
     }
 
         return;
     }


@@ -1002,7 +1034,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
             if ( line > lineStart )
             {
                 // from the previous line
             if ( line > lineStart )
             {
                 // from the previous line

-                textOrig += _T('\n');
+                textOrig += wxT('\n');

             }
 
             textOrig += linesOld[line];
             }
 
             textOrig += linesOld[line];


@@ -1023,7 +1055,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
         if ( (size_t)colStart == linesOld[lineStart].length() )
         {
             // text appended, refresh just enough to show the new text
         if ( (size_t)colStart == linesOld[lineStart].length() )
         {
             // text appended, refresh just enough to show the new text

-            widthNewText = GetTextWidth(text.BeforeFirst(_T('\n')));
+            widthNewText = GetTextWidth(text.BeforeFirst(wxT('\n')));

         }
         else // text inserted, refresh till the end of line
         {
         }
         else // text inserted, refresh till the end of line
         {


@@ -1049,7 +1081,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
         for ( const wxChar *p = textNew.c_str(); ; p++ )
         {
             // end of line/text?
         for ( const wxChar *p = textNew.c_str(); ; p++ )
         {
             // end of line/text?

-            if ( !*p || *p == _T('\n') )
+            if ( !*p || *p == wxT('\n') )

             {
                 lines.Add(wxString(curLineStart, p));
                 if ( !*p )
             {
                 lines.Add(wxString(curLineStart, p));
                 if ( !*p )


@@ -1062,7 +1094,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
 #ifdef WXDEBUG_TEXT_REPLACE
         // (3a) all empty tokens should be counted as replacing with "foo" and
         //      with "foo\n" should have different effects
 #ifdef WXDEBUG_TEXT_REPLACE
         // (3a) all empty tokens should be counted as replacing with "foo" and
         //      with "foo\n" should have different effects

-        wxArrayString lines2 = wxStringTokenize(textNew, _T("\n"),
+        wxArrayString lines2 = wxStringTokenize(textNew, wxT("\n"),

                                                 wxTOKEN_RET_EMPTY_ALL);
 
         if ( lines2.IsEmpty() )
                                                 wxTOKEN_RET_EMPTY_ALL);
 
         if ( lines2.IsEmpty() )


@@ -1071,10 +1103,10 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
         }
 
         wxASSERT_MSG( lines.GetCount() == lines2.GetCount(),
         }
 
         wxASSERT_MSG( lines.GetCount() == lines2.GetCount(),

-                      _T("Replace() broken") );
+                      wxT("Replace() broken") );

         for ( size_t n = 0; n < lines.GetCount(); n++ )
         {
         for ( size_t n = 0; n < lines.GetCount(); n++ )
         {

-            wxASSERT_MSG( lines[n] == lines2[n], _T("Replace() broken") );
+            wxASSERT_MSG( lines[n] == lines2[n], wxT("Replace() broken") );

         }
 #endif // WXDEBUG_TEXT_REPLACE
 
         }
 #endif // WXDEBUG_TEXT_REPLACE
 


@@ -1205,7 +1237,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
 #ifdef WXDEBUG_TEXT_REPLACE
     // optimized code above should give the same result as straightforward
     // computation in the beginning
 #ifdef WXDEBUG_TEXT_REPLACE
     // optimized code above should give the same result as straightforward
     // computation in the beginning

-    wxASSERT_MSG( GetValue() == textTotalNew, _T("error in Replace()") );
+    wxASSERT_MSG( GetValue() == textTotalNew, wxT("error in Replace()") );

 #endif // WXDEBUG_TEXT_REPLACE
 
     // update the current position: note that we always put the cursor at the
 #endif // WXDEBUG_TEXT_REPLACE
 
     // update the current position: note that we always put the cursor at the


@@ -1229,6 +1261,8 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
 
     // now call it to do the rest (not related to refreshing)
     ClearSelection();
 
     // now call it to do the rest (not related to refreshing)
     ClearSelection();

+
+    SendTextUpdatedEventIfAllowed();

 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)
 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)


@@ -1261,7 +1295,7 @@ void wxTextCtrl::AppendText(const wxString& text)
 void wxTextCtrl::SetInsertionPoint(wxTextPos pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= GetLastPosition(),
 void wxTextCtrl::SetInsertionPoint(wxTextPos pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= GetLastPosition(),

-                 _T("insertion point position out of range") );
+                 wxT("insertion point position out of range") );

 
     // don't do anything if it didn't change
     if ( pos != m_curPos )
 
     // don't do anything if it didn't change
     if ( pos != m_curPos )


@@ -1291,7 +1325,7 @@ void wxTextCtrl::InitInsertionPoint()
 void wxTextCtrl::MoveInsertionPoint(wxTextPos pos)
 {
     wxASSERT_MSG( pos >= 0 && pos <= GetLastPosition(),
 void wxTextCtrl::MoveInsertionPoint(wxTextPos pos)
 {
     wxASSERT_MSG( pos >= 0 && pos <= GetLastPosition(),

-                 _T("DoSetInsertionPoint() can only be called with valid pos") );
+                 wxT("DoSetInsertionPoint() can only be called with valid pos") );

 
     m_curPos = pos;
     PositionToXY(m_curPos, &m_curCol, &m_curRow);
 
     m_curPos = pos;
     PositionToXY(m_curPos, &m_curCol, &m_curRow);


@@ -1341,7 +1375,7 @@ wxTextPos wxTextCtrl::GetLastPosition() const
         }
 
         // more probable reason of this would be to forget to update m_posLast
         }
 
         // more probable reason of this would be to forget to update m_posLast

-        wxASSERT_MSG( pos == m_posLast, _T("bug in GetLastPosition()") );
+        wxASSERT_MSG( pos == m_posLast, wxT("bug in GetLastPosition()") );

 #endif // WXDEBUG_TEXT
 
         pos = m_posLast;
 #endif // WXDEBUG_TEXT
 
         pos = m_posLast;


@@ -1389,12 +1423,12 @@ wxString wxTextCtrl::GetSelectionText() const
             {
                 // take the end of the first line
                 sel = GetLines()[lineStart].c_str() + colStart;
             {
                 // take the end of the first line
                 sel = GetLines()[lineStart].c_str() + colStart;

-                sel += _T('\n');
+                sel += wxT('\n');

 
                 // all intermediate ones
                 for ( wxTextCoord line = lineStart + 1; line < lineEnd; line++ )
                 {
 
                 // all intermediate ones
                 for ( wxTextCoord line = lineStart + 1; line < lineEnd; line++ )
                 {

-                    sel << GetLines()[line] << _T('\n');
+                    sel << GetLines()[line] << wxT('\n');

                 }
 
                 // and the start of the last one
                 }
 
                 // and the start of the last one


@@ -1409,8 +1443,12 @@ wxString wxTextCtrl::GetSelectionText() const
 void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
 {
     // selecting till -1 is the same as selecting to the end
 void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
 {
     // selecting till -1 is the same as selecting to the end

-    if ( to == -1 && from != -1 )
+    if ( to == -1 )

     {
     {

+        // and selecting (-1, -1) range is the same as selecting everything, by
+        // convention
+        if ( from == -1 )
+            from = 0;

         to = GetLastPosition();
     }
 
         to = GetLastPosition();
     }
 


@@ -1427,7 +1465,7 @@ void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
         OrderPositions(from, to);
 
         wxCHECK_RET( to <= GetLastPosition(),
         OrderPositions(from, to);
 
         wxCHECK_RET( to <= GetLastPosition(),

-                     _T("invalid range in wxTextCtrl::SetSelection") );
+                     wxT("invalid range in wxTextCtrl::SetSelection") );

 
         if ( from != m_selStart || to != m_selEnd )
         {
 
         if ( from != m_selStart || to != m_selEnd )
         {


@@ -1439,7 +1477,7 @@ void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
             m_selStart = from;
             m_selEnd = to;
 
             m_selStart = from;
             m_selEnd = to;
 

-            wxLogTrace(_T("text"), _T("Selection range is %ld-%ld"),
+            wxLogTrace(wxT("text"), wxT("Selection range is %ld-%ld"),

                        m_selStart, m_selEnd);
 
             // refresh only the part of text which became (un)selected if
                        m_selStart, m_selEnd);
 
             // refresh only the part of text which became (un)selected if


@@ -1613,14 +1651,14 @@ int wxTextCtrl::GetLineLength(wxTextCoord line) const
 {
     if ( IsSingleLine() )
     {
 {
     if ( IsSingleLine() )
     {

-        wxASSERT_MSG( line == 0, _T("invalid GetLineLength() parameter") );
+        wxASSERT_MSG( line == 0, wxT("invalid GetLineLength() parameter") );

 
         return m_value.length();
     }
     else // multiline
     {
         wxCHECK_MSG( (size_t)line < GetLineCount(), -1,
 
         return m_value.length();
     }
     else // multiline
     {
         wxCHECK_MSG( (size_t)line < GetLineCount(), -1,

-                     _T("line index out of range") );
+                     wxT("line index out of range") );

 
         return GetLines()[line].length();
     }
 
         return GetLines()[line].length();
     }


@@ -1630,7 +1668,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const
 {
     if ( IsSingleLine() )
     {
 {
     if ( IsSingleLine() )
     {

-        wxASSERT_MSG( line == 0, _T("invalid GetLineLength() parameter") );
+        wxASSERT_MSG( line == 0, wxT("invalid GetLineLength() parameter") );

 
         return m_value;
     }
 
         return m_value;
     }


@@ -1640,7 +1678,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const
         if (line == 0 && GetLineCount() == 0) return wxEmptyString ;
 
         wxCHECK_MSG( (size_t)line < GetLineCount(), wxEmptyString,
         if (line == 0 && GetLineCount() == 0) return wxEmptyString ;
 
         wxCHECK_MSG( (size_t)line < GetLineCount(), wxEmptyString,

-                     _T("line index out of range") );
+                     wxT("line index out of range") );

 
         return GetLines()[line];
     }
 
         return GetLines()[line];
     }


@@ -1722,7 +1760,7 @@ bool wxTextCtrl::PositionToXY(wxTextPos pos,
 
 #ifdef WXDEBUG_TEXT
                 wxASSERT_MSG( XYToPosition(pos - posCur, nLine) == pos,
 
 #ifdef WXDEBUG_TEXT
                 wxASSERT_MSG( XYToPosition(pos - posCur, nLine) == pos,

-                              _T("XYToPosition() or PositionToXY() broken") );
+                              wxT("XYToPosition() or PositionToXY() broken") );

 #endif // WXDEBUG_TEXT
 
                 return true;
 #endif // WXDEBUG_TEXT
 
                 return true;


@@ -1860,7 +1898,7 @@ wxPoint wxTextCtrl::GetCaretPosition() const
     wxCoord xCaret, yCaret;
     if ( !PositionToDeviceXY(m_curPos, &xCaret, &yCaret) )
     {
     wxCoord xCaret, yCaret;
     if ( !PositionToDeviceXY(m_curPos, &xCaret, &yCaret) )
     {

-        wxFAIL_MSG( _T("Caret can't be beyond the text!") );
+        wxFAIL_MSG( wxT("Caret can't be beyond the text!") );

     }
 
     return wxPoint(xCaret, yCaret);
     }
 
     return wxPoint(xCaret, yCaret);


@@ -1926,7 +1964,7 @@ void wxTextCtrl::ShowPosition(wxTextPos pos)
                 {
                     // finding the last line is easy if each line has exactly
                     // one row
                 {
                     // finding the last line is easy if each line has exactly
                     // one row

-                    yEnd = yStart + rectText.height / GetLineHeight() - 1;
+                    yEnd = yStart + rectText.height / GetLineHeight();

                 }
 
                 if ( yEnd < y )
                 }
 
                 if ( yEnd < y )


@@ -2241,7 +2279,7 @@ bool wxTextCtrlInsertCommand::Do(wxTextCtrl *text)
 
 bool wxTextCtrlInsertCommand::Undo(wxTextCtrl *text)
 {
 
 bool wxTextCtrlInsertCommand::Undo(wxTextCtrl *text)
 {

-    wxCHECK_MSG( CanUndo(), false, _T("impossible to undo insert cmd") );
+    wxCHECK_MSG( CanUndo(), false, wxT("impossible to undo insert cmd") );

 
     // remove the text from where we inserted it
     text->Remove(m_from, m_from + m_text.length());
 
     // remove the text from where we inserted it
     text->Remove(m_from, m_from + m_text.length());


@@ -2278,7 +2316,7 @@ bool wxTextCtrlRemoveCommand::Undo(wxTextCtrl *text)
 void wxTextCtrl::Undo()
 {
     // the caller must check it
 void wxTextCtrl::Undo()
 {
     // the caller must check it

-    wxASSERT_MSG( CanUndo(), _T("can't call Undo() if !CanUndo()") );
+    wxASSERT_MSG( CanUndo(), wxT("can't call Undo() if !CanUndo()") );

 
     m_cmdProcessor->Undo();
 }
 
     m_cmdProcessor->Undo();
 }


@@ -2286,7 +2324,7 @@ void wxTextCtrl::Undo()
 void wxTextCtrl::Redo()
 {
     // the caller must check it
 void wxTextCtrl::Redo()
 {
     // the caller must check it

-    wxASSERT_MSG( CanRedo(), _T("can't call Undo() if !CanUndo()") );
+    wxASSERT_MSG( CanRedo(), wxT("can't call Undo() if !CanUndo()") );

 
     m_cmdProcessor->Redo();
 }
 
     m_cmdProcessor->Redo();
 }


@@ -2379,7 +2417,7 @@ void wxTextCtrl::UpdateTextRect()
             WData().m_rowFirstInvalid = 0;
 
             // increase timestamp: this means that the lines which had been
             WData().m_rowFirstInvalid = 0;
 
             // increase timestamp: this means that the lines which had been

-            // laid out before will be relayd out the next time LayoutLines()
+            // laid out before will be relaid out the next time LayoutLines()

             // is called because their timestamp will be smaller than the
             // current one
             WData().m_timestamp++;
             // is called because their timestamp will be smaller than the
             // current one
             WData().m_timestamp++;


@@ -2403,9 +2441,12 @@ void wxTextCtrl::UpdateLastVisible()
     {
         case wxTE_HT_BEYOND:
             // everything is visible
     {
         case wxTE_HT_BEYOND:
             // everything is visible

+            SData().m_ofsHorz = 0;
+
+            SData().m_colStart = 0;

             SData().m_colLastVisible = text.length();
 
             SData().m_colLastVisible = text.length();
 

-            // calc it below
+            // calculate it below

             SData().m_posLastVisible = -1;
             break;
 
             SData().m_posLastVisible = -1;
             break;
 


@@ -2414,7 +2455,7 @@ void wxTextCtrl::UpdateLastVisible()
         case wxTE_HT_BELOW:
             */
         default:
         case wxTE_HT_BELOW:
             */
         default:

-            wxFAIL_MSG(_T("unexpected HitTestLine() return value"));
+            wxFAIL_MSG(wxT("unexpected HitTestLine() return value"));

             // fall through
 
         case wxTE_HT_ON_TEXT:
             // fall through
 
         case wxTE_HT_ON_TEXT:


@@ -2450,7 +2491,7 @@ void wxTextCtrl::UpdateLastVisible()
     // SData().m_colStart, we need an absolute offset into string
     SData().m_colLastVisible += SData().m_colStart;
 
     // SData().m_colStart, we need an absolute offset into string
     SData().m_colLastVisible += SData().m_colStart;
 

-    wxLogTrace(_T("text"), _T("Last visible column/position is %d/%ld"),
+    wxLogTrace(wxT("text"), wxT("Last visible column/position is %d/%ld"),

                (int) SData().m_colLastVisible, (long) SData().m_posLastVisible);
 }
 
                (int) SData().m_colLastVisible, (long) SData().m_posLastVisible);
 }
 


@@ -2522,7 +2563,7 @@ wxTextCoord wxTextCtrl::GetRowInLine(wxTextCoord line,
                                      wxTextCoord col,
                                      wxTextCoord *colRowStart) const
 {
                                      wxTextCoord col,
                                      wxTextCoord *colRowStart) const
 {

-    wxASSERT_MSG( WrapLines(), _T("shouldn't be called") );
+    wxASSERT_MSG( WrapLines(), wxT("shouldn't be called") );

 
     const wxWrappedLineData& lineData = WData().m_linesData[line];
 
 
     const wxWrappedLineData& lineData = WData().m_linesData[line];
 


@@ -2550,7 +2591,7 @@ wxTextCoord wxTextCtrl::GetRowInLine(wxTextCoord line,
         *colRowStart = lineData.GetRowStart(row);
 
         // this can't happen, of course
         *colRowStart = lineData.GetRowStart(row);
 
         // this can't happen, of course

-        wxASSERT_MSG( *colRowStart <= col, _T("GetRowInLine() is broken") );
+        wxASSERT_MSG( *colRowStart <= col, wxT("GetRowInLine() is broken") );

     }
 
     return row;
     }
 
     return row;


@@ -2591,12 +2632,12 @@ void wxTextCtrl::LayoutLine(wxTextCoord line, wxWrappedLineData& lineData) const
 
 void wxTextCtrl::LayoutLines(wxTextCoord lineLast) const
 {
 
 void wxTextCtrl::LayoutLines(wxTextCoord lineLast) const
 {

-    wxASSERT_MSG( WrapLines(), _T("should only be used for line wrapping") );
+    wxASSERT_MSG( WrapLines(), wxT("should only be used for line wrapping") );

 
     // if we were called, some line was dirty and if it was dirty we must have
     // had m_rowFirstInvalid set to something too
     wxTextCoord lineFirst = WData().m_rowFirstInvalid;
 
     // if we were called, some line was dirty and if it was dirty we must have
     // had m_rowFirstInvalid set to something too
     wxTextCoord lineFirst = WData().m_rowFirstInvalid;

-    wxASSERT_MSG( lineFirst != -1, _T("nothing to layout?") );
+    wxASSERT_MSG( lineFirst != -1, wxT("nothing to layout?") );

 
     wxTextCoord rowFirst, rowCur;
     if ( lineFirst )
 
     wxTextCoord rowFirst, rowCur;
     if ( lineFirst )


@@ -2649,7 +2690,7 @@ size_t wxTextCtrl::GetPartOfWrappedLine(const wxChar* text,
                                         wxCoord *widthReal) const
 {
     // this function is slow, it shouldn't be called unless really needed
                                         wxCoord *widthReal) const
 {
     // this function is slow, it shouldn't be called unless really needed

-    wxASSERT_MSG( WrapLines(), _T("shouldn't be called") );
+    wxASSERT_MSG( WrapLines(), wxT("shouldn't be called") );

 
     wxString s(text);
     wxTextCoord col;
 
     wxString s(text);
     wxTextCoord col;


@@ -2661,7 +2702,7 @@ size_t wxTextCtrl::GetPartOfWrappedLine(const wxChar* text,
         case wxTE_HT_BELOW:
             */
         default:
         case wxTE_HT_BELOW:
             */
         default:

-            wxFAIL_MSG(_T("unexpected HitTestLine() return value"));
+            wxFAIL_MSG(wxT("unexpected HitTestLine() return value"));

             // fall through
 
         case wxTE_HT_ON_TEXT:
             // fall through
 
         case wxTE_HT_ON_TEXT:


@@ -2683,7 +2724,7 @@ size_t wxTextCtrl::GetPartOfWrappedLine(const wxChar* text,
                 //else: we can just see it
 
                 // wrap at any character or only at words boundaries?
                 //else: we can just see it
 
                 // wrap at any character or only at words boundaries?

-                if ( !(GetWindowStyle() & wxTE_LINEWRAP) )
+                if ( !(GetWindowStyle() & wxTE_CHARWRAP) )

                 {
                     // find the (last) not word char before this word
                     wxTextCoord colWordStart;
                 {
                     // find the (last) not word char before this word
                     wxTextCoord colWordStart;


@@ -2901,7 +2942,7 @@ wxTextCtrlHitTestResult wxTextCtrl::HitTestLine(const wxString& line,
             }
 
             // this is not supposed to happen
             }
 
             // this is not supposed to happen

-            wxASSERT_MSG( matchDir, _T("logic error in wxTextCtrl::HitTest") );
+            wxASSERT_MSG( matchDir, wxT("logic error in wxTextCtrl::HitTest") );

 
             if ( matchDir == Match_Right )
                 col++;
 
             if ( matchDir == Match_Right )
                 col++;


@@ -2925,11 +2966,11 @@ wxTextCtrlHitTestResult wxTextCtrl::HitTestLine(const wxString& line,
             dc.GetTextExtent(text, &width2, NULL);
 
             wxASSERT_MSG( (width1 <= x) && (x < width2),
             dc.GetTextExtent(text, &width2, NULL);
 
             wxASSERT_MSG( (width1 <= x) && (x < width2),

-                          _T("incorrect HitTestLine() result") );
+                          wxT("incorrect HitTestLine() result") );

         }
         else // we return last char
         {
         }
         else // we return last char
         {

-            wxASSERT_MSG( x >= width1, _T("incorrect HitTestLine() result") );
+            wxASSERT_MSG( x >= width1, wxT("incorrect HitTestLine() result") );

         }
     }
 #endif // WXDEBUG_TEXT
         }
     }
 #endif // WXDEBUG_TEXT


@@ -3223,7 +3264,7 @@ bool wxTextCtrl::GetLineAndRow(wxTextCoord row,
    fine for vertical scrolling as all lines have the same height but is rather
    ugly for horizontal scrolling if proportional font is used. This is why we
    manually update and use SData().m_ofsHorz which contains the length of the string
    fine for vertical scrolling as all lines have the same height but is rather
    ugly for horizontal scrolling if proportional font is used. This is why we
    manually update and use SData().m_ofsHorz which contains the length of the string

-   which is hidden beyond the left borde. An important property of text
+   which is hidden beyond the left border. An important property of text

    controls using this kind of scrolling is that an entire number of characters
    is always shown and that parts of characters never appear on display -
    neither in the leftmost nor rightmost positions.
    controls using this kind of scrolling is that an entire number of characters
    is always shown and that parts of characters never appear on display -
    neither in the leftmost nor rightmost positions.


@@ -3234,11 +3275,11 @@ bool wxTextCtrl::GetLineAndRow(wxTextCoord row,
 
 void wxTextCtrl::ShowHorzPosition(wxCoord pos)
 {
 
 void wxTextCtrl::ShowHorzPosition(wxCoord pos)
 {

-    wxASSERT_MSG( IsSingleLine(), _T("doesn't work for multiline") );
+    wxASSERT_MSG( IsSingleLine(), wxT("doesn't work for multiline") );

 
     // pos is the logical position to show
 
 
     // pos is the logical position to show
 

-    // SData().m_ofsHorz is the fisrt logical position shown
+    // SData().m_ofsHorz is the first logical position shown

     if ( pos < SData().m_ofsHorz )
     {
         // scroll backwards
     if ( pos < SData().m_ofsHorz )
     {
         // scroll backwards


@@ -3273,7 +3314,7 @@ void wxTextCtrl::ShowHorzPosition(wxCoord pos)
 void wxTextCtrl::ScrollText(wxTextCoord col)
 {
     wxASSERT_MSG( IsSingleLine(),
 void wxTextCtrl::ScrollText(wxTextCoord col)
 {
     wxASSERT_MSG( IsSingleLine(),

-                  _T("ScrollText() is for single line controls only") );
+                  wxT("ScrollText() is for single line controls only") );

 
     // never scroll beyond the left border
     if ( col < 0 )
 
     // never scroll beyond the left border
     if ( col < 0 )


@@ -3468,7 +3509,7 @@ void wxTextCtrl::RecalcFontMetrics()
 
 void wxTextCtrl::RecalcMaxWidth()
 {
 
 void wxTextCtrl::RecalcMaxWidth()
 {

-    wxASSERT_MSG( !IsSingleLine(), _T("only used for multiline") );
+    wxASSERT_MSG( !IsSingleLine(), wxT("only used for multiline") );

 
     MData().m_widthMax = -1;
     (void)GetMaxWidth();
 
     MData().m_widthMax = -1;
     (void)GetMaxWidth();


@@ -3502,14 +3543,14 @@ wxCoord wxTextCtrl::GetMaxWidth() const
         }
     }
 
         }
     }
 

-    wxASSERT_MSG( MData().m_widthMax != -1, _T("should have at least 1 line") );
+    wxASSERT_MSG( MData().m_widthMax != -1, wxT("should have at least 1 line") );

 
     return MData().m_widthMax;
 }
 
 void wxTextCtrl::UpdateScrollbars()
 {
 
     return MData().m_widthMax;
 }
 
 void wxTextCtrl::UpdateScrollbars()
 {

-    wxASSERT_MSG( !IsSingleLine(), _T("only used for multiline") );
+    wxASSERT_MSG( !IsSingleLine(), wxT("only used for multiline") );

 
     wxSize size = GetRealTextArea().GetSize();
 
 
     wxSize size = GetRealTextArea().GetSize();
 


@@ -3573,8 +3614,12 @@ void wxTextCtrl::UpdateScrollbars()
 
         if ( scrollRangeXOld )
         {
 
         if ( scrollRangeXOld )
         {

-            x *= scrollRangeX - m_rectText.width / charWidth;
-            x /= scrollRangeXOld - m_rectText.width / charWidth;
+            const int w = m_rectText.width / charWidth;
+            if ( w != scrollRangeXOld )
+            {
+                x *= scrollRangeX - w;
+                x /= scrollRangeXOld - w;
+            }

             Scroll(x, y);
         }
 
             Scroll(x, y);
         }
 


@@ -3628,7 +3673,7 @@ void wxTextCtrl::RefreshSelection()
 void wxTextCtrl::RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast)
 {
     wxASSERT_MSG( lineFirst <= lineLast || !lineLast,
 void wxTextCtrl::RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast)
 {
     wxASSERT_MSG( lineFirst <= lineLast || !lineLast,

-                  _T("no lines to refresh") );
+                  wxT("no lines to refresh") );

 
     wxRect rect;
     // rect.x is already 0
 
     wxRect rect;
     // rect.x is already 0


@@ -3645,7 +3690,7 @@ void wxTextCtrl::RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast)
         // lineFirst may be beyond the last line only if we refresh till
         // the end, otherwise it's illegal
         wxASSERT_MSG( lineFirst == GetNumberOfLines() && !lineLast,
         // lineFirst may be beyond the last line only if we refresh till
         // the end, otherwise it's illegal
         wxASSERT_MSG( lineFirst == GetNumberOfLines() && !lineLast,

-                      _T("invalid line range") );
+                      wxT("invalid line range") );

 
         rowFirst = GetRowAfterLine(lineFirst - 1);
     }
 
         rowFirst = GetRowAfterLine(lineFirst - 1);
     }


@@ -3671,7 +3716,7 @@ void wxTextCtrl::RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast)
 void wxTextCtrl::RefreshTextRange(wxTextPos start, wxTextPos end)
 {
     wxCHECK_RET( start != -1 && end != -1,
 void wxTextCtrl::RefreshTextRange(wxTextPos start, wxTextPos end)
 {
     wxCHECK_RET( start != -1 && end != -1,

-                 _T("invalid RefreshTextRange() arguments") );
+                 wxT("invalid RefreshTextRange() arguments") );

 
     // accept arguments in any order as it is more conenient for the caller
     OrderPositions(start, end);
 
     // accept arguments in any order as it is more conenient for the caller
     OrderPositions(start, end);


@@ -3707,7 +3752,7 @@ void wxTextCtrl::RefreshTextRange(wxTextPos start, wxTextPos end)
         {
             // intermediate line or the last one but we need to refresh it
             // until the end anyhow - do it
         {
             // intermediate line or the last one but we need to refresh it
             // until the end anyhow - do it

-            posCount = wxSTRING_MAXLEN;
+            posCount = wxString::npos;

         }
         else // last line
         {
         }
         else // last line
         {


@@ -3727,7 +3772,7 @@ void wxTextCtrl::RefreshColRange(wxTextCoord line,
     wxString text = GetLineText(line);
 
     wxASSERT_MSG( (size_t)start <= text.length() && count,
     wxString text = GetLineText(line);
 
     wxASSERT_MSG( (size_t)start <= text.length() && count,

-                  _T("invalid RefreshColRange() parameter") );
+                  wxT("invalid RefreshColRange() parameter") );

 
     RefreshPixelRange(line,
                       GetTextWidth(text.Left((size_t)start)),
 
     RefreshPixelRange(line,
                       GetTextWidth(text.Left((size_t)start)),


@@ -3859,7 +3904,7 @@ void wxTextCtrl::RefreshTextRect(const wxRect& rectClient, bool textOnly)
     if ( rect.y < m_rectText.y )
         rect.y = m_rectText.y;
 
     if ( rect.y < m_rectText.y )
         rect.y = m_rectText.y;
 

-    wxLogTrace(_T("text"), _T("Refreshing (%d, %d)-(%d, %d)"),
+    wxLogTrace(wxT("text"), wxT("Refreshing (%d, %d)-(%d, %d)"),

                rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 
     Refresh(true, &rect);
                rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 
     Refresh(true, &rect);


@@ -3909,7 +3954,7 @@ wxString wxTextCtrl::GetTextToShow(const wxString& text) const
 {
     wxString textShown;
     if ( IsPassword() )
 {
     wxString textShown;
     if ( IsPassword() )

-        textShown = wxString(_T('*'), text.length());
+        textShown = wxString(wxT('*'), text.length());

     else
         textShown = text;
 
     else
         textShown = text;
 


@@ -3988,7 +4033,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate)
 
         if ( (ht == wxTE_HT_BEYOND) || (ht == wxTE_HT_BELOW) )
         {
 
         if ( (ht == wxTE_HT_BEYOND) || (ht == wxTE_HT_BELOW) )
         {

-            wxASSERT_MSG( line <= lineEnd, _T("how did we get that far?") );
+            wxASSERT_MSG( line <= lineEnd, wxT("how did we get that far?") );

 
             if ( line == lineEnd )
             {
 
             if ( line == lineEnd )
             {


@@ -4069,7 +4114,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate)
         }
 
         // calculate the text coords on screen
         }
 
         // calculate the text coords on screen

-        wxASSERT_MSG( colStart >= colRowStart, _T("invalid string part") );
+        wxASSERT_MSG( colStart >= colRowStart, wxT("invalid string part") );

         wxCoord ofsStart = GetTextWidth(
                                     textLine.Mid(colRowStart,
                                                  colStart - colRowStart));
         wxCoord ofsStart = GetTextWidth(
                                     textLine.Mid(colRowStart,
                                                  colStart - colRowStart));


@@ -4079,7 +4124,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate)
         // do draw the text
         renderer->DrawTextLine(dc, text, rectText, selStart, selEnd,
                                GetStateFlags());
         // do draw the text
         renderer->DrawTextLine(dc, text, rectText, selStart, selEnd,
                                GetStateFlags());

-        wxLogTrace(_T("text"), _T("Line %ld: positions %ld-%ld redrawn."),
+        wxLogTrace(wxT("text"), wxT("Line %ld: positions %ld-%ld redrawn."),

                    line, colStart, colEnd);
     }
 }
                    line, colStart, colEnd);
     }
 }


@@ -4087,7 +4132,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate)
 void wxTextCtrl::DoDrawLineWrapMarks(wxDC& dc, const wxRect& rectUpdate)
 {
     wxASSERT_MSG( WrapLines() && WData().m_widthMark,
 void wxTextCtrl::DoDrawLineWrapMarks(wxDC& dc, const wxRect& rectUpdate)
 {
     wxASSERT_MSG( WrapLines() && WData().m_widthMark,

-                  _T("shouldn't be called at all") );
+                  wxT("shouldn't be called at all") );

 
     wxRenderer *renderer = GetRenderer();
 
 
     wxRenderer *renderer = GetRenderer();
 


@@ -4151,6 +4196,7 @@ void wxTextCtrl::DoDraw(wxControlRenderer *renderer)
     // FIXME: is this really a bug in wxMSW?
     rectTextArea.width--;
 #endif // __WXMSW__
     // FIXME: is this really a bug in wxMSW?
     rectTextArea.width--;
 #endif // __WXMSW__

+    dc.DestroyClippingRegion();

     dc.SetClippingRegion(rectTextArea);
 
     // adjust for scrolling
     dc.SetClippingRegion(rectTextArea);
 
     // adjust for scrolling


@@ -4258,14 +4304,11 @@ void wxTextCtrl::CreateCaret()
     {
         // FIXME use renderer
         caret = new wxCaret(this, 1, GetLineHeight());
     {
         // FIXME use renderer
         caret = new wxCaret(this, 1, GetLineHeight());

-#ifndef __WXMSW__
-        caret->SetBlinkTime(0);
-#endif // __WXMSW__

     }
     else
     {
         // read only controls don't have the caret
     }
     else
     {
         // read only controls don't have the caret

-        caret = (wxCaret *)NULL;
+        caret = NULL;

     }
 
     // SetCaret() will delete the old caret if any
     }
 
     // SetCaret() will delete the old caret if any


@@ -4302,7 +4345,7 @@ size_t wxTextCtrl::GetLinesPerPage() const
 wxTextPos wxTextCtrl::GetPositionAbove()
 {
     wxCHECK_MSG( !IsSingleLine(), INVALID_POS_VALUE,
 wxTextPos wxTextCtrl::GetPositionAbove()
 {
     wxCHECK_MSG( !IsSingleLine(), INVALID_POS_VALUE,

-                 _T("can't move cursor vertically in a single line control") );
+                 wxT("can't move cursor vertically in a single line control") );

 
     // move the cursor up by one ROW not by one LINE: this means that
     // we should really use HitTest() and not just go to the same
 
     // move the cursor up by one ROW not by one LINE: this means that
     // we should really use HitTest() and not just go to the same


@@ -4335,7 +4378,7 @@ wxTextPos wxTextCtrl::GetPositionAbove()
 wxTextPos wxTextCtrl::GetPositionBelow()
 {
     wxCHECK_MSG( !IsSingleLine(), INVALID_POS_VALUE,
 wxTextPos wxTextCtrl::GetPositionBelow()
 {
     wxCHECK_MSG( !IsSingleLine(), INVALID_POS_VALUE,

-                 _T("can't move cursor vertically in a single line control") );
+                 wxT("can't move cursor vertically in a single line control") );

 
     // see comments for wxACTION_TEXT_UP
     wxPoint pt = GetCaretPosition() - m_rectText.GetPosition();
 
     // see comments for wxACTION_TEXT_UP
     wxPoint pt = GetCaretPosition() - m_rectText.GetPosition();


@@ -4384,7 +4427,7 @@ bool wxTextCtrl::PerformAction(const wxControlAction& actionOrig,
 
     // the command this action corresponds to or NULL if this action doesn't
     // change text at all or can't be undone
 
     // the command this action corresponds to or NULL if this action doesn't
     // change text at all or can't be undone

-    wxTextCtrlCommand *command = (wxTextCtrlCommand *)NULL;
+    wxTextCtrlCommand *command = NULL;

 
     wxString action;
     bool del = false,
 
     wxString action;
     bool del = false,


@@ -4664,7 +4707,7 @@ bool wxTextCtrl::PerformAction(const wxControlAction& actionOrig,
 
     if ( textChanged )
     {
 
     if ( textChanged )
     {

-        wxASSERT_MSG( IsEditable(), _T("non editable control changed?") );
+        wxASSERT_MSG( IsEditable(), wxT("non editable control changed?") );

 
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
         InitCommandEvent(event);
 
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
         InitCommandEvent(event);


@@ -4697,7 +4740,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             }
             else // interpret <Enter> normally: insert new line
             {
             }
             else // interpret <Enter> normally: insert new line
             {

-                PerformAction(wxACTION_TEXT_INSERT, -1, _T('\n'));
+                PerformAction(wxACTION_TEXT_INSERT, -1, wxT('\n'));

             }
         }
         else if ( keycode < 255 && isprint(keycode) )
             }
         }
         else if ( keycode < 255 && isprint(keycode) )


@@ -4716,15 +4759,23 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         }
 #endif
     }
         }
 #endif
     }

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL >= 2

     // Ctrl-R refreshes the control in debug mode
     else if ( event.ControlDown() && event.GetKeyCode() == 'r' )
         Refresh();
     // Ctrl-R refreshes the control in debug mode
     else if ( event.ControlDown() && event.GetKeyCode() == 'r' )
         Refresh();

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL >= 2

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

+/* static */
+wxInputHandler *wxTextCtrl::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+    static wxStdTextCtrlInputHandler s_handler(handlerDef);
+
+    return &s_handler;
+}
+

 // ----------------------------------------------------------------------------
 // wxStdTextCtrlInputHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStdTextCtrlInputHandler
 // ----------------------------------------------------------------------------


@@ -4732,7 +4783,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 wxStdTextCtrlInputHandler::wxStdTextCtrlInputHandler(wxInputHandler *inphand)
                          : wxStdInputHandler(inphand)
 {
 wxStdTextCtrlInputHandler::wxStdTextCtrlInputHandler(wxInputHandler *inphand)
                          : wxStdInputHandler(inphand)
 {

-    m_winCapture = (wxTextCtrl *)NULL;
+    m_winCapture = NULL;

 }
 
 /* static */
 }
 
 /* static */


@@ -4882,7 +4933,7 @@ bool wxStdTextCtrlInputHandler::HandleMouse(wxInputConsumer *consumer,
 {
     if ( event.LeftDown() )
     {
 {
     if ( event.LeftDown() )
     {

-        wxASSERT_MSG( !m_winCapture, _T("left button going down twice?") );
+        wxASSERT_MSG( !m_winCapture, wxT("left button going down twice?") );

 
         wxTextCtrl *text = wxStaticCast(consumer->GetInputWindow(), wxTextCtrl);
 
 
         wxTextCtrl *text = wxStaticCast(consumer->GetInputWindow(), wxTextCtrl);
 


@@ -4909,7 +4960,7 @@ bool wxStdTextCtrlInputHandler::HandleMouse(wxInputConsumer *consumer,
             m_winCapture->ShowCaret();
 
             m_winCapture->ReleaseMouse();
             m_winCapture->ShowCaret();
 
             m_winCapture->ReleaseMouse();

-            m_winCapture = (wxTextCtrl *)NULL;
+            m_winCapture = NULL;

         }
     }
 
         }
     }