applied (slightly modified) wxToggleButton patch from John Norris and Axel Schlueter

[wxWidgets.git] / include / wx / fs_mem.h

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 61b491fbc11d26cf74d9555e060350a41afe70e1..f85dd29f39f6a753e2b40a7a3c25e355f5fbe25b 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -17,15 +17,17 @@
 #pragma hdrstop
 #endif
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
 #endif
 
 #include "wx/filesys.h"
+#if wxUSE_GUI
 #include "wx/image.h"
 #include "wx/bitmap.h"
+#endif
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
@@ -39,8 +41,10 @@ class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
 
         // Add file to list of files stored in memory. Stored data (bitmap, text or raw data)
         // will be copied into private memory stream and available under name "memory:" + filename
+#if wxUSE_GUI
         static void AddFile(const wxString& filename, wxImage& image, long type);
         static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
+#endif
         static void AddFile(const wxString& filename, const wxString& textdata);        
         static void AddFile(const wxString& filename, const void *binarydata, size_t size);
         
@@ -59,6 +63,6 @@ class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
 };
 
 #endif 
-  // (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM