removing unreached code (overriden)

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 220f95294c0a6948d73efb3b2a2167016d78cfef..6118f10c01a4495638041caf050f6f60881d2eee 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,6 +23,8 @@
   #include "wx/defs.h"
 #endif
 
   #include "wx/defs.h"
 #endif
 

+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+

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


@@ -41,6 +43,14 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-  return new wxFileInputStream(path);
+  wxFileInputStream* retval = new wxFileInputStream(wxURL::ConvertFromURI(path));
+  if (retval->Ok()) {
+    return retval;
+  } else {
+    delete retval;
+    return 0;
+  }

 }
 
 }
 

+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+