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

18
src/common/socket.cpp
View File

@@ -115,7 +115,7 @@ wxDEFINE_EVENT(wxEVT_SOCKET, wxSocketEvent);
// discard buffer
#define MAX_DISCARD_SIZE (10 * 1024)
#define wxTRACE_Socket _T("wxSocket")
#define wxTRACE_Socket wxT("wxSocket")
// --------------------------------------------------------------------------
// wxWin macros
@@ -771,7 +771,7 @@ bool wxSocketBase::Initialize()
void wxSocketBase::Shutdown()
{
// we should be initialized
wxASSERT_MSG( m_countInit > 0, _T("extra call to Shutdown()") );
wxASSERT_MSG( m_countInit > 0, wxT("extra call to Shutdown()") );
if ( --m_countInit == 0 )
{
wxSocketManager * const manager = wxSocketManager::Get();
@@ -1737,13 +1737,13 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr,
wxSocketFlags flags)
: wxSocketBase(flags, wxSOCKET_SERVER)
{
wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") );
wxLogTrace( wxTRACE_Socket, wxT("Opening wxSocketServer") );
m_impl = wxSocketImpl::Create(*this);
if (!m_impl)
{
wxLogTrace( wxTRACE_Socket, _T("*** Failed to create m_impl") );
wxLogTrace( wxTRACE_Socket, wxT("*** Failed to create m_impl") );
return;
}
@@ -1765,11 +1765,11 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr,
delete m_impl;
m_impl = NULL;
wxLogTrace( wxTRACE_Socket, _T("*** CreateServer() failed") );
wxLogTrace( wxTRACE_Socket, wxT("*** CreateServer() failed") );
return;
}
wxLogTrace( wxTRACE_Socket, _T("wxSocketServer on fd %d"), m_impl->m_fd );
wxLogTrace( wxTRACE_Socket, wxT("wxSocketServer on fd %d"), m_impl->m_fd );
}
// --------------------------------------------------------------------------
@@ -1835,7 +1835,7 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
{
wxASSERT_MSG( m_impl, _T("Socket not initialised") );
wxASSERT_MSG( m_impl, wxT("Socket not initialised") );
SOCKOPTLEN_T lenreal = *optlen;
if ( getsockopt(m_impl->m_fd, level, optname,
@@ -1850,7 +1850,7 @@ bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
bool
wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen)
{
wxASSERT_MSG( m_impl, _T("Socket not initialised") );
wxASSERT_MSG( m_impl, wxT("Socket not initialised") );
return setsockopt(m_impl->m_fd, level, optname,
static_cast<const char *>(optval), optlen) == 0;
@@ -2024,7 +2024,7 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr,
const void* buf,
wxUint32 nBytes )
{
wxASSERT_MSG( m_impl, _T("Socket not initialised") );
wxASSERT_MSG( m_impl, wxT("Socket not initialised") );
m_impl->SetPeer(addr.GetAddress());
Write(buf, nBytes);