X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..a66bf817a6ba833ad47cefc9fa8948ef8045a59d:/src/common/sckfile.cpp

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 6c472fe224..cccbd9c891 100644
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -1,41 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckfile.cpp
+// Name:        src/common/sckfile.cpp
 // Purpose:     File protocol
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#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_SOCKETS
+#include "wx/uri.h"
+#include "wx/wfstream.h"
+#include "wx/protocol/file.h"
 
-#include <stdio.h>
-#include <wx/wfstream.h>
-#include <wx/protocol/file.h>
 
-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// wxFileProto
+// ----------------------------------------------------------------------------
+
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, _T("file"), NULL, FALSE)
-#endif
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
 
 wxFileProto::wxFileProto()
-  : wxProtocol()
+           : wxProtocol()
 {
 }
 
@@ -45,8 +44,17 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
-  return new wxFileInputStream(path);
+    wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
+    if ( retval->IsOk() )
+    {
+        m_lastError = wxPROTO_NOERR;
+        return retval;
+    }
+
+    m_lastError = wxPROTO_NOFILE;
+    delete retval;
+
+    return NULL;
 }
 
-#endif
-  // wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE