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

42
src/gtk1/font.cpp
View File

@@ -179,17 +179,17 @@ void wxFontRefData::InitFromNative()
m_weight = wxFONTWEIGHT_NORMAL;
wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
if ( !w.empty() && w != _T('*') )
if ( !w.empty() && w != wxT('*') )
{
// the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
// and BLACK
if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
if ( ((w[0u] == wxT('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
!wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
wxStrstr(w.c_str() + 1, _T("BOLD")) )
wxStrstr(w.c_str() + 1, wxT("BOLD")) )
{
m_weight = wxFONTWEIGHT_BOLD;
}
else if ( w == _T("LIGHT") || w == _T("THIN") )
else if ( w == wxT("LIGHT") || w == wxT("THIN") )
{
m_weight = wxFONTWEIGHT_LIGHT;
}
@@ -198,11 +198,11 @@ void wxFontRefData::InitFromNative()
switch ( wxToupper(m_nativeFontInfo.
GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
{
case _T('I'): // italique
case wxT('I'): // italique
m_style = wxFONTSTYLE_ITALIC;
break;
case _T('O'): // oblique
case wxT('O'): // oblique
m_style = wxFONTSTYLE_SLANT;
break;
@@ -224,7 +224,7 @@ void wxFontRefData::InitFromNative()
// examine the spacing: if the font is monospaced, assume wxTELETYPE
// family for compatibility with the old code which used it instead of
// IsFixedWidth()
if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') )
if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == wxT('M') )
{
m_family = wxFONTFAMILY_TELETYPE;
}
@@ -243,7 +243,7 @@ void wxFontRefData::InitFromNative()
registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
if ( registry == _T("ISO8859") )
if ( registry == wxT("ISO8859") )
{
int cp;
if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
@@ -251,7 +251,7 @@ void wxFontRefData::InitFromNative()
m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
}
}
else if ( registry == _T("MICROSOFT") )
else if ( registry == wxT("MICROSOFT") )
{
int cp;
if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
@@ -259,7 +259,7 @@ void wxFontRefData::InitFromNative()
m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
}
}
else if ( registry == _T("KOI8") )
else if ( registry == wxT("KOI8") )
{
m_encoding = wxFONTENCODING_KOI8;
}
@@ -337,9 +337,9 @@ void wxFontRefData::SetPointSize(int pointSize)
{
wxString size;
if ( pointSize == -1 )
size = _T('*');
size = wxT('*');
else
size.Printf(_T("%d"), 10*pointSize);
size.Printf(wxT("%d"), 10*pointSize);
m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
}
@@ -362,19 +362,19 @@ void wxFontRefData::SetStyle(wxFontStyle style)
switch ( style )
{
case wxFONTSTYLE_ITALIC:
slant = _T('i');
slant = wxT('i');
break;
case wxFONTSTYLE_SLANT:
slant = _T('o');
slant = wxT('o');
break;
default:
wxFAIL_MSG( _T("unknown font style") );
wxFAIL_MSG( wxT("unknown font style") );
// fall through
case wxFONTSTYLE_NORMAL:
slant = _T('r');
slant = wxT('r');
}
m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
@@ -391,20 +391,20 @@ void wxFontRefData::SetWeight(wxFontWeight weight)
switch ( weight )
{
case wxFONTWEIGHT_BOLD:
boldness = _T("bold");
boldness = wxT("bold");
break;
case wxFONTWEIGHT_LIGHT:
boldness = _T("light");
boldness = wxT("light");
break;
default:
wxFAIL_MSG( _T("unknown font weight") );
wxFAIL_MSG( wxT("unknown font weight") );
// fall through
case wxFONTWEIGHT_NORMAL:
// unspecified
boldness = _T("medium");
boldness = wxT("medium");
}
m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
@@ -612,7 +612,7 @@ bool wxFont::IsFixedWidth() const
wxString spacing = M_FONTDATA->
m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
return spacing.Upper() == _T('M');
return spacing.Upper() == wxT('M');
}
return wxFontBase::IsFixedWidth();