Add class factories for filter streams. Also filters now follow the convention

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 81bf3697657374e4a7dfb3d8d0085ca0af44d849..054cb609ef830437e0631b402d7b9425f39db7fa 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -1,35 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 
 #include "wx/fs_mem.h"
 
 #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"
 #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"
 #endif
 
 #include "wx/mstream.h"


@@ -46,7 +41,7 @@ class MemFSHashObj : public wxObject
             InitTime();
         }
 
             InitTime();
         }
 

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

         {
             m_Len = stream.GetSize();
             m_Data = new char[m_Len];
         {
             m_Len = stream.GetSize();
             m_Data = new char[m_Len];


@@ -54,7 +49,7 @@ class MemFSHashObj : public wxObject
             InitTime();
         }
 
             InitTime();
         }
 

-        ~MemFSHashObj()
+        virtual ~MemFSHashObj()

         {
             delete[] m_Data;
         }
         {
             delete[] m_Data;
         }


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

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

         }
 };
 
         }
 };
 


@@ -130,7 +125,7 @@ wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxSt
                             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;


@@ -168,16 +163,16 @@ bool wxMemoryFSHandlerBase::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)
 {
 }
 
 
 /*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());

 }
 
 
 }
 
 


@@ -209,7 +204,9 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 
 #if wxUSE_IMAGE
 /*static*/ void
 
 #if wxUSE_IMAGE
 /*static*/ void

-wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           long type)

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


@@ -224,16 +221,21 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
         wxLogError(s);
     }
 }
         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,
+                           long type)

 {
 {

+#if !defined(__WXMSW__) || wxUSE_WXDIB

     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
     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

-