Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 5ff10cb25e2a40c26ee7d057be5e6d4c356352d0..d381956e296cfede16675884fde2da9eae4e5cb4 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -13,9 +13,13 @@
 #pragma interface
 #endif
 
-#include <wx/stream.h>
-#include <wx/mimetype.h>
-#include <wx/url.h>
+#include "wx/setup.h"
+
+#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+
+#include "wx/stream.h"
+#include "wx/mimetype.h"
+#include "wx/url.h"
 
 
 class wxFSFile;
@@ -112,10 +116,16 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
                 // 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;
+        static wxMimeTypesManager *m_MimeMng;
                 // MIME manager
-        // (it's static and thus shared by all instances and derived classes)
+                // (it's static and thus shared by all instances and derived classes)
 };
 
 
@@ -191,4 +201,8 @@ special characters :
 
 */
 
-#endif // __FILESYS_H__
+#endif
+  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+
+#endif 
+  // __FILESYS_H__