icon support moved to wxBitmap, allowing for fully transparent usage

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index bc089b0990f7f442bfe339ccf2554c6f15fb1f75..4f8f84d4eb0f8a580a2a1d1bb9a14b2d89b89f7c 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"


@@ -27,7 +27,6 @@
 #include "wx/fs_mem.h"
 #include "wx/mstream.h"
 
 #include "wx/fs_mem.h"
 #include "wx/mstream.h"
 

-

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


@@ -159,13 +158,13 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
     
     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);
     }
 }