AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxFTP::Close() shouldn't hide base wxSocket function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-03-19 18:46:55 +00:00
parent bae411099c
commit 7ff26ec2ae
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/protocol/ftp.h
View File

@ -32,8 +32,8 @@ public:
bool Connect(wxSockAddress& addr, bool wait = TRUE);
bool Connect(const wxString& host);
// [forcibly] close the connection
bool Close(bool force = FALSE);
// close the connection
virtual bool Close();
void SetUser(const wxString& user) { m_user = user; }
void SetPassword(const wxString& passwd) { m_passwd = passwd; }

16
src/common/ftp.cpp
View File

@ -71,6 +71,11 @@ wxFTP::wxFTP()
wxFTP::~wxFTP()
{
if ( m_streaming )
{
(void)Abort();
}
Close();
}
@ -122,17 +127,12 @@ bool wxFTP::Connect(const wxString& host)
return Connect(addr);
}
bool wxFTP::Close(bool force)
bool wxFTP::Close()
{
if ( m_streaming )
{
if ( !force )
{
m_lastError = wxPROTO_STREAMING;
return FALSE;
}
(void)Abort();
m_lastError = wxPROTO_STREAMING;
return FALSE;
}
if ( IsConnected() )