Corrected library association

[wxWidgets.git] / interface / wx / filesys.h

diff --git a/interface/wx/filesys.h b/interface/wx/filesys.h
index c9d534e86aa8ac5b74cf9bd9fa9cfdd2f335591b..a61f76362cde3fc116a7abf29c0a0e9257e127cb 100644 (file)
--- a/interface/wx/filesys.h
+++ b/interface/wx/filesys.h
@@ -19,7 +19,6 @@ enum wxFileSystemOpenFlags
 
 /**
     @class wxFileSystem
 
 /**
     @class wxFileSystem

-    @wxheader{filesys.h}

 
     This class provides an interface for opening files on different file systems.
     It can handle absolute and/or local filenames.
 
     This class provides an interface for opening files on different file systems.
     It can handle absolute and/or local filenames.


@@ -132,7 +131,7 @@ public:
     /**
         Returns the actual path (set by wxFileSystem::ChangePathTo).
     */
     /**
         Returns the actual path (set by wxFileSystem::ChangePathTo).
     */

-    wxString GetPath();
+    wxString GetPath() const;

 
     /**
         This static function returns @true if there is a registered handler which can
 
     /**
         This static function returns @true if there is a registered handler which can


@@ -171,7 +170,6 @@ public:
 
 /**
     @class wxFSFile
 
 /**
     @class wxFSFile

-    @wxheader{filesys.h}

 
     This class represents a single file opened by wxFileSystem.
     It provides more information than wxWindow's input stream
 
     This class represents a single file opened by wxFileSystem.
     It provides more information than wxWindow's input stream


@@ -226,10 +224,12 @@ public:
             not be empty in this case).
         @param anchor
             Anchor. See GetAnchor() for details.
             not be empty in this case).
         @param anchor
             Anchor. See GetAnchor() for details.

+        @param modif
+            Modification date and time for this file.

     */
     */

-    wxFSFile(wxInputStream stream, const wxString& loc,
-             const wxString& mimetype,
-             const wxString& anchor, wxDateTime modif);
+    wxFSFile(wxInputStream* stream, const wxString& location,
+             const wxString& mimetype, const wxString& anchor,
+             wxDateTime modif);

 
     /**
         Detaches the stream from the wxFSFile object. That is, the
 
     /**
         Detaches the stream from the wxFSFile object. That is, the


@@ -300,7 +300,6 @@ public:
 
 /**
     @class wxFileSystemHandler
 
 /**
     @class wxFileSystemHandler

-    @wxheader{filesys.h}

 
     Classes derived from wxFileSystemHandler are used to access virtual file systems.
 
 
     Classes derived from wxFileSystemHandler are used to access virtual file systems.
 


@@ -357,7 +356,7 @@ public:
 
         Must be overridden in derived handlers.
     */
 
         Must be overridden in derived handlers.
     */

-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) = 0;

 
     /**
         Works like ::wxFindFirstFile().
 
     /**
         Works like ::wxFindFirstFile().


@@ -390,7 +389,7 @@ public:
 
         @note the anchor is NOT part of the left location.
     */
 
         @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.
 
     /**
         Returns the left location string extracted from @e location.


@@ -400,7 +399,7 @@ public:
         GetLeftLocation("file:myzipfile.zip#zip:index.htm") == "file:myzipfile.zip"
         @endcode
     */
         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.
 
     /**
         Returns the MIME type based on @b extension of @a location.


@@ -412,7 +411,7 @@ public:
         GetMimeTypeFromExt("index.htm") == "text/html"
         @endcode
     */
         GetMimeTypeFromExt("index.htm") == "text/html"
         @endcode
     */

-    wxString GetMimeTypeFromExt(const wxString& location);
+    static wxString GetMimeTypeFromExt(const wxString& location);

 
     /**
         Returns the protocol string extracted from @a location.
 
     /**
         Returns the protocol string extracted from @a location.


@@ -422,7 +421,7 @@ public:
         GetProtocol("file:myzipfile.zip#zip:index.htm") == "zip"
         @endcode
     */
         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.
 
     /**
         Returns the right location string extracted from @a location.


@@ -432,7 +431,7 @@ public:
         GetRightLocation("file:myzipfile.zip#zip:index.htm") == "index.htm"
         @endcode
     */
         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.
 
     /**
         Opens the file and returns wxFSFile pointer or @NULL if failed.