From 56a25b3eb80fbcf1019dc93c9bedcdc6d3d2bee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 13 Jun 2007 20:49:27 +0000 Subject: [PATCH] prefer wxFFile to wxFile if both are available, for better performance (see bug #1736365) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 6 +++--- src/common/image.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 9e91441d04..c2b65ab862 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -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 diff --git a/src/common/image.cpp b/src/common/image.cpp index 2ea88dda7a..181a93477c 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -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