Quick and dirty fix for building with COMPATIBILITY_2_4 off.

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 03fa523eee7e3e4eaf26a680cf14451c2b3b90ce..168bc1a1b0e20ef3039ee697f53d00517a988831 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -9,13 +9,13 @@
 #ifndef _WX_FS_MEM_H_
 #define _WX_FS_MEM_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "fs_mem.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
@@ -24,46 +24,51 @@
 #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
 //--------------------------------------------------------------------------------
 
-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
+class wxMemoryFSHandler : public wxMemoryFSHandlerBase
+{
+public:
 #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);
-
-        // 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();
-
-    private:
-        static wxHashTable *m_Hash;
-
-        static bool CheckHash(const wxString& filename);
+#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
 };
 
-#endif
-  // wxUSE_FILESYSTEM
-
+#endif // wxUSE_FILESYSTEM
 
 #endif // _WX_FS_MEM_H_