1
1
forked from 0ad/0ad

CStr::UpperCase now returns uppercase, not lowercase

This was SVN commit r849.
This commit is contained in:
Ykkrosh 2004-07-31 10:59:27 +00:00
parent 1d57c77aed
commit e71a29faf0
3 changed files with 6 additions and 3 deletions

View File

@ -198,7 +198,7 @@ CStr CStr::UpperCase() const
{
tstring NewTString = m_String;
for (size_t i = 0; i < m_String.length(); i++)
NewTString[i] = (TCHAR)_totlower(m_String[i]);
NewTString[i] = (TCHAR)_totupper(m_String[i]);
return CStr(NewTString);
}
@ -218,7 +218,7 @@ CStr CStr::UCase() const
{
tstring NewTString = m_String;
for (size_t i = 0; i < m_String.length(); i++)
NewTString[i] = (TCHAR)_totlower(m_String[i]);
NewTString[i] = (TCHAR)_totupper(m_String[i]);
return CStr(NewTString);
}

View File

@ -68,9 +68,10 @@ enum PS_TRIM_MODE {PS_TRIM_LEFT, PS_TRIM_RIGHT, PS_TRIM_BOTH};
#define _ttoi(a) wcstol(a, NULL, 0)
#define _ttol(a) wcstol(a, NULL, 0)
#define _T(t) L ## t
#define _totlower towlower
#define _istspace iswspace
#define _tsnprintf swprintf
#define _totlower towlower
#define _totupper towupper
#else
@ -85,6 +86,7 @@ enum PS_TRIM_MODE {PS_TRIM_LEFT, PS_TRIM_RIGHT, PS_TRIM_BOTH};
#define _istspace isspace
#define _tsnprintf snprintf
#define _totlower tolower
#define _totupper toupper
#endif

View File

@ -26,6 +26,7 @@
#undef _istspace
#undef _tsnprintf
#undef _totlower
#undef _totupper
// Now include the 8-bit version under the name CStr8
#undef _UNICODE