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

Revert access changes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-07-16 21:13:28 +00:00
parent 63403da780
commit 9ff1e31960
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/zipstrm.h
View File

@@ -222,9 +222,9 @@ protected:
void Notify(); void Notify();
private:
wxArchiveEntry* DoClone() const { return ZipClone(); } wxArchiveEntry* DoClone() const { return ZipClone(); }
private:
size_t ReadLocal(wxInputStream& stream, wxMBConv& conv); size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const; size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
@@ -300,11 +300,7 @@ public:
int GetLevel() const { return m_level; } int GetLevel() const { return m_level; }
void WXZIPFIX SetLevel(int level); void WXZIPFIX SetLevel(int level);
bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
protected: protected:
virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size); virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size);
virtual wxFileOffset OnSysTell() const { return m_entrySize; } virtual wxFileOffset OnSysTell() const { return m_entrySize; }
@@ -320,6 +316,10 @@ protected:
{ return m_offsetAdjustment != wxInvalidOffset; } { return m_offsetAdjustment != wxInvalidOffset; }
private: private:
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 IsOpened() const { return m_comp || m_pending; }
bool DoCreate(wxZipEntry *entry, bool raw = false); bool DoCreate(wxZipEntry *entry, bool raw = false);
@@ -364,7 +364,6 @@ public:
virtual WXZIPFIX ~wxZipInputStream(); virtual WXZIPFIX ~wxZipInputStream();
bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); } bool OpenEntry(wxZipEntry& entry) { return DoOpen(&entry); }
bool WXZIPFIX CloseEntry(); bool WXZIPFIX CloseEntry();
@@ -387,13 +386,15 @@ protected:
virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream); virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp); virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); }
private: private:
void Init(); void Init();
void Init(const wxString& file); void Init(const wxString& file);
wxInputStream& OpenFile(const wxString& archive); wxInputStream& OpenFile(const wxString& archive);
wxArchiveEntry *DoGetNextEntry() { return GetNextEntry(); }
bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
wxStreamError ReadLocal(bool readEndRec = false); wxStreamError ReadLocal(bool readEndRec = false);
wxStreamError ReadCentral(); wxStreamError ReadCentral();