* wxSocket fixes: FTP, HTTP works really now. GTK fixes to prevent infinite loop.
* wxSocket stream fix: they can be encapsulated by now * Doc update: wxURL::GetPath git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -253,7 +253,7 @@ public:
|
||||
|
||||
wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
|
||||
: wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
|
||||
size_t StreamSize() { return m_ftpsize; }
|
||||
size_t StreamSize() const { return m_ftpsize; }
|
||||
virtual ~wxInputFTPStream(void)
|
||||
{
|
||||
if (LastError() != wxStream_NOERROR)
|
||||
@@ -351,7 +351,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
|
||||
|
||||
pos_size = m_lastResult.Index('(');
|
||||
if (pos_size != wxNOT_FOUND) {
|
||||
wxString str_size = m_lastResult(pos_size, m_lastResult.Index(')'));
|
||||
wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(')')-1);
|
||||
|
||||
in_stream->m_ftpsize = atoi(WXSTRINGCAST str_size);
|
||||
}
|
||||
@@ -401,5 +401,9 @@ wxList *wxFTP::GetList(const wxString& wildcard)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sock->SetEventHandler(*GetNextHandler(), m_id);
|
||||
sock->Notify(m_notifyme);
|
||||
sock->SetNotify(m_neededreq);
|
||||
|
||||
return file_list;
|
||||
}
|
||||
|
Reference in New Issue
Block a user