added --enable-filesystem

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

configure.in

@@ -697,6 +697,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
@@ -815,6 +816,7 @@ else
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
+  DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
@@ -980,6 +982,7 @@ WX_ARG_ENABLE(wcsrtombs,     [  --enable-wcsrtombs      use wcsrtombs instead of
 WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
 WX_ARG_ENABLE(joystick,      [  --enable-joystick       compile in joystick support (Linux only)], wxUSE_JOYSTICK)
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
 WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
@@ -2586,6 +2589,10 @@ if test "$wxUSE_FILE" = "yes"; then
   AC_DEFINE(wxUSE_FILE)
 fi
 
+if test "$wxUSE_FILESYSTEM" = "yes"; then
+  AC_DEFINE(wxUSE_FILESYSTEM)
+fi
+
 if test "$wxUSE_FS_INET" = "yes"; then
   AC_DEFINE(wxUSE_FS_INET)
 fi

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

setup.h.in

@@ -575,6 +575,7 @@
 /*
  * (virtual) filesystems code
  */
+#define wxUSE_FILESYSTEM 0
 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 

setup.h_vms

@@ -569,6 +569,7 @@
 /*
  * (virtual) filesystems code
  */
+#define wxUSE_FILESYSTEM 1
 #define wxUSE_FS_INET 1
 #define wxUSE_FS_ZIP 1
 

src/common/filesys.cpp

@@ -17,12 +17,8 @@
 #pragma hdrstop
 #endif
 
-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_INET
-    #define wxUSE_FS_INET 0
-#endif
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM
 
 #include "wx/wfstream.h"
 #include "wx/module.h"
@@ -451,7 +447,7 @@ class wxFileSystemModule : public wxModule
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM
 
 
 

src/common/fs_inet.cpp

@@ -34,7 +34,7 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -182,4 +182,4 @@ class wxFileSystemInternetModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET

src/common/fs_mem.cpp

@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -204,4 +204,4 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
-#endif // wxUSE_FS_ZIP
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP

src/common/fs_zip.cpp

@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_ZIP
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
@@ -177,4 +177,5 @@ wxString wxZipFSHandler::DoFind()
 
 
 
-#endif // wxUSE_FS_ZIP
+#endif 
+      //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM