wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 2753984d3e3842333b0585d2988c13ed52095fbf..fa3d23d5dbe80ab26008146d8dcd302fe0553c6b 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -16,7 +16,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS

 
 #include "wx/stream.h"
 #include "wx/mimetype.h"
 
 #include "wx/stream.h"
 #include "wx/mimetype.h"


@@ -125,9 +125,9 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
 
     public:
         static void CleanUpStatics();
 
     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
+            // 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;
 
     private:
         static wxMimeTypesManager *m_MimeMng;


@@ -159,7 +159,7 @@ class WXDLLEXPORT wxFileSystem : public wxObject
                 // file contained in this directory
                 // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
 
                 // file contained in this directory
                 // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
 

-           wxString GetPath() const {return m_Path;}
+        wxString GetPath() const {return m_Path;}

 
         wxFSFile* OpenFile(const wxString& location);
                 // opens given file and returns pointer to input stream.
 
         wxFSFile* OpenFile(const wxString& location);
                 // opens given file and returns pointer to input stream.

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 182465c6a16ea400d3ce48f18980dfb6f0f17c8e..e7b83b9b21fa5d4eb833b081ca7648e1d9ac01d0 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -21,7 +21,7 @@
     #define wxUSE_FS_INET 0
 #endif
 
     #define wxUSE_FS_INET 0
 #endif
 

-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS

 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 
 #include "wx/wfstream.h"
 #include "wx/module.h"