prefer wxFFile to wxFile if both are available, for better performance (see bug #1736365)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
049908c573
commit
8d6c5e4f3f
@ -215,10 +215,10 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
|
||||
|
||||
// we need to check whether we can really read from this file, otherwise
|
||||
// wxFSFile is not going to work
|
||||
#if wxUSE_FILE
|
||||
wxFileInputStream *is = new wxFileInputStream(fullpath);
|
||||
#elif wxUSE_FFILE
|
||||
#if wxUSE_FFILE
|
||||
wxFFileInputStream *is = new wxFFileInputStream(fullpath);
|
||||
#elif wxUSE_FILE
|
||||
wxFileInputStream *is = new wxFileInputStream(fullpath);
|
||||
#else
|
||||
#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
|
||||
#endif
|
||||
|
@ -39,12 +39,12 @@
|
||||
#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
|
||||
|
||||
#if HAS_FILE_STREAMS
|
||||
#if wxUSE_FILE
|
||||
typedef wxFileInputStream wxImageFileInputStream;
|
||||
typedef wxFileOutputStream wxImageFileOutputStream;
|
||||
#elif wxUSE_FFILE
|
||||
#if wxUSE_FFILE
|
||||
typedef wxFFileInputStream wxImageFileInputStream;
|
||||
typedef wxFFileOutputStream wxImageFileOutputStream;
|
||||
#elif wxUSE_FILE
|
||||
typedef wxFileInputStream wxImageFileInputStream;
|
||||
typedef wxFileOutputStream wxImageFileOutputStream;
|
||||
#endif // wxUSE_FILE/wxUSE_FFILE
|
||||
#endif // HAS_FILE_STREAMS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user