Better place for coordinate mirroring and removal

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index eca35ac6ff4b58a438f5495fee1e3d417a9d5e60..054cb609ef830437e0631b402d7b9425f39db7fa 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -1,32 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 

+#include "wx/fs_mem.h"
+

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

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

 #include "wx/mstream.h"
 
 class MemFSHashObj : public wxObject
 #include "wx/mstream.h"
 
 class MemFSHashObj : public wxObject


@@ -38,55 +38,73 @@ class MemFSHashObj : public wxObject
             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_Time = wxDateTime::Now();
+            InitTime();

         }
 
         }
 

-        MemFSHashObj(wxMemoryOutputStream& stream)
+        MemFSHashObj(const wxMemoryOutputStream& stream)

         {
             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_Time = wxDateTime::Now();
+            InitTime();

         }
 
         }
 

-        ~MemFSHashObj()
+        virtual ~MemFSHashObj()

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

+#if wxUSE_DATETIME

         wxDateTime m_Time;
         wxDateTime m_Time;

+#endif // wxUSE_DATETIME
+
+    DECLARE_NO_COPY_CLASS(MemFSHashObj)
+
+    private:
+        void InitTime()
+        {
+#if wxUSE_DATETIME
+            m_Time = wxDateTime::Now();
+#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"));


@@ -95,7 +113,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)
     {


@@ -104,38 +122,40 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString
         else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
                             location,
                             GetMimeTypeFromExt(location),
         else return new wxFSFile(new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
                             location,
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location),
-                            obj -> m_Time);
+                            GetAnchor(location)
+#if wxUSE_DATETIME
+                            , obj -> m_Time
+#endif // wxUSE_DATETIME
+                            );

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

-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)


@@ -143,70 +163,79 @@ 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;

 }
 
 
 }
 
 

+/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
+{
+    AddFile(filename, (const void*) textdata.mb_str(), textdata.length());
+}

 
 

-#if wxUSE_GUI

 
 

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

 {
     if (!CheckHash(filename)) return;
 {
     if (!CheckHash(filename)) return;

+    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size));
+}

 
 
 
 

-    wxMemoryOutputStream mems;
-    if (image.Ok() && image.SaveFile(mems, (int)type))
-        m_Hash -> Put(filename, new MemFSHashObj(mems));
-    else
+
+/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
+{
+    if (m_Hash == NULL ||
+        m_Hash -> Get(filename) == NULL)

     {
         wxString s;
     {
         wxString s;

-        s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
-        wxPrintf(wxT("'%s'\n"), s.c_str());
+        s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());

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

-}

 
 

-
-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
-{
-    wxImage img = bitmap.ConvertToImage();
-    AddFile(filename, img, type);
+    else
+        delete m_Hash -> Delete(filename);

 }
 
 }
 

-#endif
-
-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
-{
-    AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
-}
+#endif // wxUSE_BASE

 
 

+#if wxUSE_GUI

 
 

-/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const void *binarydata, size_t size)
+#if wxUSE_IMAGE
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           long type)

 {
     if (!CheckHash(filename)) return;
 {
     if (!CheckHash(filename)) return;

-    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size));
-}

 
 

-
-
-/*static*/ void wxMemoryFSHandler::RemoveFile(const wxString& filename)
-{
-    if (m_Hash == NULL ||
-        m_Hash -> Get(filename) == NULL)
+    wxMemoryOutputStream mems;
+    if (image.Ok() && image.SaveFile(mems, (int)type))
+        m_Hash -> Put(filename, new MemFSHashObj(mems));
+    else

     {
         wxString s;
     {
         wxString s;

-        s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
+        s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());

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

+}

 
 

-    else
-        delete m_Hash -> Delete(filename);
+/*static*/ void
+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
+
+#endif // wxUSE_GUI

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