bump subrelease number

[wxWidgets.git] / src / common / fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 5c983a1def81760c90e131154cf77af37562ced7..054cb609ef830437e0631b402d7b9425f39db7fa 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -1,7 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fs_mem.cpp
+// Name:        src/common/fs_mem.cpp
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -9,22 +10,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
 #include "wx/fs_mem.h"
 
-#if wxUSE_GUI
-    #include "wx/image.h"
-    #include "wx/bitmap.h"
-#endif // wxUSE_GUI
-
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
+    #if wxUSE_GUI
+        #include "wx/bitmap.h"
+        #include "wx/image.h"
+    #endif // wxUSE_GUI
 #endif
 
 #include "wx/mstream.h"
@@ -49,7 +49,7 @@ class MemFSHashObj : public wxObject
             InitTime();
         }
 
-        ~MemFSHashObj()
+        virtual ~MemFSHashObj()
         {
             delete[] m_Data;
         }
@@ -172,7 +172,7 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 
 /*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
 {
-    AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
+    AddFile(filename, (const void*) textdata.mb_str(), textdata.length());
 }
 
 
@@ -227,8 +227,10 @@ wxMemoryFSHandler::AddFile(const wxString& filename,
                            const wxBitmap& bitmap,
                            long type)
 {
+#if !defined(__WXMSW__) || wxUSE_WXDIB
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
+#endif
 }
 
 #endif // wxUSE_IMAGE
@@ -237,4 +239,3 @@ wxMemoryFSHandler::AddFile(const wxString& filename,
 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
-