Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 455a78fe1f0e1b12287c3652bb4af317f6469000..9a46b264f40b78f6801a0c4ca96ab789d5f28fdc 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -9,7 +9,14 @@
 #ifndef _WX_FS_MEM_H_
 #define _WX_FS_MEM_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
 #pragma interface "fs_mem.h"
 #endif
 
@@ -24,15 +31,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 +64,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_