X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2de5a6ee23e6d099c86493ca212952a8364514c8..b00786ec12dfb0141d7deb6a4e2235a95a9c26f7:/src/common/fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index c94c250e4b..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
@@ -200,17 +203,16 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
         delete m_Hash -> Delete(filename);
 }
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
 #if wxUSE_IMAGE
 /*static*/ void
-wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type)
+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));