Fix wxFileSystem::FileNameToURL() for Unicode file names.

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 2dfb4b40ab04eac1b0653f478772c96aa7e49bfa..0173b097b74a1c5f214bd52841b3f14bd321ce2b 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/url.h"
+#include "wx/log.h"
 
 #include <stdlib.h>
 
@@ -33,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),
@@ -136,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;
@@ -207,8 +210,9 @@ void wxProtocol::LogResponse(const wxString& 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);
 }