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

Revert last commit.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-12-09 22:28:11 +00:00
parent 323d1f295f
commit e3a10e0c62
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/zipstrm.h
View File

@@ -221,9 +221,9 @@ protected:
void Notify();
private:
wxArchiveEntry* DoClone() const { return ZipClone(); }
private:
size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
@@ -283,7 +283,6 @@ public:
virtual WXZIPFIX ~wxZipOutputStream();
bool PutNextEntry(wxZipEntry *entry) { return DoCreate(entry); }
bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
bool WXZIPFIX PutNextEntry(const wxString& name,
const wxDateTime& dt = wxDateTime::Now(),
@@ -293,9 +292,7 @@ public:
const wxDateTime& dt = wxDateTime::Now());
bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream);
bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream);
bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
void WXZIPFIX Sync();
bool WXZIPFIX CloseEntry();
@@ -323,6 +320,10 @@ protected:
private:
void Init(int level);
bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
bool IsOpened() const { return m_comp || m_pending; }
bool DoCreate(wxZipEntry *entry, bool raw = false);
@@ -369,7 +370,6 @@ public:
virtual WXZIPFIX ~wxZipInputStream();
bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); }
bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
bool WXZIPFIX CloseEntry();
wxZipEntry *GetNextEntry();
@@ -391,8 +391,6 @@ protected:
virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); }
private:
void Init();
void Init(const wxString& file);
@@ -400,6 +398,10 @@ private:
static wxInputStream *OpenFile(const wxString& archive);
#endif
wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); }
bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
wxStreamError ReadLocal(bool readEndRec = false);
wxStreamError ReadCentral();