Added compatibility functions for wxUSE_STL = 1:

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 071b33ebe9dc3bcaf72adacb19849d7f929f7da4..6625b40bb8b97913a1d095ad65537add0c694588 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -4,14 +4,14 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "filesys.h"

 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"


@@ -27,12 +27,12 @@
 #if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"
 #if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"

-#include "wx/url.h"

 #include "wx/datetime.h"
 #include "wx/datetime.h"

+#include "wx/filename.h"

 
 

-class wxFSFile;
-class wxFileSystemHandler;
-class wxFileSystem;
+class WXDLLIMPEXP_BASE wxFSFile;
+class WXDLLIMPEXP_BASE wxFileSystemHandler;
+class WXDLLIMPEXP_BASE wxFileSystem;

 
 //--------------------------------------------------------------------------------
 // wxFSFile
 
 //--------------------------------------------------------------------------------
 // wxFSFile


@@ -41,23 +41,29 @@ class wxFileSystem;
 //                  (in 'index.htm#chapter2', 'chapter2' is anchor)
 //--------------------------------------------------------------------------------
 
 //                  (in 'index.htm#chapter2', 'chapter2' is anchor)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFSFile : public wxObject
+class WXDLLIMPEXP_BASE wxFSFile : public wxObject

 {
 public:
 {
 public:

-    wxFSFile(wxInputStream *stream, const wxString& loc, 
-             const wxString& mimetype, const wxString& anchor,
-             wxDateTime modif)
+    wxFSFile(wxInputStream *stream, const wxString& loc,
+             const wxString& mimetype, const wxString& anchor
+#if wxUSE_DATETIME
+             , wxDateTime modif
+#endif // wxUSE_DATETIME
+             )

     {
         m_Stream = stream;
         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;
     {
         m_Stream = stream;
         m_Location = loc;
         m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;

+#if wxUSE_DATETIME

         m_Modif = modif;
         m_Modif = modif;

+#endif // wxUSE_DATETIME

     }
     }

+

     virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
 
     // returns stream. This doesn't _create_ stream, it only returns
     virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
 
     // returns stream. This doesn't _create_ stream, it only returns

-    // pointer to it!!
+    // pointer to it.

     wxInputStream *GetStream() const {return m_Stream;}
 
     // returns file's mime type
     wxInputStream *GetStream() const {return m_Stream;}
 
     // returns file's mime type


@@ -68,14 +74,21 @@ public:
 
     const wxString& GetAnchor() const {return m_Anchor;}
 
 
     const wxString& GetAnchor() const {return m_Anchor;}
 

+#if wxUSE_DATETIME

     wxDateTime GetModificationTime() const {return m_Modif;}
     wxDateTime GetModificationTime() const {return m_Modif;}

+#endif // wxUSE_DATETIME

 
 private:
     wxInputStream *m_Stream;
     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;
 
 private:
     wxInputStream *m_Stream;
     wxString m_Location;
     wxString m_MimeType;
     wxString m_Anchor;

+#if wxUSE_DATETIME

     wxDateTime m_Modif;
     wxDateTime m_Modif;

+#endif // wxUSE_DATETIME
+
+    DECLARE_ABSTRACT_CLASS(wxFSFile)
+    DECLARE_NO_COPY_CLASS(wxFSFile)

 };
 
 
 };
 
 


@@ -89,7 +102,7 @@ private:
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileSystemHandler : public wxObject
+class WXDLLIMPEXP_BASE wxFileSystemHandler : public wxObject

 {
 public:
     wxFileSystemHandler() : wxObject() {}
 {
 public:
     wxFileSystemHandler() : wxObject() {}


@@ -143,10 +156,11 @@ protected:
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileSystem : public wxObject
+class WXDLLIMPEXP_BASE wxFileSystem : public wxObject

 {
 public:
 {
 public:

-    wxFileSystem() : wxObject() {m_Path = m_LastName = wxEmptyString; m_Handlers.DeleteContents(TRUE); m_FindFileHandler = NULL;}
+    wxFileSystem() : wxObject() { m_FindFileHandler = NULL;}
+    virtual ~wxFileSystem() { }

 
     // sets the current location. Every call to OpenFile is
     // relative to this location.
 
     // sets the current location. Every call to OpenFile is
     // relative to this location.


@@ -178,6 +192,13 @@ public:
     // remove all items from the m_Handlers list
     static void CleanUpHandlers();
 
     // remove all items from the m_Handlers list
     static void CleanUpHandlers();
 

+    // Returns the native path for a file URL
+    static wxFileName URLToFileName(const wxString& url);
+
+    // Returns the file URL for a native path
+    static wxString FileNameToURL(const wxFileName& filename);
+
+

 protected:
     wxString m_Path;
             // the path (location) we are currently in
 protected:
     wxString m_Path;
             // the path (location) we are currently in


@@ -192,6 +213,7 @@ protected:
             // handler that succeed in FindFirst query
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
             // handler that succeed in FindFirst query
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)

+    DECLARE_NO_COPY_CLASS(wxFileSystem)

 };
 
 
 };
 
 


@@ -219,20 +241,20 @@ special characters :
 */
 
 
 */
 
 

-class wxLocalFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler

 {
 public:
     virtual bool CanOpen(const wxString& location);
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
     virtual wxString FindFirst(const wxString& spec, int flags = 0);
     virtual wxString FindNext();
 {
 public:
     virtual bool CanOpen(const wxString& location);
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
     virtual wxString FindFirst(const wxString& spec, int flags = 0);
     virtual wxString FindNext();

-    
+

     // wxLocalFSHandler will prefix all filenames with 'root' before accessing
     // files on disk. This effectively makes 'root' the top-level directory
     // wxLocalFSHandler will prefix all filenames with 'root' before accessing
     // files on disk. This effectively makes 'root' the top-level directory

-    // and prevents access to files outside this directory.  
+    // and prevents access to files outside this directory.

     // (This is similar to Unix command 'chroot'.)
     static void Chroot(const wxString& root) { ms_root = root; }
     // (This is similar to Unix command 'chroot'.)
     static void Chroot(const wxString& root) { ms_root = root; }

-    
+

 protected:
     static wxString ms_root;
 };
 protected:
     static wxString ms_root;
 };