X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76e9224eb2edea8afe45faa6a1cd1b2894d245c2..5267aefd85739afd26bd19bfba998005119db446:/interface/wx/filesys.h?ds=sidebyside

diff --git a/interface/wx/filesys.h b/interface/wx/filesys.h
index 4620a9825e..c872dbafc8 100644
--- a/interface/wx/filesys.h
+++ b/interface/wx/filesys.h
@@ -107,7 +107,7 @@ public:
         @param file
             the name of the file to look for
     */
-    bool FindFileInPath(wxString str, const wxString& path,
+    bool FindFileInPath(wxString* pStr, const wxString& path,
                         const wxString& file);
 
     /**
@@ -227,10 +227,8 @@ public:
         @param modif
             Modification date and time for this file.
     */
-    wxFSFile(wxInputStream stream,
-             const wxString& location,
-             const wxString& mimetype,
-             const wxString& anchor,
+    wxFSFile(wxInputStream* stream, const wxString& location,
+             const wxString& mimetype, const wxString& anchor,
              wxDateTime modif);
 
     /**
@@ -240,7 +238,7 @@ public:
 
         You will have to delete the stream yourself.
     */
-    void DetachStream();
+    wxInputStream* DetachStream();
 
     /**
         Returns anchor (if present). The term of @b anchor can be easily
@@ -358,7 +356,7 @@ public:
 
         Must be overridden in derived handlers.
     */
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) = 0;
 
     /**
         Works like ::wxFindFirstFile().
@@ -391,7 +389,7 @@ public:
 
         @note the anchor is NOT part of the left location.
     */
-    wxString GetAnchor(const wxString& location) const;
+    static wxString GetAnchor(const wxString& location);
 
     /**
         Returns the left location string extracted from @e location.
@@ -401,7 +399,7 @@ public:
         GetLeftLocation("file:myzipfile.zip#zip:index.htm") == "file:myzipfile.zip"
         @endcode
     */
-    wxString GetLeftLocation(const wxString& location) const;
+    static wxString GetLeftLocation(const wxString& location);
 
     /**
         Returns the MIME type based on @b extension of @a location.
@@ -423,7 +421,7 @@ public:
         GetProtocol("file:myzipfile.zip#zip:index.htm") == "zip"
         @endcode
     */
-    wxString GetProtocol(const wxString& location) const;
+    static wxString GetProtocol(const wxString& location);
 
     /**
         Returns the right location string extracted from @a location.
@@ -433,7 +431,7 @@ public:
         GetRightLocation("file:myzipfile.zip#zip:index.htm") == "index.htm"
         @endcode
     */
-    wxString GetRightLocation(const wxString& location) const;
+    static wxString GetRightLocation(const wxString& location);
 
     /**
         Opens the file and returns wxFSFile pointer or @NULL if failed.
@@ -445,7 +443,6 @@ public:
         @param location
             The absolute location of file.
     */
-    virtual wxFSFile* OpenFile(wxFileSystem& fs,
-                               const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) = 0;
 };