renamed to WX_DECLARE_LIST_WITH_DECL for consistency

[wxWidgets.git] / include / wx / fs_mem.h

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 0d70b7be9ec70d19bb00a23052acf9b797d90b38..34531d96ca9c6df8174d6bda8dca24172a5c6eaf 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -15,7 +15,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -24,46 +24,83 @@
 #include "wx/filesys.h"
 
 #if wxUSE_GUI
 #include "wx/filesys.h"
 
 #if wxUSE_GUI

-    #include "wx/image.h"
-    #include "wx/bitmap.h"
-#endif
+    class WXDLLIMPEXP_CORE wxBitmap;
+    class WXDLLIMPEXP_CORE wxImage;
+#endif // wxUSE_GUI

 
 

-//--------------------------------------------------------------------------------
-// wxMemoryFSHandler
-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxMemoryFSHandlerBase
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler

 {
 {

-    public:
-        wxMemoryFSHandler();
-        ~wxMemoryFSHandler();
+public:
+    wxMemoryFSHandlerBase();
+    ~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);
+
+    // Remove file from memory FS and free occupied memory
+    static void RemoveFile(const wxString& filename);
+
+    virtual bool CanOpen(const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindNext();
+
+protected:
+    static bool CheckHash(const wxString& filename);
+    static wxHashTable *m_Hash;
+};

 
 

-        // 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
-#if wxUSE_GUI
-        static void AddFile(const wxString& filename, wxImage& image, long type);
-        static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
-#endif
-        static void AddFile(const wxString& filename, const wxString& textdata);
-        static void AddFile(const wxString& filename, const void *binarydata, size_t size);
+// ----------------------------------------------------------------------------
+// wxMemoryFSHandler
+// ----------------------------------------------------------------------------

 
 

-        // Remove file from memory FS and free occupied memory
-        static void RemoveFile(const wxString& filename);
+#if wxUSE_GUI

 
 

-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-        virtual wxString FindFirst(const wxString& spec, int flags = 0);
-        virtual wxString FindNext();
+// add GUI-only operations to the base class
+class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase
+{
+public:
+    // 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);
+};

 
 

-    private:
-        static wxHashTable *m_Hash;
+#else // !wxUSE_GUI

 
 

-        static bool CheckHash(const wxString& filename);
+// just the same thing as the base class in wxBase
+class WXDLLIMPEXP_BASE wxMemoryFSHandler : public wxMemoryFSHandlerBase
+{

 };
 
 };
 

-#endif
-  // wxUSE_FILESYSTEM
+#endif // wxUSE_GUI/!wxUSE_GUI

 
 

+#endif // wxUSE_FILESYSTEM

 
 #endif // _WX_FS_MEM_H_
 
 
 #endif // _WX_FS_MEM_H_