BC++ fixes.

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 5ff10cb25e2a40c26ee7d057be5e6d4c356352d0..1d79fa851ca9e4de56008ab047a1fcbf62e1de4a 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -13,9 +13,13 @@
 #pragma interface
 #endif
 
 #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;
 
 
 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)
 
                 // 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:
     private:

-        static wxMimeTypesManager m_MimeMng;
+        static wxMimeTypesManager *m_MimeMng;

                 // MIME manager
                 // 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)

 };
 
 
 };
 
 


@@ -152,7 +162,7 @@ class WXDLLEXPORT wxFileSystem : public wxObject
                 // unless is_dir = TRUE 'location' is *not* the directory but
                 // file contained in this directory
                 // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
                 // unless is_dir = TRUE 'location' is *not* the directory but
                 // file contained in this directory
                 // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")

-               
+

        wxString GetPath() const {return m_Path;}
 
         wxFSFile* OpenFile(const wxString& location);
        wxString GetPath() const {return m_Path;}
 
         wxFSFile* OpenFile(const wxString& location);


@@ -165,6 +175,9 @@ class WXDLLEXPORT wxFileSystem : public wxObject
         static void AddHandler(wxFileSystemHandler *handler);
                 // Adds FS handler.
                 // In fact, this class is only front-end to the FS hanlers :-)
         static void AddHandler(wxFileSystemHandler *handler);
                 // Adds FS handler.
                 // In fact, this class is only front-end to the FS hanlers :-)

+
+        static void CleanUpHandlers();
+                // remove all items from the m_Handlers list

 };
 
 
 };
 
 


@@ -191,4 +204,8 @@ special characters :
 
 */
 
 
 */
 

-#endif // __FILESYS_H__
+#endif
+  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+
+#endif
+  // __FILESYS_H__