Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 455a78fe1f0e1b12287c3652bb4af317f6469000..f7224b7ec767fcebd93c3dbbe39230bb5863b928 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,36 +3,39 @@
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_MEM_H_
 #define _WX_FS_MEM_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 
 #pragma interface "fs_mem.h"
 #endif
 

-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_FILESYSTEM
 
 #include "wx/filesys.h"
 
 #if wxUSE_GUI
 
 #if wxUSE_FILESYSTEM
 
 #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
 
 #endif // wxUSE_GUI
 

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

 
 

-class WXDLLEXPORT_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler

 {
 public:
     wxMemoryFSHandlerBase();
 {
 public:
     wxMemoryFSHandlerBase();


@@ -57,17 +60,52 @@ protected:
     static wxHashTable *m_Hash;
 };
 
     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:
 {
 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
 #if wxUSE_IMAGE

-    static void AddFile(const wxString& filename, wxImage& image, long type);
+    static void AddFile(const wxString& filename,
+                        const wxImage& image,
+                        long type);
+
+    static void AddFile(const wxString& filename,
+                        const wxBitmap& bitmap,
+                        long type);

 #endif // wxUSE_IMAGE
 #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_
 #endif // wxUSE_FILESYSTEM
 
 #endif // _WX_FS_MEM_H_