Amebis/wxWidgets
0
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

44
src/common/stream.cpp
View File

@@ -100,7 +100,7 @@ wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
// doing this has big chances to lead to a crash when the source buffer is
// destroyed (otherwise assume the caller knows what he does)
wxASSERT_MSG( !buffer.m_destroybuf,
_T("it's a bad idea to copy this buffer") );
wxT("it's a bad idea to copy this buffer") );
m_buffer_start = buffer.m_buffer_start;
m_buffer_end = buffer.m_buffer_end;
@@ -202,7 +202,7 @@ void wxStreamBuffer::Truncate()
}
char *new_start = (char *)realloc(m_buffer_start, new_size);
wxCHECK_RET( new_size, _T("shrinking buffer shouldn't fail") );
wxCHECK_RET( new_size, wxT("shrinking buffer shouldn't fail") );
m_buffer_start = new_start;
m_buffer_end = m_buffer_start + new_size;
@@ -231,7 +231,7 @@ bool wxStreamBuffer::FillBuffer()
// write the buffer contents to the stream (only for write buffers)
bool wxStreamBuffer::FlushBuffer()
{
wxCHECK_MSG( m_flushable, false, _T("can't flush this buffer") );
wxCHECK_MSG( m_flushable, false, wxT("can't flush this buffer") );
// FIXME: what is this check for? (VZ)
if ( m_buffer_pos == m_buffer_start )
@@ -239,7 +239,7 @@ bool wxStreamBuffer::FlushBuffer()
wxOutputStream *outStream = GetOutputStream();
wxCHECK_MSG( outStream, false, _T("should have a stream in wxStreamBuffer") );
wxCHECK_MSG( outStream, false, wxT("should have a stream in wxStreamBuffer") );
size_t current = m_buffer_pos - m_buffer_start;
size_t count = outStream->OnSysWrite(m_buffer_start, current);
@@ -319,7 +319,7 @@ void wxStreamBuffer::PutChar(char c)
{
wxOutputStream *outStream = GetOutputStream();
wxCHECK_RET( outStream, _T("should have a stream in wxStreamBuffer") );
wxCHECK_RET( outStream, wxT("should have a stream in wxStreamBuffer") );
// if we don't have buffer at all, just forward this call to the stream,
if ( !HasBuffer() )
@@ -345,7 +345,7 @@ void wxStreamBuffer::PutChar(char c)
char wxStreamBuffer::Peek()
{
wxCHECK_MSG( m_stream && HasBuffer(), 0,
_T("should have the stream and the buffer in wxStreamBuffer") );
wxT("should have the stream and the buffer in wxStreamBuffer") );
if ( !GetDataLeft() )
{
@@ -364,7 +364,7 @@ char wxStreamBuffer::GetChar()
{
wxInputStream *inStream = GetInputStream();
wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
char c;
if ( !HasBuffer() )
@@ -390,7 +390,7 @@ char wxStreamBuffer::GetChar()
size_t wxStreamBuffer::Read(void *buffer, size_t size)
{
wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be used") );
wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be used") );
/* Clear buffer first */
memset(buffer, 0x00, size);
@@ -404,7 +404,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
{
wxInputStream *inStream = GetInputStream();
wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
readBytes = inStream->OnSysRead(buffer, size);
}
@@ -449,7 +449,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
// this should really be called "Copy()"
size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
{
wxCHECK_MSG( m_mode != write, 0, _T("can't read from this buffer") );
wxCHECK_MSG( m_mode != write, 0, wxT("can't read from this buffer") );
char buf[BUF_TEMP_SIZE];
size_t nRead,
@@ -471,7 +471,7 @@ size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
size_t wxStreamBuffer::Write(const void *buffer, size_t size)
{
wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be send") );
wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be send") );
if (m_stream)
{
@@ -485,7 +485,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
{
wxOutputStream *outStream = GetOutputStream();
wxCHECK_MSG( outStream, 0, _T("should have a stream in wxStreamBuffer") );
wxCHECK_MSG( outStream, 0, wxT("should have a stream in wxStreamBuffer") );
// no buffer, just forward the call to the stream
ret = outStream->OnSysWrite(buffer, size);
@@ -543,8 +543,8 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
{
wxCHECK_MSG( m_mode != read, 0, _T("can't write to this buffer") );
wxCHECK_MSG( sbuf->m_mode != write, 0, _T("can't read from that buffer") );
wxCHECK_MSG( m_mode != read, 0, wxT("can't write to this buffer") );
wxCHECK_MSG( sbuf->m_mode != write, 0, wxT("can't read from that buffer") );
char buf[BUF_TEMP_SIZE];
size_t nWrite,
@@ -599,7 +599,7 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
break;
default:
wxFAIL_MSG( _T("invalid seek mode") );
wxFAIL_MSG( wxT("invalid seek mode") );
return wxInvalidOffset;
}
@@ -695,7 +695,7 @@ size_t wxStreamBase::GetSize() const
return 0;
const size_t len = wx_truncate_cast(size_t, length);
wxASSERT_MSG( len == length + size_t(0), _T("large files not supported") );
wxASSERT_MSG( len == length + size_t(0), wxT("large files not supported") );
return len;
}
@@ -771,7 +771,7 @@ char *wxInputStream::AllocSpaceWBack(size_t needed_size)
size_t wxInputStream::GetWBack(void *buf, size_t size)
{
wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used") );
wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used") );
/* Clear buffer first */
memset(buf, 0x00, size);
@@ -807,7 +807,7 @@ size_t wxInputStream::GetWBack(void *buf, size_t size)
size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
{
wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used in Ungetch()") );
wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used in Ungetch()") );
if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
{
@@ -841,7 +841,7 @@ int wxInputStream::GetC()
wxInputStream& wxInputStream::Read(void *buf, size_t size)
{
wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be read") );
wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be read") );
char *p = (char *)buf;
m_lastcount = 0;
@@ -1091,7 +1091,7 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
break;
default:
wxFAIL_MSG( _T("invalid seek mode") );
wxFAIL_MSG( wxT("invalid seek mode") );
return wxInvalidOffset;
}
@@ -1357,7 +1357,7 @@ wxFileOffset wxBufferedInputStream::OnSysTell() const
void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
{
wxCHECK_RET( buffer, _T("wxBufferedInputStream needs buffer") );
wxCHECK_RET( buffer, wxT("wxBufferedInputStream needs buffer") );
delete m_i_streambuf;
m_i_streambuf = buffer;
@@ -1440,7 +1440,7 @@ wxFileOffset wxBufferedOutputStream::GetLength() const
void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
{
wxCHECK_RET( buffer, _T("wxBufferedOutputStream needs buffer") );
wxCHECK_RET( buffer, wxT("wxBufferedOutputStream needs buffer") );
delete m_o_streambuf;
m_o_streambuf = buffer;