Globally replace _T() with wxT().
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:
@@ -64,7 +64,7 @@ protected:
|
||||
|
||||
void ZipTestCase::OnCreateArchive(wxZipOutputStream& zip)
|
||||
{
|
||||
m_comment << _T("Comment for test ") << m_id;
|
||||
m_comment << wxT("Comment for test ") << m_id;
|
||||
zip.SetComment(m_comment);
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ void ZipTestCase::OnCreateEntry(wxZipOutputStream& zip,
|
||||
switch ((m_id + m_count) % 5) {
|
||||
case 0:
|
||||
{
|
||||
wxString comment = _T("Comment for ") + entry->GetName();
|
||||
wxString comment = wxT("Comment for ") + entry->GetName();
|
||||
entry->SetComment(comment);
|
||||
// lowercase the expected result, and the notifier should do
|
||||
// the same for the zip entries when ModifyArchive() runs
|
||||
@@ -110,7 +110,7 @@ void ZipTestCase::OnEntryExtracted(wxZipEntry& entry,
|
||||
{
|
||||
// provide some context for the error message so that we know which
|
||||
// iteration of the loop we were on
|
||||
wxString name = _T(" '") + entry.GetName() + _T("'");
|
||||
wxString name = wxT(" '") + entry.GetName() + wxT("'");
|
||||
string error_entry(name.mb_str());
|
||||
string error_context(" failed for entry" + error_entry);
|
||||
|
||||
@@ -175,8 +175,8 @@ void ZipPipeTestCase::runTest()
|
||||
{
|
||||
TestOutputStream out(m_options);
|
||||
|
||||
wxString testdata = _T("test data to pipe through zip");
|
||||
wxString cmd = _T("echo ") + testdata + _T(" | zip -q - -");
|
||||
wxString testdata = wxT("test data to pipe through zip");
|
||||
wxString cmd = wxT("echo ") + testdata + wxT(" | zip -q - -");
|
||||
|
||||
{
|
||||
PFileInputStream in(cmd);
|
||||
@@ -225,8 +225,8 @@ protected:
|
||||
ziptest::ziptest()
|
||||
: ArchiveTestSuite("zip")
|
||||
{
|
||||
AddArchiver(_T("zip -qr %s *"));
|
||||
AddUnArchiver(_T("unzip -q %s"));
|
||||
AddArchiver(wxT("zip -qr %s *"));
|
||||
AddUnArchiver(wxT("unzip -q %s"));
|
||||
}
|
||||
|
||||
ArchiveTestSuite *ziptest::makeSuite()
|
||||
@@ -238,10 +238,10 @@ ArchiveTestSuite *ziptest::makeSuite()
|
||||
// The gnuwin32 build of infozip does work for this, e.g.:
|
||||
// C:\>echo test data to pipe through zip | zip -q > foo.zip
|
||||
// doesn't produce a valid zip, so disabled for now.
|
||||
if (IsInPath(_T("zip")))
|
||||
if (IsInPath(wxT("zip")))
|
||||
for (int options = 0; options <= PipeIn; options += PipeIn) {
|
||||
string name = Description(_T("ZipPipeTestCase"), options,
|
||||
false, _T(""), _T("zip -q - -"));
|
||||
string name = Description(wxT("ZipPipeTestCase"), options,
|
||||
false, wxT(""), wxT("zip -q - -"));
|
||||
addTest(new ZipPipeTestCase(name, options));
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user