X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/sckfile.cpp?ds=sidebyside diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index adf5a85c90..cccbd9c891 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -21,17 +21,21 @@ #ifndef WX_PRECOMP #endif -#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() { - m_error = wxPROTO_NOERR; } wxFileProto::~wxFileProto() @@ -41,14 +45,13 @@ wxFileProto::~wxFileProto() wxInputStream *wxFileProto::GetInputStream(const wxString& path) { wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path)); - if ( retval->Ok() ) + if ( retval->IsOk() ) { - m_error = wxPROTO_NOERR; - + m_lastError = wxPROTO_NOERR; return retval; } - m_error = wxPROTO_NOFILE; + m_lastError = wxPROTO_NOFILE; delete retval; return NULL;