Further wxUniv fixes

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index a9b64d166724b44c4befbaa2de984dbcfdb0beed..da754cfe8aab5f6ff4faf994fd2c92e333731604 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -16,10 +16,17 @@
 
 #include "wx/setup.h"
 
 
 #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/stream.h"

-#include "wx/mimetype.h"

 #include "wx/url.h"
 #include "wx/datetime.h"
 
 #include "wx/url.h"
 #include "wx/datetime.h"
 


@@ -128,17 +135,6 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
         wxString GetMimeTypeFromExt(const wxString& location);
                 // Returns MIME type of the file - w/o need to open it
                 // (default behaviour is that it returns type based on extension)
         wxString GetMimeTypeFromExt(const wxString& location);
                 // Returns MIME type of the file - w/o need to open it
                 // (default behaviour is that it returns type based on extension)

-
-    public:
-        static void CleanUpStatics();
-            // deletes static members (m_MimeMng). It can be called
-        // as many times as you wish because m_MimeMng is created
-        // on demand
-
-    private:
-        static wxMimeTypesManager *m_MimeMng;
-                // MIME manager
-                // (it's static and thus shared by all instances and derived classes)

 };
 
 
 };
 
 


@@ -227,7 +223,7 @@ special characters :
 */
 
 #endif
 */
 
 #endif

-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM

 
 #endif
   // __FILESYS_H__
 
 #endif
   // __FILESYS_H__