fix wxFilesystem compilation if wxUSE_FFILE is 0 but wxUSE_FILE is 1; disable wxFileS...

[wxWidgets.git] / src / common / sckfile.cpp

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 6118f10c01a4495638041caf050f6f60881d2eee..adf5a85c909310077a77d06ef661093b8a5822c1 100644 (file)
--- 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 <stdio.h>
 #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
-