Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Globally replace _T() with wxT().

Browse Source 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-23 20:30:22 +00:00
parent 32cdc45397
commit 9a83f86094
798 changed files with 10370 additions and 10349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/generic/grideditors.cpp
View File

@@ -604,7 +604,7 @@ void wxGridCellTextEditor::SetParameters(const wxString& params)
}
else
{
wxLogDebug( _T("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
wxLogDebug( wxT("Invalid wxGridCellTextEditor parameter string '%s' ignored"), params.c_str() );
}
}
}
@@ -666,7 +666,7 @@ void wxGridCellNumberEditor::BeginEdit(int row, int col, wxGrid* grid)
wxString sValue = table->GetValue(row, col);
if (! sValue.ToLong(&m_value) && ! sValue.empty())
{
wxFAIL_MSG( _T("this cell doesn't have numeric value") );
wxFAIL_MSG( wxT("this cell doesn't have numeric value") );
return;
}
}
@@ -808,11 +808,11 @@ void wxGridCellNumberEditor::SetParameters(const wxString& params)
else
{
long tmp;
if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) )
{
m_min = (int)tmp;
if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
if ( params.AfterFirst(wxT(',')).ToLong(&tmp) )
{
m_max = (int)tmp;
@@ -821,7 +821,7 @@ void wxGridCellNumberEditor::SetParameters(const wxString& params)
}
}
wxLogDebug(_T("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
wxLogDebug(wxT("Invalid wxGridCellNumberEditor parameter string '%s' ignored"), params.c_str());
}
}
@@ -883,7 +883,7 @@ void wxGridCellFloatEditor::BeginEdit(int row, int col, wxGrid* grid)
{
if ( !value.ToDouble(&m_value) )
{
wxFAIL_MSG( _T("this cell doesn't have float value") );
wxFAIL_MSG( wxT("this cell doesn't have float value") );
return;
}
}
@@ -953,7 +953,7 @@ void wxGridCellFloatEditor::StartingKey(wxKeyEvent& event)
bool is_decimal_point = ( strbuf ==
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER) );
#else
bool is_decimal_point = ( strbuf == _T(".") );
bool is_decimal_point = ( strbuf == wxT(".") );
#endif
if ( wxIsdigit(keycode) || keycode == '+' || keycode == '-'
@@ -979,11 +979,11 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params)
else
{
long tmp;
if ( params.BeforeFirst(_T(',')).ToLong(&tmp) )
if ( params.BeforeFirst(wxT(',')).ToLong(&tmp) )
{
m_width = (int)tmp;
if ( params.AfterFirst(_T(',')).ToLong(&tmp) )
if ( params.AfterFirst(wxT(',')).ToLong(&tmp) )
{
m_precision = (int)tmp;
@@ -992,7 +992,7 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params)
}
}
wxLogDebug(_T("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
wxLogDebug(wxT("Invalid wxGridCellFloatEditor parameter string '%s' ignored"), params.c_str());
}
}
@@ -1002,21 +1002,21 @@ wxString wxGridCellFloatEditor::GetString() const
if ( m_precision == -1 && m_width != -1)
{
// default precision
fmt.Printf(_T("%%%d.f"), m_width);
fmt.Printf(wxT("%%%d.f"), m_width);
}
else if ( m_precision != -1 && m_width == -1)
{
// default width
fmt.Printf(_T("%%.%df"), m_precision);
fmt.Printf(wxT("%%.%df"), m_precision);
}
else if ( m_precision != -1 && m_width != -1 )
{
fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
fmt.Printf(wxT("%%%d.%df"), m_width, m_precision);
}
else
{
// default width/precision
fmt = _T("%f");
fmt = wxT("%f");
}
return wxString::Format(fmt, m_value);
@@ -1038,7 +1038,7 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
const wxString decimalPoint =
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
#else
const wxString decimalPoint(_T('.'));
const wxString decimalPoint(wxT('.'));
#endif
// accept digits, 'e' as in '1e+6', also '-', '+', and '.'
@@ -1065,7 +1065,7 @@ bool wxGridCellFloatEditor::IsAcceptedKey(wxKeyEvent& event)
// ----------------------------------------------------------------------------
// the default values for GetValue()
wxString wxGridCellBoolEditor::ms_stringValues[2] = { _T(""), _T("1") };
wxString wxGridCellBoolEditor::ms_stringValues[2] = { wxT(""), wxT("1") };
void wxGridCellBoolEditor::Create(wxWindow* parent,
wxWindowID id,
@@ -1183,7 +1183,7 @@ void wxGridCellBoolEditor::BeginEdit(int row, int col, wxGrid* grid)
// because we'll still overwrite it with something different and
// this risks to be very surprising for the user code, let them
// know about it
wxFAIL_MSG( _T("invalid value for a cell with bool editor!") );
wxFAIL_MSG( wxT("invalid value for a cell with bool editor!") );
}
}
@@ -1432,7 +1432,7 @@ void wxGridCellChoiceEditor::SetParameters(const wxString& params)
m_choices.Empty();
wxStringTokenizer tk(params, _T(','));
wxStringTokenizer tk(params, wxT(','));
while ( tk.HasMoreTokens() )
{
m_choices.Add(tk.GetNextToken());