Unix compilation fixes after last commit

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index b1e60ae4eb2aa0caaf9c93af2434f8d48ecb3ee0..ba55e1ce96c6562ea4aae067a2c737fd7a45b179 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,28 +6,33 @@
 // 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
-#include <stdio.h>
-#include <stdlib.h>
-#include <wx/fstream.h>
-#include "wx/protocol/file.h"
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
+#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)
+
 wxFileProto::wxFileProto()
-  : wxProtocol()
+           : wxProtocol()
 {
+    m_error = wxPROTO_NOERR;
 }
 
 wxFileProto::~wxFileProto()
@@ -36,5 +41,19 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
-  return new wxFileInputStream(path);
+    wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
+    if ( retval->Ok() )
+    {
+        m_error = wxPROTO_NOERR;
+
+        return retval;
+    }
+
+    m_error = wxPROTO_NOFILE;
+    delete retval;
+
+    return NULL;
 }
+
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+