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

34
src/msw/registry.cpp
View File

@@ -314,7 +314,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
wxString str = bShortPrefix ? aStdKeys[key].szShortName
: aStdKeys[key].szName;
if ( !m_strKey.empty() )
str << _T("\\") << m_strKey;
str << wxT("\\") << m_strKey;
return str;
}
@@ -332,7 +332,7 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
#endif
// it might be unexpected to some that this function doesn't open the key
wxASSERT_MSG( IsOpened(), _T("key should be opened in GetKeyInfo") );
wxASSERT_MSG( IsOpened(), wxT("key should be opened in GetKeyInfo") );
m_dwLastError = ::RegQueryInfoKey
(
@@ -534,7 +534,7 @@ bool wxRegKey::CopyValue(const wxString& szValue,
bool wxRegKey::Rename(const wxString& szNewName)
{
wxCHECK_MSG( !m_strKey.empty(), false, _T("registry hives can't be renamed") );
wxCHECK_MSG( !m_strKey.empty(), false, wxT("registry hives can't be renamed") );
if ( !Exists() ) {
wxLogError(_("Registry key '%s' does not exist, cannot rename it."),
@@ -956,7 +956,7 @@ bool wxRegKey::QueryValue(const wxString& szValue,
if ( !ok )
{
wxLogLastError(_T("ExpandEnvironmentStrings"));
wxLogLastError(wxT("ExpandEnvironmentStrings"));
}
}
#endif
@@ -1161,7 +1161,7 @@ bool wxRegKey::Export(const wxString& filename) const
return false;
}
wxFFileOutputStream ostr(filename, _T("w"));
wxFFileOutputStream ostr(filename, wxT("w"));
return ostr.Ok() && Export(ostr);
#else
@@ -1187,13 +1187,13 @@ FormatAsHex(const void *data,
size_t size,
wxRegKey::ValueType type = wxRegKey::Type_Binary)
{
wxString value(_T("hex"));
wxString value(wxT("hex"));
// binary values use just "hex:" prefix while the other ones must indicate
// the real type
if ( type != wxRegKey::Type_Binary )
value << _T('(') << type << _T(')');
value << _T(':');
value << wxT('(') << type << wxT(')');
value << wxT(':');
// write all the rest as comma-separated bytes
value.reserve(3*size + 10);
@@ -1204,9 +1204,9 @@ FormatAsHex(const void *data,
// the generated files easier to read and compare with the files
// produced by regedit
if ( n )
value << _T(',');
value << wxT(',');
value << wxString::Format(_T("%02x"), (unsigned char)p[n]);
value << wxString::Format(wxT("%02x"), (unsigned char)p[n]);
}
return value;
@@ -1233,7 +1233,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
// quotes and backslashes must be quoted, linefeeds are not
// allowed in string values
rhs.reserve(value.length() + 2);
rhs = _T('"');
rhs = wxT('"');
// there can be no NULs here
bool useHex = false;
@@ -1242,15 +1242,15 @@ wxString wxRegKey::FormatValue(const wxString& name) const
{
switch ( (*p).GetValue() )
{
case _T('\n'):
case wxT('\n'):
// we can only represent this string in hex
useHex = true;
break;
case _T('"'):
case _T('\\'):
case wxT('"'):
case wxT('\\'):
// escape special symbol
rhs += _T('\\');
rhs += wxT('\\');
// fall through
default:
@@ -1261,7 +1261,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
if ( useHex )
rhs = FormatAsHex(value, Type_String);
else
rhs += _T('"');
rhs += wxT('"');
}
break;
@@ -1272,7 +1272,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
if ( !QueryValue(name, &value) )
break;
rhs.Printf(_T("dword:%08x"), (unsigned int)value);
rhs.Printf(wxT("dword:%08x"), (unsigned int)value);
}
break;