X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..4104ed92a537f36f7f41ce07d34cadbe4d78685c:/include/wx/fs_mem.h?ds=inline diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 455a78fe1f..34531d96ca 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -24,15 +24,15 @@ #include "wx/filesys.h" #if wxUSE_GUI - class WXDLLEXPORT_CORE wxBitmap; - class WXDLLEXPORT_CORE wxImage; + class WXDLLIMPEXP_CORE wxBitmap; + class WXDLLIMPEXP_CORE wxImage; #endif // wxUSE_GUI -//-------------------------------------------------------------------------------- -// wxMemoryFSHandler -//-------------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxMemoryFSHandlerBase +// ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler { public: wxMemoryFSHandlerBase(); @@ -57,17 +57,49 @@ protected: 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 + // 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); + } + #if wxUSE_IMAGE static void AddFile(const wxString& filename, wxImage& image, long type); #endif // wxUSE_IMAGE - static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); -#endif // wxUSE_GUI + + static void AddFile(const wxString& filename, + const wxBitmap& bitmap, + long type); }; +#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_