From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Sun, 16 Jul 2006 21:13:28 +0000 (+0000)
Subject: Revert access changes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9ff1e31960b62a8e019265ffeaed391e0bd0f3f1

Revert access changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 3dbab08dc0..c2963a9e6b 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -222,9 +222,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;
 
@@ -300,11 +300,7 @@ public:
 
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);
-
-    bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
-    bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
-    bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
-
+    
 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size);
     virtual wxFileOffset OnSysTell() const      { return m_entrySize; }
@@ -320,6 +316,10 @@ protected:
         { return m_offsetAdjustment != wxInvalidOffset; }
 
 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 DoCreate(wxZipEntry *entry, bool raw = false);
@@ -364,7 +364,6 @@ public:
 
     virtual WXZIPFIX ~wxZipInputStream();
 
-    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
     bool OpenEntry(wxZipEntry& entry)   { return DoOpen(&entry); }
     bool WXZIPFIX CloseEntry();
 
@@ -387,13 +386,15 @@ 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);
     wxInputStream& OpenFile(const wxString& archive);
 
+    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
+
+    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
+
     wxStreamError ReadLocal(bool readEndRec = false);
     wxStreamError ReadCentral();