X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/fs_mem.h?ds=sidebyside diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index e304cd1143..ad0927f42b 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -3,45 +3,44 @@ // Purpose: in-memory file system // Author: Vaclav Slavik // Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FS_MEM_H_ #define _WX_FS_MEM_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "fs_mem.h" -#endif - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#include "wx/defs.h" #if wxUSE_FILESYSTEM #include "wx/filesys.h" -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxImage; +#if wxUSE_GUI + class WXDLLIMPEXP_FWD_CORE wxBitmap; + class WXDLLIMPEXP_FWD_CORE wxImage; +#endif // wxUSE_GUI -//-------------------------------------------------------------------------------- -// wxMemoryFSHandler -//-------------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxMemoryFSHandlerBase +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMemoryFSHandlerBase : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler { public: wxMemoryFSHandlerBase(); - ~wxMemoryFSHandlerBase(); + virtual ~wxMemoryFSHandlerBase(); // Add file to list of files stored in memory. Stored data (bitmap, text or // raw data) will be copied into private memory stream and available under // name "memory:" + filename - static void AddFile(const wxString& filename, wxImage& image, long type); static void AddFile(const wxString& filename, const wxString& textdata); static void AddFile(const wxString& filename, const void *binarydata, size_t size); + static void AddFileWithMimeType(const wxString& filename, + const wxString& textdata, + const wxString& mimetype); + static void AddFileWithMimeType(const wxString& filename, + const void *binarydata, size_t size, + const wxString& mimetype); // Remove file from memory FS and free occupied memory static void RemoveFile(const wxString& filename); @@ -51,20 +50,73 @@ public: virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindNext(); -private: - static wxHashTable *m_Hash; - +protected: static bool CheckHash(const wxString& filename); + static wxHashTable *m_Hash; }; -class wxMemoryFSHandler : public wxMemoryFSHandlerBase +// ---------------------------------------------------------------------------- +// wxMemoryFSHandler +// ---------------------------------------------------------------------------- + +#if wxUSE_GUI + +// add GUI-only operations to the base class +class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase { public: -#if wxUSE_GUI - static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); -#endif // wxUSE_GUI + // bring the base class versions into the scope, otherwise they would be + // inaccessible in wxMemoryFSHandler + // (unfortunately "using" can't be used as gcc 2.95 doesn't have it...) + static void AddFile(const wxString& filename, const wxString& textdata) + { + wxMemoryFSHandlerBase::AddFile(filename, textdata); + } + + static void AddFile(const wxString& filename, + const void *binarydata, + size_t size) + { + wxMemoryFSHandlerBase::AddFile(filename, binarydata, size); + } + static void AddFileWithMimeType(const wxString& filename, + const wxString& textdata, + const wxString& mimetype) + { + wxMemoryFSHandlerBase::AddFileWithMimeType(filename, + textdata, + mimetype); + } + static void AddFileWithMimeType(const wxString& filename, + const void *binarydata, size_t size, + const wxString& mimetype) + { + wxMemoryFSHandlerBase::AddFileWithMimeType(filename, + binarydata, size, + mimetype); + } + +#if wxUSE_IMAGE + static void AddFile(const wxString& filename, + const wxImage& image, + long type); + + static void AddFile(const wxString& filename, + const wxBitmap& bitmap, + long type); +#endif // wxUSE_IMAGE + }; +#else // !wxUSE_GUI + +// just the same thing as the base class in wxBase +class WXDLLIMPEXP_BASE wxMemoryFSHandler : public wxMemoryFSHandlerBase +{ +}; + +#endif // wxUSE_GUI/!wxUSE_GUI + #endif // wxUSE_FILESYSTEM #endif // _WX_FS_MEM_H_