Misc validity fixes to samples/xrc/rc/*.xrc.

[wxWidgets.git] / src / common / protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 2dfb4b40ab04eac1b0653f478772c96aa7e49bfa..74662adb8a21ddf7b4d6dd3bc81690b639ef3aca 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     07/07/1997
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     07/07/1997

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,6 +25,7 @@
 #endif
 
 #include "wx/url.h"
 #endif
 
 #include "wx/url.h"

+#include "wx/log.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -33,6 +33,8 @@
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxProtoInfo, wxObject)
+

 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),


@@ -69,6 +71,19 @@ wxProtocol::wxProtocol()
     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 
     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()
 {
 #if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {


@@ -89,19 +104,6 @@ bool wxProtocol::Reconnect()
     return true;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Read a line from socket
 // ----------------------------------------------------------------------------


@@ -136,7 +138,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split
             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;
                 {
                     // ignore the stray '\n'
                     eol = NULL;


@@ -207,8 +209,9 @@ void wxProtocol::LogResponse(const wxString& str)
         m_log->LogResponse(str);
 }
 
         m_log->LogResponse(str);
 }
 

-void wxProtocolLog::DoLogString(const wxString& WXUNUSED_UNLESS_DEBUG(str))
+void wxProtocolLog::DoLogString(const wxString& str)

 {
 {

+    wxUnusedVar(str); // unused if wxLogTrace() is disabled

     wxLogTrace(m_traceMask, "%s", str);
 }
 
     wxLogTrace(m_traceMask, "%s", str);
 }