formatting

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 071b33ebe9dc3bcaf72adacb19849d7f929f7da4..f648962080df7f310e3c0249b7381996c60f7186 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -10,8 +10,8 @@
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "filesys.h"
 #endif
 
 #include "wx/setup.h"
@@ -29,6 +29,7 @@
 #include "wx/stream.h"
 #include "wx/url.h"
 #include "wx/datetime.h"
+#include "wx/filename.h"
 
 class wxFSFile;
 class wxFileSystemHandler;
@@ -44,7 +45,7 @@ class wxFileSystem;
 class WXDLLEXPORT wxFSFile : public wxObject
 {
 public:
-    wxFSFile(wxInputStream *stream, const wxString& loc, 
+    wxFSFile(wxInputStream *stream, const wxString& loc,
              const wxString& mimetype, const wxString& anchor,
              wxDateTime modif)
     {
@@ -76,6 +77,9 @@ private:
     wxString m_MimeType;
     wxString m_Anchor;
     wxDateTime m_Modif;
+
+    DECLARE_ABSTRACT_CLASS(wxFSFile)
+    DECLARE_NO_COPY_CLASS(wxFSFile)
 };
 
 
@@ -178,6 +182,13 @@ public:
     // 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
@@ -192,6 +203,7 @@ protected:
             // handler that succeed in FindFirst query
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
+    DECLARE_NO_COPY_CLASS(wxFileSystem)
 };
 
 
@@ -226,13 +238,13 @@ public:
     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
-    // 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; }
-    
+
 protected:
     static wxString ms_root;
 };