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:
@@ -362,11 +362,6 @@ public:
|
||||
wxZipInputStream(wxInputStream& stream, wxMBConv& conv = wxConvLocal);
|
||||
wxZipInputStream(wxInputStream *stream, wxMBConv& conv = wxConvLocal);
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
|
||||
wxZipInputStream(const wxString& archive, const wxString& file)
|
||||
: wxArchiveInputStream(OpenFile(archive), wxConvLocal) { Init(file); }
|
||||
#endif
|
||||
|
||||
virtual WXZIPFIX ~wxZipInputStream();
|
||||
|
||||
bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); }
|
||||
@@ -383,10 +378,6 @@ protected:
|
||||
size_t WXZIPFIX OnSysRead(void *buffer, size_t size);
|
||||
wxFileOffset OnSysTell() const { return m_decomp ? m_decomp->TellI() : 0; }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
wxFileOffset WXZIPFIX OnSysSeek(wxFileOffset seek, wxSeekMode mode);
|
||||
#endif
|
||||
|
||||
// this protected interface isn't yet finalised
|
||||
virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
|
||||
virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
|
||||
@@ -394,9 +385,6 @@ protected:
|
||||
private:
|
||||
void Init();
|
||||
void Init(const wxString& file);
|
||||
#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
|
||||
static wxInputStream *OpenFile(const wxString& archive);
|
||||
#endif
|
||||
|
||||
wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); }
|
||||
|
||||
@@ -440,11 +428,6 @@ private:
|
||||
friend bool wxZipOutputStream::CopyArchiveMetaData(
|
||||
wxZipInputStream& inputStream);
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
bool m_allowSeeking;
|
||||
friend class wxArchiveFSHandler;
|
||||
#endif
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(wxZipInputStream);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user