remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions

View File

@@ -21,12 +21,7 @@
#include "wx/log.h"
#endif
#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
#include "wx/zipstrm.h"
#else
#include "wx/archive.h"
#endif
#include "wx/archive.h"
#include "wx/private/fileback.h"
//---------------------------------------------------------------------------
@@ -403,11 +398,6 @@ wxFSFile* wxArchiveFSHandler::OpenFile(
return NULL;
}
#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
if (wxDynamicCast(factory, wxZipClassFactory))
((wxZipInputStream*)s)->m_allowSeeking = true;
#endif // WXWIN_COMPATIBILITY_2_6
return new wxFSFile(s,
key + right,
wxEmptyString,