X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d775fa82354a1f8d5db87ad1d71ab00ef7d9123c..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/sckfile.cpp diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index a5c148b90c..cccbd9c891 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckfile.cpp +// Name: src/common/sckfile.cpp // Purpose: File protocol // Author: Guilhem Lavaux // Modified by: @@ -8,32 +8,33 @@ // Copyright: (c) 1997, 1998 Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "sckfile.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE + #ifndef WX_PRECOMP - #include "wx/defs.h" #endif -#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE - -#include +#include "wx/uri.h" #include "wx/wfstream.h" #include "wx/protocol/file.h" + +// ---------------------------------------------------------------------------- +// wxFileProto +// ---------------------------------------------------------------------------- + IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false) wxFileProto::wxFileProto() - : wxProtocol() + : wxProtocol() { } @@ -43,14 +44,17 @@ wxFileProto::~wxFileProto() wxInputStream *wxFileProto::GetInputStream(const wxString& path) { - wxFileInputStream* retval = new wxFileInputStream(wxURL::ConvertFromURI(path)); - if (retval->Ok()) { - return retval; - } else { + wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path)); + if ( retval->IsOk() ) + { + m_lastError = wxPROTO_NOERR; + return retval; + } + + m_lastError = wxPROTO_NOFILE; delete retval; - return 0; - } + + return NULL; } #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE -