X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f98d23fd942272c8c08f8d6edb4e22e4ad1db20e..a400a8230f751da518c29bd9a1c67132a4ae2b75:/src/common/fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 70fd638425..a1013b5bde 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -19,11 +19,12 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
-#include "wx/image.h"
-#include "wx/bitmap.h"
 #include "wx/fs_mem.h"
 
-#ifdef __WXBASE__
+#if wxUSE_GUI
+    #include "wx/image.h"
+    #include "wx/bitmap.h"
+#endif // wxUSE_GUI
 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
@@ -75,6 +76,8 @@ class MemFSHashObj : public wxObject
         }
 };
 
+#if wxUSE_BASE
+
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
@@ -172,28 +175,6 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 }
 
 
-#if wxUSE_IMAGE
-
-/*static*/ void
-wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type)
-{
-    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);
-    }
-}
-
-#endif // wxUSE_IMAGE
-
 /*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
 {
     AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
@@ -222,10 +203,29 @@ wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long ty
         delete m_Hash -> Delete(filename);
 }
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
+#if wxUSE_IMAGE
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
+{
+    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);
+    }
+}
+#endif // wxUSE_IMAGE
+
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
     wxImage img = bitmap.ConvertToImage();