X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae500232a4e961a567a5fb375fcf4f4a23216bd2..eddb32504316bfc92624a2a9b7cc62fd4543face:/include/wx/filesys.h diff --git a/include/wx/filesys.h b/include/wx/filesys.h index bf548d2c38..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,7 +41,7 @@ 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, @@ -103,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() {} @@ -157,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. @@ -241,7 +241,7 @@ special characters : */ -class WXDLLEXPORT wxLocalFSHandler : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler { public: virtual bool CanOpen(const wxString& location);