Unicode compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 57857abc7a59b12da65a100af0786d34b64a4c6f..95d0d739d59a5eef6b52f9d100f8c38849c96e6c 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -365,8 +365,8 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
 
     if ( !DoSimpleCommand(_T("TYPE"), mode) )
     {
 
     if ( !DoSimpleCommand(_T("TYPE"), mode) )
     {

-        wxLogError(_("Failed to set FTP transfer mode to %s."),
-                   transferMode == ASCII ? _("ASCII") : _("binary"));
+        wxLogError(_("Failed to set FTP transfer mode to %s."), (const wxChar*)
+                   (transferMode == ASCII ? _("ASCII") : _("binary")));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -571,7 +571,7 @@ wxSocketClient *wxFTP::GetPort()
         return NULL;
     }
 
         return NULL;
     }
 

-    const char *addrStart = wxStrchr(m_lastResult, _T('('));
+    const wxChar *addrStart = wxStrchr(m_lastResult, _T('('));

     if ( !addrStart )
     {
         m_lastError = wxPROTO_PROTERR;
     if ( !addrStart )
     {
         m_lastError = wxPROTO_PROTERR;


@@ -579,7 +579,7 @@ wxSocketClient *wxFTP::GetPort()
         return NULL;
     }
 
         return NULL;
     }
 

-    const char *addrEnd = wxStrchr(addrStart, _T(')'));
+    const wxChar *addrEnd = wxStrchr(addrStart, _T(')'));

     if ( !addrEnd )
     {
         m_lastError = wxPROTO_PROTERR;
     if ( !addrEnd )
     {
         m_lastError = wxPROTO_PROTERR;