Applied patch [ 666379 ] CalCtrl doesn't use best sizes for the year combobox

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 3b45f31ae287b1cbe6ebc1f0c49263e564d5e48f..19f5da5fc51f6969933997e6cfed99f4e1ce7a1d 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -8,30 +8,31 @@
 
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation "fs_mem.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
 #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"
 
-
 class MemFSHashObj : public wxObject
 {
     public:
-        
+
         MemFSHashObj(const void *data, size_t len)
         {
             m_Data = new char[len];
@@ -39,7 +40,7 @@ class MemFSHashObj : public wxObject
             m_Len = len;
             m_Time = wxDateTime::Now();
         }
-        
+
         MemFSHashObj(wxMemoryOutputStream& stream)
         {
             m_Len = stream.GetSize();
@@ -47,15 +48,17 @@ class MemFSHashObj : public wxObject
             stream.CopyTo(m_Data, m_Len);
             m_Time = wxDateTime::Now();
         }
-        
+
         ~MemFSHashObj()
         {
             delete[] m_Data;
         }
-        
+
         char *m_Data;
         size_t m_Len;
         wxDateTime m_Time;
+
+    DECLARE_NO_COPY_CLASS(MemFSHashObj)
 };
 
 
@@ -69,7 +72,6 @@ wxHashTable *wxMemoryFSHandler::m_Hash = NULL;
 
 wxMemoryFSHandler::wxMemoryFSHandler() : wxFileSystemHandler()
 {
-    m_Hash = NULL;
 }
 
 
@@ -79,8 +81,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.)
-    
-    if (m_Hash) delete m_Hash; 
+
+    if (m_Hash) delete m_Hash;
     m_Hash = NULL;
 }
 
@@ -112,9 +114,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;
 }
 
@@ -122,20 +126,20 @@ wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags)
 
 wxString wxMemoryFSHandler::FindNext()
 {
-    wxLogWarning(wxT("wxMemoryFSHandler::FindNext not implemented"));
+    wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented"));
+
     return wxEmptyString;
 }
 
 
-
 bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {
-    if (m_Hash == NULL) 
+    if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
         m_Hash -> DeleteContents(TRUE);
     }
-    
+
     if (m_Hash -> Get(filename) != NULL)
     {
         wxString s;
@@ -155,15 +159,15 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {
     if (!CheckHash(filename)) return;
 
-    
+
     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());
-        printf("'%s'\n", s.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());
         wxLogError(s);
     }
 }
@@ -171,7 +175,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
 }