X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbfa728a078e376ae6d91e27c9ba4276cf6b8082..a1d6c5df6f91f034663953fb5d43daa1b65187f3:/src/univ/textctrl.cpp diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 00e987b800..041ea21d51 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -149,16 +149,13 @@ #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 @@ -212,8 +209,8 @@ static inline void OrderPositions(wxTextPos& from, wxTextPos& to) // ---------------------------------------------------------------------------- // 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 @@ -318,7 +315,7 @@ public: // 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; } @@ -328,7 +325,7 @@ public: // 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 @@ -340,7 +337,7 @@ public: // 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]; } @@ -348,7 +345,7 @@ public: // 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; } @@ -356,7 +353,7 @@ public: // 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(); } @@ -364,7 +361,7 @@ public: // 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; } @@ -372,7 +369,7 @@ public: // 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; } @@ -380,7 +377,7 @@ public: // 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]; } @@ -411,14 +408,14 @@ public: : 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 - 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; } @@ -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 - 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; @@ -636,8 +633,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_SIZE(wxTextCtrl::OnSize) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) - // ---------------------------------------------------------------------------- // 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), - _T("wxTE_PASSWORD can't be used with multiline ctrls") ); + wxT("wxTE_PASSWORD can't be used with multiline ctrls") ); } RecalcFontMetrics(); @@ -790,21 +785,23 @@ wxTextCtrl::~wxTextCtrl() 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(); } - - if ( flags & SetValue_SendEvent ) - SendTextUpdatedEvent(); } const wxArrayString& wxTextCtrl::GetLines() const @@ -817,7 +814,7 @@ size_t wxTextCtrl::GetLineCount() const 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 @@ -835,7 +832,7 @@ wxString wxTextCtrl::GetValue() const 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]; } } @@ -950,7 +947,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text) !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; } @@ -1037,7 +1034,7 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text) if ( line > lineStart ) { // from the previous line - textOrig += _T('\n'); + textOrig += wxT('\n'); } textOrig += linesOld[line]; @@ -1058,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 - widthNewText = GetTextWidth(text.BeforeFirst(_T('\n'))); + widthNewText = GetTextWidth(text.BeforeFirst(wxT('\n'))); } else // text inserted, refresh till the end of line { @@ -1084,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? - if ( !*p || *p == _T('\n') ) + if ( !*p || *p == wxT('\n') ) { lines.Add(wxString(curLineStart, p)); if ( !*p ) @@ -1097,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 - wxArrayString lines2 = wxStringTokenize(textNew, _T("\n"), + wxArrayString lines2 = wxStringTokenize(textNew, wxT("\n"), wxTOKEN_RET_EMPTY_ALL); if ( lines2.IsEmpty() ) @@ -1106,10 +1103,10 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text) } wxASSERT_MSG( lines.GetCount() == lines2.GetCount(), - _T("Replace() broken") ); + wxT("Replace() broken") ); 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 @@ -1240,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 - 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 @@ -1264,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(); + + SendTextUpdatedEventIfAllowed(); } void wxTextCtrl::Remove(wxTextPos from, wxTextPos to) @@ -1296,7 +1295,7 @@ void wxTextCtrl::AppendText(const wxString& text) 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 ) @@ -1326,7 +1325,7 @@ void wxTextCtrl::InitInsertionPoint() 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); @@ -1376,7 +1375,7 @@ wxTextPos wxTextCtrl::GetLastPosition() const } // 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; @@ -1424,12 +1423,12 @@ wxString wxTextCtrl::GetSelectionText() const { // 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++ ) { - sel << GetLines()[line] << _T('\n'); + sel << GetLines()[line] << wxT('\n'); } // and the start of the last one @@ -1466,7 +1465,7 @@ void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to) 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 ) { @@ -1478,7 +1477,7 @@ void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos 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 @@ -1652,14 +1651,14 @@ int wxTextCtrl::GetLineLength(wxTextCoord line) const { 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, - _T("line index out of range") ); + wxT("line index out of range") ); return GetLines()[line].length(); } @@ -1669,7 +1668,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const { if ( IsSingleLine() ) { - wxASSERT_MSG( line == 0, _T("invalid GetLineLength() parameter") ); + wxASSERT_MSG( line == 0, wxT("invalid GetLineLength() parameter") ); return m_value; } @@ -1679,7 +1678,7 @@ wxString wxTextCtrl::GetLineText(wxTextCoord line) const 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]; } @@ -1761,7 +1760,7 @@ bool wxTextCtrl::PositionToXY(wxTextPos 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; @@ -1899,7 +1898,7 @@ wxPoint wxTextCtrl::GetCaretPosition() const 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); @@ -2280,7 +2279,7 @@ bool wxTextCtrlInsertCommand::Do(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()); @@ -2317,7 +2316,7 @@ bool wxTextCtrlRemoveCommand::Undo(wxTextCtrl *text) 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(); } @@ -2325,7 +2324,7 @@ void wxTextCtrl::Undo() 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(); } @@ -2456,7 +2455,7 @@ void wxTextCtrl::UpdateLastVisible() 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: @@ -2492,7 +2491,7 @@ void wxTextCtrl::UpdateLastVisible() // 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); } @@ -2564,7 +2563,7 @@ wxTextCoord wxTextCtrl::GetRowInLine(wxTextCoord line, 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]; @@ -2592,7 +2591,7 @@ wxTextCoord wxTextCtrl::GetRowInLine(wxTextCoord line, *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; @@ -2633,12 +2632,12 @@ void wxTextCtrl::LayoutLine(wxTextCoord line, wxWrappedLineData& lineData) 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; - wxASSERT_MSG( lineFirst != -1, _T("nothing to layout?") ); + wxASSERT_MSG( lineFirst != -1, wxT("nothing to layout?") ); wxTextCoord rowFirst, rowCur; if ( lineFirst ) @@ -2691,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 - wxASSERT_MSG( WrapLines(), _T("shouldn't be called") ); + wxASSERT_MSG( WrapLines(), wxT("shouldn't be called") ); wxString s(text); wxTextCoord col; @@ -2703,7 +2702,7 @@ size_t wxTextCtrl::GetPartOfWrappedLine(const wxChar* text, 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: @@ -2943,7 +2942,7 @@ wxTextCtrlHitTestResult wxTextCtrl::HitTestLine(const wxString& line, } // 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++; @@ -2967,11 +2966,11 @@ wxTextCtrlHitTestResult wxTextCtrl::HitTestLine(const wxString& line, dc.GetTextExtent(text, &width2, NULL); wxASSERT_MSG( (width1 <= x) && (x < width2), - _T("incorrect HitTestLine() result") ); + wxT("incorrect HitTestLine() result") ); } else // we return last char { - wxASSERT_MSG( x >= width1, _T("incorrect HitTestLine() result") ); + wxASSERT_MSG( x >= width1, wxT("incorrect HitTestLine() result") ); } } #endif // WXDEBUG_TEXT @@ -3276,7 +3275,7 @@ bool wxTextCtrl::GetLineAndRow(wxTextCoord row, 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 @@ -3315,7 +3314,7 @@ void wxTextCtrl::ShowHorzPosition(wxCoord pos) 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 ) @@ -3510,7 +3509,7 @@ void wxTextCtrl::RecalcFontMetrics() 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(); @@ -3544,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() { - wxASSERT_MSG( !IsSingleLine(), _T("only used for multiline") ); + wxASSERT_MSG( !IsSingleLine(), wxT("only used for multiline") ); wxSize size = GetRealTextArea().GetSize(); @@ -3674,7 +3673,7 @@ void wxTextCtrl::RefreshSelection() 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 @@ -3691,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, - _T("invalid line range") ); + wxT("invalid line range") ); rowFirst = GetRowAfterLine(lineFirst - 1); } @@ -3717,7 +3716,7 @@ void wxTextCtrl::RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast) 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); @@ -3773,7 +3772,7 @@ void wxTextCtrl::RefreshColRange(wxTextCoord line, 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)), @@ -3905,7 +3904,7 @@ void wxTextCtrl::RefreshTextRect(const wxRect& rectClient, bool textOnly) 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); @@ -3955,7 +3954,7 @@ wxString wxTextCtrl::GetTextToShow(const wxString& text) const { wxString textShown; if ( IsPassword() ) - textShown = wxString(_T('*'), text.length()); + textShown = wxString(wxT('*'), text.length()); else textShown = text; @@ -4034,7 +4033,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate) 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 ) { @@ -4115,7 +4114,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate) } // 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)); @@ -4125,7 +4124,7 @@ void wxTextCtrl::DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate) // 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); } } @@ -4133,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, - _T("shouldn't be called at all") ); + wxT("shouldn't be called at all") ); wxRenderer *renderer = GetRenderer(); @@ -4309,7 +4308,7 @@ void wxTextCtrl::CreateCaret() else { // read only controls don't have the caret - caret = (wxCaret *)NULL; + caret = NULL; } // SetCaret() will delete the old caret if any @@ -4346,7 +4345,7 @@ size_t wxTextCtrl::GetLinesPerPage() const 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 @@ -4379,7 +4378,7 @@ wxTextPos wxTextCtrl::GetPositionAbove() 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(); @@ -4428,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 - wxTextCtrlCommand *command = (wxTextCtrlCommand *)NULL; + wxTextCtrlCommand *command = NULL; wxString action; bool del = false, @@ -4708,7 +4707,7 @@ bool wxTextCtrl::PerformAction(const wxControlAction& actionOrig, 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); @@ -4741,7 +4740,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) } else // interpret normally: insert new line { - PerformAction(wxACTION_TEXT_INSERT, -1, _T('\n')); + PerformAction(wxACTION_TEXT_INSERT, -1, wxT('\n')); } } else if ( keycode < 255 && isprint(keycode) ) @@ -4760,11 +4759,11 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) } #endif } -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL >= 2 // Ctrl-R refreshes the control in debug mode else if ( event.ControlDown() && event.GetKeyCode() == 'r' ) Refresh(); -#endif // __WXDEBUG__ +#endif // wxDEBUG_LEVEL >= 2 event.Skip(); } @@ -4784,7 +4783,7 @@ wxInputHandler *wxTextCtrl::GetStdInputHandler(wxInputHandler *handlerDef) wxStdTextCtrlInputHandler::wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) { - m_winCapture = (wxTextCtrl *)NULL; + m_winCapture = NULL; } /* static */ @@ -4934,7 +4933,7 @@ bool wxStdTextCtrlInputHandler::HandleMouse(wxInputConsumer *consumer, { 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); @@ -4961,7 +4960,7 @@ bool wxStdTextCtrlInputHandler::HandleMouse(wxInputConsumer *consumer, m_winCapture->ShowCaret(); m_winCapture->ReleaseMouse(); - m_winCapture = (wxTextCtrl *)NULL; + m_winCapture = NULL; } }