Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-01 16:43:54 +00:00
parent b40b0f5b20
commit f22e0c3c3f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/filesys.h
View File

@@ -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/stream.h"
#include "wx/mimetype.h" #include "wx/mimetype.h"
@@ -125,9 +125,9 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
public: public:
static void CleanUpStatics(); static void CleanUpStatics();
// deletes static members (m_MimeMng). It can be called // deletes static members (m_MimeMng). It can be called
// as many times as you wish because m_MimeMng is created // as many times as you wish because m_MimeMng is created
// on demand // on demand
private: private:
static wxMimeTypesManager *m_MimeMng; static wxMimeTypesManager *m_MimeMng;
@@ -159,7 +159,7 @@ class WXDLLEXPORT wxFileSystem : public wxObject
// file contained in this directory // file contained in this directory
// (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/") // (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); wxFSFile* OpenFile(const wxString& location);
// opens given file and returns pointer to input stream. // opens given file and returns pointer to input stream.

2
src/common/filesys.cpp
View File

@@ -21,7 +21,7 @@
#define wxUSE_FS_INET 0 #define wxUSE_FS_INET 0
#endif #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/wfstream.h"
#include "wx/module.h" #include "wx/module.h"