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

somewhat modded [ 1056879 ] use wxURI::Unescape vs wxURL::ConvertFromURI

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-10-29 20:19:49 +00:00
parent e313e308c0
commit 6cc280ca91
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/ftp.cpp
View File

@ -760,9 +760,6 @@ bool wxFTP::Abort()
wxInputStream *wxFTP::GetInputStream(const wxString& path) wxInputStream *wxFTP::GetInputStream(const wxString& path)
{ {
#if !wxUSE_URL
return NULL;
#else
if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) ) if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
return NULL; return NULL;
@ -774,7 +771,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
return NULL; return NULL;
} }
wxString tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path); wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
if ( !CheckCommand(tmp_str, '1') ) if ( !CheckCommand(tmp_str, '1') )
return NULL; return NULL;
@ -789,7 +786,6 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
wxInputFTPStream *in_stream = new wxInputFTPStream(this, sock); wxInputFTPStream *in_stream = new wxInputFTPStream(this, sock);
return in_stream; return in_stream;
#endif
} }
wxOutputStream *wxFTP::GetOutputStream(const wxString& path) wxOutputStream *wxFTP::GetOutputStream(const wxString& path)

6
src/common/sckfile.cpp
View File

@ -43,17 +43,13 @@ wxFileProto::~wxFileProto()
wxInputStream *wxFileProto::GetInputStream(const wxString& path) wxInputStream *wxFileProto::GetInputStream(const wxString& path)
{ {
#if !wxUSE_URL wxFileInputStream* retval = new wxFileInputStream(wxURI::Unescape(path));
return NULL;
#else
wxFileInputStream* retval = new wxFileInputStream(wxURL::ConvertFromURI(path));
if (retval->Ok()) { if (retval->Ok()) {
return retval; return retval;
} else { } else {
delete retval; delete retval;
return 0; return 0;
} }
#endif
} }
#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE