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

28
tests/hashes/hashes.cpp
View File

@@ -162,16 +162,16 @@ void HashesTestCase::wxHashTableTest()
for ( i = 0; i < COUNT/2; ++i )
CPPUNIT_ASSERT( hash.Get(i) == NULL);
hash2.Put(_T("foo"), &o + 1);
hash2.Put(_T("bar"), &o + 2);
hash2.Put(_T("baz"), &o + 3);
hash2.Put(wxT("foo"), &o + 1);
hash2.Put(wxT("bar"), &o + 2);
hash2.Put(wxT("baz"), &o + 3);
CPPUNIT_ASSERT(hash2.Get(_T("moo")) == NULL);
CPPUNIT_ASSERT(hash2.Get(_T("bar")) == &o + 2);
CPPUNIT_ASSERT(hash2.Get(wxT("moo")) == NULL);
CPPUNIT_ASSERT(hash2.Get(wxT("bar")) == &o + 2);
hash2.Put(_T("bar"), &o + 0);
hash2.Put(wxT("bar"), &o + 0);
CPPUNIT_ASSERT(hash2.Get(_T("bar")) == &o + 2);
CPPUNIT_ASSERT(hash2.Get(wxT("bar")) == &o + 2);
}
// and now some corner-case testing; 3 and 13 hash to the same bucket
@@ -523,16 +523,16 @@ void HashesTestCase::wxHashSetTest()
{
wxStringHashSet set1;
set1.insert( _T("abc") );
set1.insert( wxT("abc") );
CPPUNIT_ASSERT( set1.size() == 1 );
set1.insert( _T("bbc") );
set1.insert( _T("cbc") );
set1.insert( wxT("bbc") );
set1.insert( wxT("cbc") );
CPPUNIT_ASSERT( set1.size() == 3 );
set1.insert( _T("abc") );
set1.insert( wxT("abc") );
CPPUNIT_ASSERT( set1.size() == 3 );
@@ -540,11 +540,11 @@ void HashesTestCase::wxHashSetTest()
int dummy;
MyStruct tmp;
tmp.ptr = &dummy; tmp.str = _T("ABC");
tmp.ptr = &dummy; tmp.str = wxT("ABC");
set2.insert( tmp );
tmp.ptr = &dummy + 1;
set2.insert( tmp );
tmp.ptr = &dummy; tmp.str = _T("CDE");
tmp.ptr = &dummy; tmp.str = wxT("CDE");
set2.insert( tmp );
CPPUNIT_ASSERT( set2.size() == 2 );
@@ -553,5 +553,5 @@ void HashesTestCase::wxHashSetTest()
CPPUNIT_ASSERT( it != set2.end() );
CPPUNIT_ASSERT( it->ptr == &dummy );
CPPUNIT_ASSERT( it->str == _T("ABC") );
CPPUNIT_ASSERT( it->str == wxT("ABC") );
}