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

fix wxFilesystem compilation if wxUSE_FFILE is 0 but wxUSE_FILE is 1; disable wxFileSystem if both wxUSE_(F)FILE are 0 (modified patch 1569960)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-03 14:38:58 +00:00
parent 6ba2e1940f
commit d9b0ee1eca
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/chkconf.h
View File

@@ -1027,6 +1027,14 @@
# define wxUSE_STREAMS 1 # define wxUSE_STREAMS 1
# endif # endif
# endif # endif
# if !wxUSE_FILE && !wxUSE_FFILE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
# else
# undef wxUSE_FILESYSTEM
# define wxUSE_FILESYSTEM 0
# endif
# endif
#endif /* wxUSE_FILESYSTEM */ #endif /* wxUSE_FILESYSTEM */
#if wxUSE_FS_INET #if wxUSE_FS_INET

6
src/common/filesys.cpp
View File

@@ -214,7 +214,13 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
// we need to check whether we can really read from this file, otherwise // we need to check whether we can really read from this file, otherwise
// wxFSFile is not going to work // wxFSFile is not going to work
#if wxUSE_FILE
wxFileInputStream *is = new wxFileInputStream(fullpath);
#elif wxUSE_FFILE
wxFFileInputStream *is = new wxFFileInputStream(fullpath); wxFFileInputStream *is = new wxFFileInputStream(fullpath);
#else
#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
#endif
if ( !is->Ok() ) if ( !is->Ok() )
{ {
delete is; delete is;