#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
public:
// bring the base class versions into the scope, otherwise they would be
// inaccessible in wxMemoryFSHandler
-#if !defined(__GNUG__) || (__GNUG__ > 2)
- using wxMemoryFSHandlerBase::AddFile;
-#endif
+ // (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);
+ static void AddFile(const wxString& filename,
+ const wxBitmap& bitmap,
+ long type);
};
#else // !wxUSE_GUI