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

12
src/msw/fontutil.cpp
View File

@@ -57,7 +57,7 @@
bool wxNativeEncodingInfo::FromString(const wxString& s)
{
wxStringTokenizer tokenizer(s, _T(";"));
wxStringTokenizer tokenizer(s, wxT(";"));
wxString encid = tokenizer.GetNextToken();
@@ -96,7 +96,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
}
else
{
if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 )
{
// should be a number!
return false;
@@ -120,12 +120,12 @@ wxString wxNativeEncodingInfo::ToString() const
// we don't have any choice but to use the raw value
<< (long)encoding
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
<< _T(';') << facename;
<< wxT(';') << facename;
// ANSI_CHARSET is assumed anyhow
if ( charset != ANSI_CHARSET )
{
s << _T(';') << charset;
s << wxT(';') << charset;
}
return s;
@@ -138,7 +138,7 @@ wxString wxNativeEncodingInfo::ToString() const
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") );
wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );
if ( encoding == wxFONTENCODING_DEFAULT )
{
@@ -187,7 +187,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
switch ( cs )
{
default:
wxFAIL_MSG( _T("unexpected Win32 charset") );
wxFAIL_MSG( wxT("unexpected Win32 charset") );
// fall through and assume the system charset
case DEFAULT_CHARSET: