From f22e0c3c3f90510f1a92ab148f20b2453e338626 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 1 Jan 2000 16:43:54 +0000 Subject: [PATCH 1/1] 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 --- include/wx/filesys.h | 10 +++++----- src/common/filesys.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/filesys.h b/include/wx/filesys.h index 2753984d3e..fa3d23d5db 100644 --- a/include/wx/filesys.h +++ b/include/wx/filesys.h @@ -16,7 +16,7 @@ #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" @@ -125,9 +125,9 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject 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; @@ -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/") - 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. diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 182465c6a1..e7b83b9b21 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -21,7 +21,7 @@ #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" -- 2.45.2