Don't remove generic status bar from parent, since it can be used on

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 474a98a6dc0949f9b04d65b14aa436b70c03db4a..417849ea00e5c878c65bfa4bb03ac09daf7c8e16 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -728,7 +728,7 @@ wxSocketBase *wxFTP::GetPassivePort()
                         (wxUint16)a[3] << 16 |
                         (wxUint16)a[4] << 8 |
                         a[5];
-    wxUint16 port = (wxUint16)a[0] << 8 | a[1];
+    wxUint16 port = (wxUint16)(a[0] << 8 | a[1]);
 
     wxIPV4address addr;
     addr.Hostname(hostaddr);
@@ -832,7 +832,7 @@ bool wxFTP::GetList(wxArrayString& files,
     if ( !CheckCommand(line, '1') )
     {
         m_lastError = wxPROTO_PROTERR;
-        wxLogDebug("FTP 'LIST' command returned unexpected result from server");
+        wxLogDebug(_T("FTP 'LIST' command returned unexpected result from server"));
         delete sock;
         return false;
     }