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 2e3827ef6c809f21a7b49addc3b9c8b37a2f133b..483f4eb7c872535cd7eeed85b042f49a90f34340 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -43,17 +43,13 @@ wxFileProto::~wxFileProto()
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {

-#if !wxUSE_URL
-    return NULL;
-#else
-    wxFileInputStream* retval = new wxFileInputStream(wxURL::ConvertFromURI(path));
+  wxFileInputStream* retval = new wxFileInputStream(wxURI::Unescape(path));

   if (retval->Ok()) {
     return retval;
   } else {
     delete retval;
     return 0;
   }
   if (retval->Ok()) {
     return retval;
   } else {
     delete retval;
     return 0;
   }

-#endif

 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
 }
 
 #endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE