don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index be005401ed43ca8836f78c1afd29cc56c102522b..7dd33a3c7077b933d5ade39f224fad5d1ab19cc0 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,21 +3,13 @@
 // 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(NO_GCC_PRAGMA)
-#pragma interface "fs_mem.h"
-#endif
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_FILESYSTEM
 
 
 #if wxUSE_FILESYSTEM
 


@@ -36,7 +28,7 @@ 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
 
     // 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


@@ -83,12 +75,15 @@ public:
     }
 
 #if wxUSE_IMAGE
     }
 
 #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);
 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
                         long type);

+#endif // wxUSE_IMAGE
+

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