X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..e319bb30f7e88242f56144fcc279b57047566a6b:/src/common/sckfile.cpp?ds=sidebyside diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index 6118f10c01..adf5a85c90 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,33 +8,30 @@ // 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/wfstream.h" #include "wx/protocol/file.h" IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) -IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE) +IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false) wxFileProto::wxFileProto() - : wxProtocol() + : wxProtocol() { + m_error = wxPROTO_NOERR; } wxFileProto::~wxFileProto() @@ -43,14 +40,18 @@ 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->Ok() ) + { + m_error = wxPROTO_NOERR; + + return retval; + } + + m_error = wxPROTO_NOFILE; delete retval; - return 0; - } + + return NULL; } #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE -