Eliminate a warning

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 29c730164c37493885b9e32e7f889eee63ac3bcb..4d9ba72339f6d63090c2ee1d7ab488f48b943559 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -1,61 +1,64 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_mem.cpp
+// Name:        src/common/fs_mem.cpp

 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik

+// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // 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__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 

-#ifndef WXPRECOMP
+#include "wx/fs_mem.h"
+
+#ifndef WX_PRECOMP

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/hash.h"
     #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
 
 #endif
 

-#include "wx/filesys.h"
-#include "wx/fs_mem.h"

 #include "wx/mstream.h"
 
 class MemFSHashObj : public wxObject
 {
     public:
 
 #include "wx/mstream.h"
 
 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_Data = new char[len];
             memcpy(m_Data, data, len);
             m_Len = len;

+            m_MimeType = mime;

             InitTime();
         }
 
             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_Len = stream.GetSize();
             m_Data = new char[m_Len];
             stream.CopyTo(m_Data, m_Len);

+            m_MimeType = mime;

             InitTime();
         }
 
             InitTime();
         }
 

-        ~MemFSHashObj()
+        virtual ~MemFSHashObj()

         {
             delete[] m_Data;
         }
 
         char *m_Data;
         size_t m_Len;
         {
             delete[] m_Data;
         }
 
         char *m_Data;
         size_t m_Len;

+        wxString m_MimeType;

 #if wxUSE_DATETIME
         wxDateTime m_Time;
 #endif // wxUSE_DATETIME
 #if wxUSE_DATETIME
         wxDateTime m_Time;
 #endif // wxUSE_DATETIME


@@ -67,38 +70,44 @@ class MemFSHashObj : public wxObject
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();

-#endif // wxUSE_DATETIME            
+#endif // wxUSE_DATETIME

         }
 };
 
         }
 };
 

+#if wxUSE_BASE
+

 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
 //--------------------------------------------------------------------------------
 
 
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
 //--------------------------------------------------------------------------------
 
 

-wxHashTable *wxMemoryFSHandler::m_Hash = NULL;
+wxHashTable *wxMemoryFSHandlerBase::m_Hash = NULL;

 
 
 
 

-wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
+wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()

 {
 }
 
 
 
 {
 }
 
 
 

-wxMemoryFSHandler::~wxMemoryFSHandler()
+wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()

 {
     // 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;
-    m_Hash = NULL;
+    if (m_Hash)
+    {
+        WX_CLEAR_HASH_TABLE(*m_Hash);
+        delete m_Hash;
+        m_Hash = NULL;
+    }

 }
 
 
 
 }
 
 
 

-bool wxMemoryFSHandler::CanOpen(const wxString& location)
+bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)

 {
     wxString p = GetProtocol(location);
     return (p == wxT("memory"));
 {
     wxString p = GetProtocol(location);
     return (p == wxT("memory"));


@@ -107,7 +116,7 @@ bool wxMemoryFSHandler::CanOpen(const wxString& location)
 
 
 
 
 
 

-wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
+wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)

 {
     if (m_Hash)
     {
 {
     if (m_Hash)
     {


@@ -115,11 +124,11 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString
         if (obj == NULL)  return NULL;
         else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
                             location,
         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
                             GetAnchor(location)
 #if wxUSE_DATETIME
                             , obj -> m_Time

-#endif // wxUSE_DATETIME                            
+#endif // wxUSE_DATETIME

                             );
     }
     else return NULL;
                             );
     }
     else return NULL;


@@ -127,30 +136,29 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString
 
 
 
 
 
 

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

                                       int WXUNUSED(flags))
 {
                                       int WXUNUSED(flags))
 {

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

 
     return wxEmptyString;
 }
 
 
 
 
     return wxEmptyString;
 }
 
 
 

-wxString wxMemoryFSHandler::FindNext()
+wxString wxMemoryFSHandlerBase::FindNext()

 {
 {

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

 
     return wxEmptyString;
 }
 
 
 
     return wxEmptyString;
 }
 
 

-bool wxMemoryFSHandler::CheckHash(const wxString& filename)
+bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)

 {
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
 {
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);

-        m_Hash -> DeleteContents(TRUE);

     }
 
     if (m_Hash -> Get(filename) != NULL)
     }
 
     if (m_Hash -> Get(filename) != NULL)


@@ -158,57 +166,51 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);

-        return FALSE;
+        return false;

     }
     else
     }
     else

-        return TRUE;
+        return true;

 }
 
 
 }
 
 

-
-#if wxUSE_GUI
-
-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const wxString& textdata,
+                                                const wxString& mimetype)

 {
 {

-    if (!CheckHash(filename)) return;
-
-
-    wxMemoryOutputStream mems;
-    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());
-        wxPrintf(wxT("'%s'\n"), s.c_str());
-        wxLogError(s);
-    }
+    AddFileWithMimeType(filename,
+                        (const void*) textdata.mb_str(), textdata.length(),
+                        mimetype);

 }
 
 
 }
 
 

-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const void *binarydata, size_t size,
+                                                const wxString& mimetype)

 {
 {

-    wxImage img = bitmap.ConvertToImage();
-    AddFile(filename, img, type);
+    if (!CheckHash(filename)) return;
+    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size, mimetype));

 }
 
 }
 

-#endif
-
-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const wxString& textdata)

 {
 {

-    AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
+    AddFileWithMimeType(filename, textdata, wxEmptyString);

 }
 
 
 }
 
 

-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const void *binarydata, size_t size)
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const void *binarydata, size_t size)

 {
 {

-    if (!CheckHash(filename)) return;
-    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size));
+    AddFileWithMimeType(filename, binarydata, size, wxEmptyString);

 }
 
 
 
 }
 
 
 

-/*static*/ void wxMemoryFSHandler::RemoveFile(const wxString& filename)
+/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)

 {
     if (m_Hash == NULL ||
         m_Hash -> Get(filename) == NULL)
 {
     if (m_Hash == NULL ||
         m_Hash -> Get(filename) == NULL)


@@ -222,6 +224,54 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
         delete m_Hash -> Delete(filename);
 }
 
         delete m_Hash -> Delete(filename);
 }
 

+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+#if wxUSE_IMAGE
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           wxBitmapType type)
+{
+    if (!CheckHash(filename)) return;
+
+    wxMemoryOutputStream mems;
+    if (image.Ok() && image.SaveFile(mems, type))
+    {
+        m_Hash->Put
+                (
+                    filename,
+                    new MemFSHashObj
+                        (
+                            mems,
+                            wxImage::FindHandler(type)->GetMimeType()
+                        )
+                );
+    }
+    else
+    {
+        wxString s;
+        s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());
+        wxLogError(s);
+    }
+}
+
+/*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 // wxUSE_IMAGE
+
+#endif // wxUSE_GUI

 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP