X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ea4a2f552cb89f40f7e2b0beebe447259ab3653..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/fs_mem.h?ds=sidebyside diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 8b377103f1..ad0927f42b 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -3,29 +3,21 @@ // 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" #if wxUSE_GUI - class WXDLLIMPEXP_CORE wxBitmap; - class WXDLLIMPEXP_CORE wxImage; + class WXDLLIMPEXP_FWD_CORE wxBitmap; + class WXDLLIMPEXP_FWD_CORE wxImage; #endif // wxUSE_GUI // ---------------------------------------------------------------------------- @@ -36,13 +28,19 @@ 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, 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); @@ -69,15 +67,45 @@ class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase public: // bring the base class versions into the scope, otherwise they would be // inaccessible in wxMemoryFSHandler -#if !defined(__GNUG__) || (__GNUG__ > 2) - using wxMemoryFSHandlerBase::AddFile; -#endif + // (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, wxImage& image, long type); + 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 - static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); }; #else // !wxUSE_GUI