X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..47f1ad6a7120c2eeba788b5e1300e837ae2e7e58:/include/wx/fs_mem.h diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index e304cd1143..7d82b005d8 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -23,14 +23,16 @@ #include "wx/filesys.h" -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxImage; +#if wxUSE_GUI + class WXDLLIMPEXP_CORE wxBitmap; + class WXDLLIMPEXP_CORE wxImage; +#endif // wxUSE_GUI -//-------------------------------------------------------------------------------- -// wxMemoryFSHandler -//-------------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxMemoryFSHandlerBase +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMemoryFSHandlerBase : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler { public: wxMemoryFSHandlerBase(); @@ -39,7 +41,6 @@ public: // 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); @@ -51,20 +52,41 @@ 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 + // bring the base class versions into the scope, otherwise they would be + // inaccessible in wxMemoryFSHandler + using wxMemoryFSHandlerBase::AddFile; + +#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 }; +#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_