X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e484468721a4e8e0099a363deee468e44d89294a..b6428abaa5ac53c69c6113b86c0a0b8b05b93df7:/include/wx/fs_mem.h

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 9a46b264f4..7dd33a3c70 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,28 +3,13 @@
 // 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_
 
-#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
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM
 
@@ -43,7 +28,7 @@ class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
 {
 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
@@ -90,12 +75,15 @@ public:
     }
 
 #if wxUSE_IMAGE
-    static void AddFile(const wxString& filename, wxImage& image, long type);
-#endif // wxUSE_IMAGE
+    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
+
 };
 
 #else // !wxUSE_GUI