merged MapBitmap() from 2.2 branch

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index adee5e641efff0771b2b120412b62e8db851625b..2bfcfd02be1240efd3c5b24b75813cf44c2a16f4 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -8,7 +8,7 @@
 
 
 #ifdef __GNUG__
 
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "fs_mem.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -17,42 +17,43 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_STREAMS

 
 #ifndef WXPRECOMP
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/hash.h"

 #endif
 
 #include "wx/filesys.h"
 #include "wx/fs_mem.h"
 #include "wx/mstream.h"
 
 #endif
 
 #include "wx/filesys.h"
 #include "wx/fs_mem.h"
 #include "wx/mstream.h"
 

-

 class MemFSHashObj : public wxObject
 {
     public:
 class MemFSHashObj : public wxObject
 {
     public:

-        
+

         MemFSHashObj(const void *data, size_t len)
         {
             m_Data = new char[len];
             memcpy(m_Data, data, len);
             m_Len = len;
         MemFSHashObj(const void *data, size_t len)
         {
             m_Data = new char[len];
             memcpy(m_Data, data, len);
             m_Len = len;

-            m_Time = wxDateTime::Today();
+            m_Time = wxDateTime::Now();

         }
         }

-        
+

         MemFSHashObj(wxMemoryOutputStream& stream)
         {
             m_Len = stream.GetSize();
             m_Data = new char[m_Len];
             stream.CopyTo(m_Data, m_Len);
         MemFSHashObj(wxMemoryOutputStream& stream)
         {
             m_Len = stream.GetSize();
             m_Data = new char[m_Len];
             stream.CopyTo(m_Data, m_Len);

-            m_Time = wxDateTime::Today();
+            m_Time = wxDateTime::Now();

         }
         }

-        
+

         ~MemFSHashObj()
         {
             delete[] m_Data;
         }
         ~MemFSHashObj()
         {
             delete[] m_Data;
         }

-        
+

         char *m_Data;
         size_t m_Len;
         wxDateTime m_Time;
         char *m_Data;
         size_t m_Len;
         wxDateTime m_Time;


@@ -79,8 +80,8 @@ wxMemoryFSHandler::~wxMemoryFSHandler()
     // as only one copy of FS handler is supposed to exist, we may silently
     // delete static data here. (There is no way how to remove FS handler from
     // wxFileSystem other than releasing _all_ handlers.)
     // as only one copy of FS handler is supposed to exist, we may silently
     // delete static data here. (There is no way how to remove FS handler from
     // wxFileSystem other than releasing _all_ handlers.)

-    
-    if (m_Hash) delete m_Hash; 
+
+    if (m_Hash) delete m_Hash;

     m_Hash = NULL;
 }
 
     m_Hash = NULL;
 }
 


@@ -112,9 +113,11 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString
 
 
 
 
 
 

-wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags)
+wxString wxMemoryFSHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                      int WXUNUSED(flags))

 {
 {

-    wxLogWarning(wxT("wxMemoryFSHandler::FindFirst not implemented"));
+    wxFAIL_MSG(wxT("wxMemoryFSHandler::FindFirst not implemented"));
+

     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 


@@ -122,20 +125,20 @@ wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags)
 
 wxString wxMemoryFSHandler::FindNext()
 {
 
 wxString wxMemoryFSHandler::FindNext()
 {

-    wxLogWarning(wxT("wxMemoryFSHandler::FindNext not implemented"));
+    wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented"));
+

     return wxEmptyString;
 }
 
 
     return wxEmptyString;
 }
 
 

-

 bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {
 bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {

-    if (m_Hash == NULL) 
+    if (m_Hash == NULL)

     {
         m_Hash = new wxHashTable(wxKEY_STRING);
         m_Hash -> DeleteContents(TRUE);
     }
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
         m_Hash -> DeleteContents(TRUE);
     }

-    
+

     if (m_Hash -> Get(filename) != NULL)
     {
         wxString s;
     if (m_Hash -> Get(filename) != NULL)
     {
         wxString s;


@@ -149,19 +152,21 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
 
 
 

+#if wxUSE_GUI
+

 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;
 

-    
+

     wxMemoryOutputStream mems;
     wxMemoryOutputStream mems;

-    if (image.Ok() && image.SaveFile(mems, type))
+    if (image.Ok() && image.SaveFile(mems, (int)type))

         m_Hash -> Put(filename, new MemFSHashObj(mems));
     else
     {
         wxString s;
         s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
         m_Hash -> Put(filename, new MemFSHashObj(mems));
     else
     {
         wxString s;
         s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());

-        printf("'%s'\n", s.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());

         wxLogError(s);
     }
 }
         wxLogError(s);
     }
 }


@@ -173,6 +178,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
     AddFile(filename, img, type);
 }
 
     AddFile(filename, img, type);
 }
 

+#endif

 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {


@@ -204,4 +210,4 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
 
 
 

-#endif // wxUSE_FS_ZIP
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP