added --enable-filesystem

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/filesys.h

@@ -16,7 +16,15 @@
 
 #include "wx/setup.h"
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if !wxUSE_STREAMS
+#error You cannot compile virtual file systems without wxUSE_STREAMS
+#endif
+
+#if wxUSE_HTML && !wxUSE_FILESYSTEM
+#error You cannot compile wxHTML without virtual file systems
+#endif
+
+#if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"
 #include "wx/url.h"
@@ -215,7 +223,7 @@ special characters :
 */
 
 #endif
-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM
 
 #endif
   // __FILESYS_H__

include/wx/fs_inet.h

@@ -29,7 +29,7 @@ limitation)
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -54,5 +54,5 @@ class WXDLLEXPORT wxInternetFSHandler : public wxFileSystemHandler
 };
 
 #endif
-  // wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
+  // wxUSE_FILESYSTEM && wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
 

include/wx/fs_mem.h

@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -59,6 +59,6 @@ class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
 };
 
 #endif 
-  // (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM
 
 

include/wx/fs_zip.h

@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 
 #ifndef WXPRECOMP
@@ -51,5 +51,5 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 
 
 #endif
-  // wxUSE_FS_ZIP && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 

include/wx/msw/setup0.h

@@ -359,8 +359,12 @@
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes
+#define wxUSE_FILESYSTEM    1   
+                                // Set to 1 to enable virtual file systems
+                                // (needed by wxHTML)
 #define wxUSE_FS_ZIP        1
-#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems
+#define wxUSE_FS_INET       1   
+                                // Set to 1 to enable virtual file systems
 
 #define wxUSE_BUSYINFO      1
                                 // wxBusyInfo displays window with message