Add wxBITMAP_PNG() macro similar to wxBITMAP() but for PNG images.

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

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index bc625f70a7bbcb5dd31964a2104776a0503ba5c7..041ea21d516a17f5a62c58d68ecb09bbdcfaa429 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -149,16 +149,13 @@
 
 #include "wx/cmdproc.h"
 
 
 #include "wx/cmdproc.h"
 

-// turn extra wxTextCtrl-specific debugging on/off
-#define WXDEBUG_TEXT
+#if wxDEBUG_LEVEL >= 2
+    // turn extra wxTextCtrl-specific debugging on/off
+    #define WXDEBUG_TEXT

 
 

-// turn wxTextCtrl::Replace() debugging on (slows down code a *lot*!)
-#define WXDEBUG_TEXT_REPLACE
-
-#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
 
 // wxStringTokenize only needed for debug checks
 #ifdef WXDEBUG_TEXT_REPLACE


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


@@ -318,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;
     }


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


@@ -340,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];
     }


@@ -348,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;
     }


@@ -356,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();
     }


@@ -364,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;
     }


@@ -372,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;
     }


@@ -380,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];
     }


@@ -411,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;
     }


@@ -525,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;


@@ -636,8 +633,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxTextCtrl::OnSize)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-

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


@@ -745,7 +740,7 @@ 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();
     }
 
     RecalcFontMetrics();


@@ -837,7 +832,7 @@ wxString wxTextCtrl::DoGetValue() 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];

         }
     }
 
         }
     }
 


@@ -952,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;
     }


@@ -1039,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];


@@ -1060,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
         {


@@ -1086,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 )


@@ -1099,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() )


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


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


@@ -1267,8 +1262,7 @@ 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();
 

-    if ( EventsAllowed() )
-        SendTextUpdatedEvent();
+    SendTextUpdatedEventIfAllowed();

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


@@ -1301,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 )


@@ -1331,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);


@@ -1381,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;


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


@@ -1471,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 )
         {


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


@@ -1657,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();
     }


@@ -1674,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;
     }


@@ -1684,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];
     }


@@ -1766,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;


@@ -1904,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);


@@ -2285,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());


@@ -2322,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();
 }


@@ -2330,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();
 }


@@ -2461,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:


@@ -2497,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);
 }
 


@@ -2569,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];
 


@@ -2597,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;


@@ -2638,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 )


@@ -2696,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;


@@ -2708,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:


@@ -2948,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++;


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


@@ -3281,7 +3275,7 @@ 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
 


@@ -3320,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 )


@@ -3515,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();


@@ -3549,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();
 


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


@@ -3696,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);
     }


@@ -3722,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);


@@ -3778,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)),


@@ -3910,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);


@@ -3960,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;
 


@@ -4039,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 )
             {


@@ -4120,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));


@@ -4130,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);
     }
 }


@@ -4138,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();
 


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


@@ -4384,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();


@@ -4713,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);


@@ -4746,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) )


@@ -4765,11 +4759,11 @@ 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();
 }


@@ -4939,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);