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:
@@ -84,20 +84,20 @@ void FileSystemTestCase::UrlParsing()
|
||||
} data[] =
|
||||
{
|
||||
// simple case:
|
||||
{ _T("http://www.root.cz/index.html"),
|
||||
_T("http"), _T(""), _T("//www.root.cz/index.html"), _T("")},
|
||||
{ wxT("http://www.root.cz/index.html"),
|
||||
wxT("http"), wxT(""), wxT("//www.root.cz/index.html"), wxT("")},
|
||||
// anchors:
|
||||
{ _T("http://www.root.cz/index.html#lbl"),
|
||||
_T("http"), _T(""), _T("//www.root.cz/index.html"), _T("lbl")},
|
||||
{ wxT("http://www.root.cz/index.html#lbl"),
|
||||
wxT("http"), wxT(""), wxT("//www.root.cz/index.html"), wxT("lbl")},
|
||||
// file is default protocol:
|
||||
{ _T("testfile.html"),
|
||||
_T("file"), _T(""), _T("testfile.html"), _T("")},
|
||||
{ wxT("testfile.html"),
|
||||
wxT("file"), wxT(""), wxT("testfile.html"), wxT("")},
|
||||
// stacked protocols:
|
||||
{ _T("file:myzipfile.zip#zip:index.htm"),
|
||||
_T("zip"), _T("file:myzipfile.zip"), _T("index.htm"), _T("")},
|
||||
{ wxT("file:myzipfile.zip#zip:index.htm"),
|
||||
wxT("zip"), wxT("file:myzipfile.zip"), wxT("index.htm"), wxT("")},
|
||||
// changes to ':' parsing often break things:
|
||||
{ _T("file:a#b:foo"),
|
||||
_T("b"), _T("file:a"), _T("foo"), _T("")}
|
||||
{ wxT("file:a#b:foo"),
|
||||
wxT("b"), wxT("file:a"), wxT("foo"), wxT("")}
|
||||
};
|
||||
|
||||
UrlTester tst;
|
||||
@@ -114,7 +114,7 @@ void FileSystemTestCase::UrlParsing()
|
||||
void FileSystemTestCase::FileNameToUrlConversion()
|
||||
{
|
||||
#ifdef __WINDOWS__
|
||||
wxFileName fn1(_T("\\\\server\\share\\path\\to\\file"));
|
||||
wxFileName fn1(wxT("\\\\server\\share\\path\\to\\file"));
|
||||
wxString url1 = wxFileSystem::FileNameToURL(fn1);
|
||||
|
||||
CPPUNIT_ASSERT( fn1.SameAs(wxFileSystem::URLToFileName(url1)) );
|
||||
|
Reference in New Issue
Block a user