X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cc280ca919b6b5475bcc3aa70e0822ef6e33f21..b6b59e43ca3972b4b3d30f0e75440870410dc321:/src/common/sckfile.cpp diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index 483f4eb7c8..ba55e1ce96 100644 --- a/src/common/sckfile.cpp +++ b/src/common/sckfile.cpp @@ -8,9 +8,6 @@ // 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" @@ -33,8 +30,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false) wxFileProto::wxFileProto() - : wxProtocol() + : wxProtocol() { + m_error = wxPROTO_NOERR; } wxFileProto::~wxFileProto() @@ -43,13 +41,18 @@ wxFileProto::~wxFileProto() wxInputStream *wxFileProto::GetInputStream(const wxString& path) { - wxFileInputStream* retval = new wxFileInputStream(wxURI::Unescape(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