wxFileName::Normalize(wxPATH_NORM_ENV_VARS) now works

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 6c472fe2241826786eeb43232af8c09e323ff7eb..c9f723a1454479823460cf11037795e21a05a740 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,9 +6,9 @@
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sckfile.h"
 #endif
 
 #pragma implementation "sckfile.h"
 #endif
 


@@ -23,16 +23,14 @@
   #include "wx/defs.h"
 #endif
 
   #include "wx/defs.h"
 #endif
 

-#if wxUSE_SOCKETS
+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE

 
 #include <stdio.h>
 
 #include <stdio.h>

-#include <wx/wfstream.h>
-#include <wx/protocol/file.h>
+#include "wx/wfstream.h"
+#include "wx/protocol/file.h"

 
 

-#if !USE_SHARED_LIBRARY

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

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

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


@@ -45,8 +43,8 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-  return new wxFileInputStream(path);
+  return new wxFileInputStream(wxURL::ConvertFromURI(path));

 }
 
 }
 

-#endif
-  // wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+