export wxStatusBarPaneArray from the DLL to fix Borland multilib build

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 41686d09d8d808c7d93798f53c92cc2c389a6153..1b87a7d42123eb373234934bec28b6a971f34010 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -1,39 +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
 // 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__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+

 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <wx/fstream.h>
+#include "wx/uri.h"
+#include "wx/wfstream.h"

 #include "wx/protocol/file.h"
 
 #include "wx/protocol/file.h"
 

-#if !USE_SHARED_LIBRARY
+
+// ----------------------------------------------------------------------------
+// wxFileProto
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)

-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
-#endif
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)

 
 wxFileProto::wxFileProto()
 
 wxFileProto::wxFileProto()

-  : wxProtocol()
+           : wxProtocol()

 {
 }
 
 {
 }
 


@@ -43,5 +44,17 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-  return new wxFileInputStream(path);
+    wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
+    if ( retval->Ok() )
+    {
+        m_lastError = wxPROTO_NOERR;
+        return retval;
+    }
+
+    m_lastError = wxPROTO_NOFILE;
+    delete retval;
+
+    return NULL;

 }
 }

+
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE