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 @@ bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode Open
|
||||
switch ( OpenMode )
|
||||
{
|
||||
default:
|
||||
wxFAIL_MSG( _T("unknown open mode in wxTextFile::Open") );
|
||||
wxFAIL_MSG( wxT("unknown open mode in wxTextFile::Open") );
|
||||
// fall through
|
||||
|
||||
case ReadAccess :
|
||||
@@ -89,7 +89,7 @@ bool wxTextFile::OnClose()
|
||||
bool wxTextFile::OnRead(const wxMBConv& conv)
|
||||
{
|
||||
// file should be opened
|
||||
wxASSERT_MSG( m_file.IsOpened(), _T("can't read closed file") );
|
||||
wxASSERT_MSG( m_file.IsOpened(), wxT("can't read closed file") );
|
||||
|
||||
// read the entire file in memory: this is not the most efficient thing to
|
||||
// do it but there is no good way to avoid it in Unicode build because if
|
||||
@@ -124,7 +124,7 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
|
||||
return false;
|
||||
|
||||
// if the file is seekable, also check that we're at its beginning
|
||||
wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") );
|
||||
wxASSERT_MSG( m_file.Tell() == 0, wxT("should be at start of file") );
|
||||
|
||||
char *dst = buf.data();
|
||||
for ( size_t nRemaining = bufSize; nRemaining > 0; )
|
||||
@@ -156,7 +156,7 @@ bool wxTextFile::OnRead(const wxMBConv& conv)
|
||||
}
|
||||
|
||||
wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize,
|
||||
_T("logic error") );
|
||||
wxT("logic error") );
|
||||
}
|
||||
else // file is not seekable
|
||||
{
|
||||
|
Reference in New Issue
Block a user