X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00421206821da3373ddc075d63149826b3be38af..3c86150dd768b4e490b603227de28aa57275ee4b:/src/common/sckfile.cpp diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp index a4487f8df0..6118f10c01 100644 --- 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 -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "sckfile.h" #endif @@ -16,22 +16,21 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#if wxUSE_SOCKETS - #ifndef WX_PRECOMP + #include "wx/defs.h" #endif +#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE + #include -#include -#include +#include "wx/wfstream.h" +#include "wx/protocol/file.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol) -IMPLEMENT_PROTOCOL(wxFileProto, _T("file"), NULL, FALSE) -#endif +IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE) wxFileProto::wxFileProto() : wxProtocol() @@ -44,8 +43,14 @@ wxFileProto::~wxFileProto() 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_SOCKETS +#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE +