define wxHAS_ATOMIC_OPS only if native implementation is available; use fewer loop...

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 8b377103f11f8ecbe639d6eb84d03af58c266256..ae40a1599f3b78ec1dc5e9752de03171f2fc239f 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,29 +3,20 @@
 // 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__)
-#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 WXDLLIMPEXP_CORE wxBitmap;
-    class WXDLLIMPEXP_CORE wxImage;
+    #include "wx/bitmap.h"

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -36,13 +27,19 @@ class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
 {
 public:
     wxMemoryFSHandlerBase();
 {
 public:
     wxMemoryFSHandlerBase();

-    ~wxMemoryFSHandlerBase();
+    virtual ~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);
 
     // 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);

+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype);
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype);

 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);
 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);


@@ -69,15 +66,45 @@ class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase
 public:
     // bring the base class versions into the scope, otherwise they would be
     // inaccessible in wxMemoryFSHandler
 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);
+    }
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const wxString& textdata,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   textdata,
+                                                   mimetype);
+    }
+    static void AddFileWithMimeType(const wxString& filename,
+                                    const void *binarydata, size_t size,
+                                    const wxString& mimetype)
+    {
+        wxMemoryFSHandlerBase::AddFileWithMimeType(filename,
+                                                   binarydata, size,
+                                                   mimetype);
+    }

 
 #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,
+                        wxBitmapType type);
+
+    static void AddFile(const wxString& filename,
+                        const wxBitmap& bitmap,
+                        wxBitmapType type);

 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_IMAGE
 

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

 };
 
 #else // !wxUSE_GUI
 };
 
 #else // !wxUSE_GUI