/////////////////////////////////////////////////////////////////////////////
-// Name: sckfile.cpp
+// Name: src/common/sckfile.cpp
// Purpose: File protocol
// Author: Guilhem Lavaux
// Modified by:
// 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 <stdio.h>
#include "wx/wfstream.h"
#include "wx/protocol/file.h"
IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
wxFileProto::wxFileProto()
- : wxProtocol()
+ : wxProtocol()
{
+ m_error = wxPROTO_NOERR;
}
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
-