merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -507,7 +507,7 @@ public:
    {
        delete m_i_socket;

-        if ( LastError() == wxStream_NOERROR )
+        if ( IsOk() )
        {
            // wait for "226 transfer completed"
            m_ftp->CheckResult('2');