X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec67cff1f6e63b3b27613a085f0492958e66a28e..697c314b162ff4758db0047e548d5401994d2c70:/src/common/fs_mem.cpp?ds=sidebyside

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index d6b020b2ab..4d9ba72339 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -1,33 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __GNUG__
-#pragma implementation "fs_mem.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
-#include "wx/image.h"
-#include "wx/bitmap.h"
 #include "wx/fs_mem.h"
 
-
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
+    #include "wx/wxcrtvararg.h"
+    #if wxUSE_GUI
+        #include "wx/image.h"
+    #endif // wxUSE_GUI
 #endif
 
 #include "wx/mstream.h"
@@ -36,29 +33,32 @@ class MemFSHashObj : public wxObject
 {
     public:
 
-        MemFSHashObj(const void *data, size_t len)
+        MemFSHashObj(const void *data, size_t len, const wxString& mime)
         {
             m_Data = new char[len];
             memcpy(m_Data, data, len);
             m_Len = len;
+            m_MimeType = mime;
             InitTime();
         }
 
-        MemFSHashObj(wxMemoryOutputStream& stream)
+        MemFSHashObj(const wxMemoryOutputStream& stream, const wxString& mime)
         {
             m_Len = stream.GetSize();
             m_Data = new char[m_Len];
             stream.CopyTo(m_Data, m_Len);
+            m_MimeType = mime;
             InitTime();
         }
 
-        ~MemFSHashObj()
+        virtual ~MemFSHashObj()
         {
             delete[] m_Data;
         }
 
         char *m_Data;
         size_t m_Len;
+        wxString m_MimeType;
 #if wxUSE_DATETIME
         wxDateTime m_Time;
 #endif // wxUSE_DATETIME
@@ -70,7 +70,7 @@ class MemFSHashObj : public wxObject
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();
-#endif // wxUSE_DATETIME            
+#endif // wxUSE_DATETIME
         }
 };
 
@@ -99,6 +99,7 @@ wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
 
     if (m_Hash)
     {
+        WX_CLEAR_HASH_TABLE(*m_Hash);
         delete m_Hash;
         m_Hash = NULL;
     }
@@ -123,11 +124,11 @@ wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxSt
         if (obj == NULL)  return NULL;
         else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
                             location,
-                            GetMimeTypeFromExt(location),
+                            obj->m_MimeType,
                             GetAnchor(location)
 #if wxUSE_DATETIME
                             , obj -> m_Time
-#endif // wxUSE_DATETIME                            
+#endif // wxUSE_DATETIME
                             );
     }
     else return NULL;
@@ -158,7 +159,6 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
-        m_Hash -> DeleteContents(TRUE);
     }
 
     if (m_Hash -> Get(filename) != NULL)
@@ -166,23 +166,46 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);
-        return FALSE;
+        return false;
     }
     else
-        return TRUE;
+        return true;
 }
 
 
-/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const wxString& textdata,
+                                                const wxString& mimetype)
 {
-    AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
+    AddFileWithMimeType(filename,
+                        (const void*) textdata.mb_str(), textdata.length(),
+                        mimetype);
 }
 
 
-/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const void *binarydata, size_t size)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const void *binarydata, size_t size,
+                                                const wxString& mimetype)
 {
     if (!CheckHash(filename)) return;
-    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size));
+    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size, mimetype));
+}
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const wxString& textdata)
+{
+    AddFileWithMimeType(filename, textdata, wxEmptyString);
+}
+
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const void *binarydata, size_t size)
+{
+    AddFileWithMimeType(filename, binarydata, size, wxEmptyString);
 }
 
 
@@ -207,13 +230,25 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 
 #if wxUSE_IMAGE
 /*static*/ void
-wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           wxBitmapType type)
 {
     if (!CheckHash(filename)) return;
 
     wxMemoryOutputStream mems;
-    if (image.Ok() && image.SaveFile(mems, (int)type))
-        m_Hash -> Put(filename, new MemFSHashObj(mems));
+    if (image.Ok() && image.SaveFile(mems, type))
+    {
+        m_Hash->Put
+                (
+                    filename,
+                    new MemFSHashObj
+                        (
+                            mems,
+                            wxImage::FindHandler(type)->GetMimeType()
+                        )
+                );
+    }
     else
     {
         wxString s;
@@ -222,16 +257,21 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
         wxLogError(s);
     }
 }
-#endif // wxUSE_IMAGE
 
-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxBitmap& bitmap,
+                           wxBitmapType type)
 {
+#if !defined(__WXMSW__) || wxUSE_WXDIB
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
+#endif
 }
 
-#endif
+#endif // wxUSE_IMAGE
 
+#endif // wxUSE_GUI
 
-#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
 
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP