make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index b1e60ae4eb2aa0caaf9c93af2434f8d48ecb3ee0..483f4eb7c872535cd7eeed85b042f49a90f34340 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,25 +6,32 @@
 // 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

-#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__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"

 #endif
 
 #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()
 {
 wxFileProto::wxFileProto()
   : wxProtocol()
 {


@@ -36,5 +43,14 @@ 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()) {
+    return retval;
+  } else {
+    delete retval;
+    return 0;
+  }

 }
 }

+
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+