X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9548c49a6a1e4533976450205de136d9edbe91b0..ff1b5f81af5dce8dac0c134f0e01adffc5334347:/include/wx/filesys.h?ds=sidebyside diff --git a/include/wx/filesys.h b/include/wx/filesys.h index 814a41a314..73ffd59d62 100644 --- a/include/wx/filesys.h +++ b/include/wx/filesys.h @@ -10,7 +10,7 @@ #ifndef __FILESYS_H__ #define __FILESYS_H__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "filesys.h" #endif @@ -27,7 +27,6 @@ #if wxUSE_FILESYSTEM #include "wx/stream.h" -#include "wx/url.h" #include "wx/datetime.h" #include "wx/filename.h" @@ -42,23 +41,29 @@ class wxFileSystem; // (in 'index.htm#chapter2', 'chapter2' is anchor) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxFSFile : public wxObject +class WXDLLIMPEXP_BASE wxFSFile : public wxObject { public: wxFSFile(wxInputStream *stream, const wxString& loc, - const wxString& mimetype, const wxString& anchor, - wxDateTime modif) + 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; +#if wxUSE_DATETIME m_Modif = modif; +#endif // wxUSE_DATETIME } + 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 @@ -69,16 +74,21 @@ public: const wxString& GetAnchor() const {return m_Anchor;} +#if wxUSE_DATETIME wxDateTime GetModificationTime() const {return m_Modif;} +#endif // wxUSE_DATETIME private: wxInputStream *m_Stream; wxString m_Location; wxString m_MimeType; wxString m_Anchor; +#if wxUSE_DATETIME wxDateTime m_Modif; +#endif // wxUSE_DATETIME DECLARE_ABSTRACT_CLASS(wxFSFile) + DECLARE_NO_COPY_CLASS(wxFSFile) }; @@ -92,7 +102,7 @@ private: // kinds of files (HTPP, FTP, local, tar.gz etc..) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxFileSystemHandler : public wxObject +class WXDLLIMPEXP_BASE wxFileSystemHandler : public wxObject { public: wxFileSystemHandler() : wxObject() {} @@ -146,10 +156,11 @@ protected: // kinds of files (HTPP, FTP, local, tar.gz etc..) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxFileSystem : public wxObject +class WXDLLIMPEXP_BASE wxFileSystem : public wxObject { 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. @@ -202,6 +213,7 @@ protected: // handler that succeed in FindFirst query DECLARE_DYNAMIC_CLASS(wxFileSystem) + DECLARE_NO_COPY_CLASS(wxFileSystem) }; @@ -229,7 +241,7 @@ special characters : */ -class wxLocalFSHandler : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler { public: virtual bool CanOpen(const wxString& location);