X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64accea5fae6a4ad5303d2b513043fd39a3b383b..ef8f6d9590b7f9c73dcdfac244647c6e88ebd2ec:/src/msw/fontutil.cpp diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 22b4a62101..5bacd8241e 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -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: