removed extremely user-unfriendly translations

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 6665963f88438e42efad1e6b33a0af5fe3a8f603..23dde4198900c31d21441ccdbbb6afb461023116 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -32,7 +32,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_FTP

 
 #ifndef WX_PRECOMP
     #include <stdlib.h>
 
 #ifndef WX_PRECOMP
     #include <stdlib.h>


@@ -507,7 +507,7 @@ public:
     {
         delete m_i_socket;
 
     {
         delete m_i_socket;
 

-        if ( LastError() == wxStream_NOERROR )
+        if ( IsOk() )

         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');
         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');


@@ -672,7 +672,7 @@ wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
 
     wxString tmp_str = wxT("STOR ") + path;
     if ( !CheckCommand(tmp_str, '1') )
 
     wxString tmp_str = wxT("STOR ") + path;
     if ( !CheckCommand(tmp_str, '1') )

-        return FALSE;
+        return NULL;

 
     m_streaming = TRUE;
 
 
     m_streaming = TRUE;
 


@@ -925,5 +925,5 @@ wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 }
 #endif // WXWIN_COMPATIBILITY_2
 
 }
 #endif // WXWIN_COMPATIBILITY_2
 

-#endif
-  // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_FTP
+