X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/657a8a359826e46a7fc458216403f54deca34989..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/protocol.cpp?ds=sidebyside diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp index 1f508709eb..5a62be3444 100644 --- a/src/common/protocol.cpp +++ b/src/common/protocol.cpp @@ -34,6 +34,8 @@ // wxProtoInfo // ---------------------------------------------------------------------------- +IMPLEMENT_CLASS(wxProtoInfo, wxObject) + wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv, const bool need_host1, wxClassInfo *info) : m_protoname(name), @@ -70,6 +72,19 @@ wxProtocol::wxProtocol() SetDefaultTimeout(60); // default timeout is 60 seconds } +void wxProtocol::SetDefaultTimeout(wxUint32 Value) +{ + m_uiDefaultTimeout = Value; +#if wxUSE_SOCKETS + wxSocketBase::SetTimeout(Value); // sets it for this socket +#endif +} + +wxProtocol::~wxProtocol() +{ + delete m_log; +} + #if wxUSE_SOCKETS bool wxProtocol::Reconnect() { @@ -90,19 +105,6 @@ bool wxProtocol::Reconnect() return true; } -void wxProtocol::SetDefaultTimeout(wxUint32 Value) -{ - m_uiDefaultTimeout = Value; -#if wxUSE_SOCKETS - wxSocketBase::SetTimeout(Value); // sets it for this socket -#endif -} - -wxProtocol::~wxProtocol() -{ - delete m_log; -} - // ---------------------------------------------------------------------------- // Read a line from socket // ---------------------------------------------------------------------------- @@ -137,7 +139,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result) if ( eol == pBuf ) { // check for case of "\r\n" being split - if ( result.empty() || result.Last() != _T('\r') ) + if ( result.empty() || result.Last() != wxT('\r') ) { // ignore the stray '\n' eol = NULL;